mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 23:16:15 +08:00
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
This commit is contained in:
parent
a415103166
commit
8ca8c84efd
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 %>
|
||||
|
|
Loading…
Reference in a new issue