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

Merge pull request #3409 from artoscinote/ma_SCI_5851

Browse source 
Report generation fixes [SCI-5851]
This commit is contained in:
artoscinote 2021-06-29 14:55:26 +02:00 • committed by GitHub
commit 73c86c8423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ module Reports::Docx::DrawStep
def draw_step(step) def draw_step(step)
color = @color color = @color
step_type_str = step.completed ? 'completed' : 'uncompleted' step_type_str = step.completed ? 'completed' : 'uncompleted'
user = step.completed? ? step.last_modified_by : step.user user = step.completed? && step.last_modified_by || step.user
timestamp = step.completed ? step.completed_on : step.created_at timestamp = step.completed ? step.completed_on : step.created_at
@docx.p @docx.p
@docx.h5 (I18n.t('projects.reports.elements.step.step_pos', pos: step.position_plus_one) + @docx.h5 (I18n.t('projects.reports.elements.step.step_pos', pos: step.position_plus_one) +

2
app/services/reports/docx_renderer.rb
View file

@ -143,7 +143,7 @@ module Reports
asset_preview = Reports::Utils.image_prepare(asset) asset_preview = Reports::Utils.image_prepare(asset)
dimension = FastImage.size(asset_preview.service_url) dimension = FastImage.size(asset_preview.processed.service_url)
return unless dimension return unless dimension
x = dimension[0] x = dimension[0]

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

@ -1,6 +1,6 @@
<% step ||= report_element.step %> <% step ||= report_element.step %>
<% step_type_str = step.completed ? 'completed' : 'uncompleted' %> <% step_type_str = step.completed ? 'completed' : 'uncompleted' %>
<% user = step.completed? ? step.last_modified_by : step.user %> <% user = step.completed? && step.last_modified_by || step.user %>
<% timestamp = step.completed ? step.completed_on : step.created_at %> <% timestamp = step.completed ? step.completed_on : step.created_at %>
<% tables = step.tables %> <% tables = step.tables %>
<% assets = step.assets %> <% assets = step.assets %>