From b623e2f40f031118d9972769819a45f04b65e442 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 29 Jun 2021 13:46:45 +0200 Subject: [PATCH] Report generation fixes [SCI-5851] --- app/services/reports/docx/draw_step.rb | 2 +- app/services/reports/docx_renderer.rb | 2 +- app/views/reports/elements/_my_module_step_element.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/reports/docx/draw_step.rb b/app/services/reports/docx/draw_step.rb index 1cfa6327f..df98c1c68 100644 --- a/app/services/reports/docx/draw_step.rb +++ b/app/services/reports/docx/draw_step.rb @@ -4,7 +4,7 @@ module Reports::Docx::DrawStep def draw_step(step) color = @color 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 @docx.p @docx.h5 (I18n.t('projects.reports.elements.step.step_pos', pos: step.position_plus_one) + diff --git a/app/services/reports/docx_renderer.rb b/app/services/reports/docx_renderer.rb index 3dba735e9..d9e3aaa8a 100644 --- a/app/services/reports/docx_renderer.rb +++ b/app/services/reports/docx_renderer.rb @@ -143,7 +143,7 @@ module Reports 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 x = dimension[0] 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 395e3cdae..e0c2aa91f 100644 --- a/app/views/reports/elements/_my_module_step_element.html.erb +++ b/app/views/reports/elements/_my_module_step_element.html.erb @@ -1,6 +1,6 @@ <% step ||= report_element.step %> <% 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 %> <% tables = step.tables %> <% assets = step.assets %>