From 8ca8c84efd2155209908cbbef28b1a99b939b46a Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Thu, 25 Feb 2021 13:24:09 +0100 Subject: [PATCH] Fix report completed_on time and username (partially) SCI-5439 We cannot realy on last_modified_by, because it can be changed after step completion --- app/controllers/steps_controller.rb | 1 + app/services/reports/docx/draw_step.rb | 4 ++-- app/views/reports/elements/_my_module_step_element.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index 080946a91..aa7d75161 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -330,6 +330,7 @@ class StepsController < ApplicationController completed = params[:completed] == 'true' changed = @step.completed != completed @step.completed = completed + @step.last_modified_by = current_user if @step.save # Create activity diff --git a/app/services/reports/docx/draw_step.rb b/app/services/reports/docx/draw_step.rb index 87ac65c7a..1a212bd56 100644 --- a/app/services/reports/docx/draw_step.rb +++ b/app/services/reports/docx/draw_step.rb @@ -7,8 +7,8 @@ module Reports::Docx::DrawStep return unless step step_type_str = step.completed ? 'completed' : 'uncompleted' - user = step.completed || !step.changed? ? step.user : step.last_modified_by - timestamp = step.completed ? step.completed_on : step.updated_at + user = step.completed? ? step.last_modified_by : step.user + timestamp = step.completed ? step.completed_on : step.created_at @docx.p @docx.h5 (I18n.t('projects.reports.elements.step.step_pos', pos: step.position_plus_one) + ' ' + step.name), size: Constants::REPORT_DOCX_STEP_TITLE_SIZE diff --git a/app/views/reports/elements/_my_module_step_element.html.erb b/app/views/reports/elements/_my_module_step_element.html.erb index 38828cc93..f0c99db18 100644 --- a/app/views/reports/elements/_my_module_step_element.html.erb +++ b/app/views/reports/elements/_my_module_step_element.html.erb @@ -1,7 +1,7 @@ <% if step.blank? and @step.present? then step = @step end %> <% step_type_str = step.completed ? 'completed' : 'uncompleted' %> -<% user = step.completed || !step.changed? ? step.user : step.last_modified_by %> -<% timestamp = step.completed ? step.completed_on : step.updated_at %> +<% user = step.completed? ? step.last_modified_by : step.user %> +<% timestamp = step.completed ? step.completed_on : step.created_at %> <% tables = step.tables %> <% assets = step.assets %> <% checklists = step.checklists %>