scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix report completed_on time and username (partially)

Browse source 
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
This commit is contained in:
Urban Rotnik 2021-02-25 13:24:09 +01:00
parent a415103166
commit 8ca8c84efd
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/steps_controller.rb
View file

@ -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

4
app/services/reports/docx/draw_step.rb
View file

@ -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

4
app/views/reports/elements/_my_module_step_element.html.erb
View file

@ -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 %>