Merge pull request #8535 from aignatov-bio/ai-sci-11889-add-linked-step-results-to-report

Add linked step/results to reports [SCI-11889]

app/services/reports/docx/draw_results.rb

@@ -26,6 +26,12 @@ module Reports::Docx::DrawResults
                         timestamp: I18n.l(result.created_at, format: :full),
                         user: result.user.full_name), color: color[:gray]
           end
+          if !settings['exclude_task_metadata'] && result.steps.size.positive?
+            text ' | '
+            text I18n.t('projects.reports.elements.result.linked_steps'), color: color[:gray]
+            text ' '
+            text result.steps.pluck(:name).join('; '), color: color[:gray]
+          end
         end
         draw_result_asset(result, @settings) if @settings.dig('task', 'file_results')
         result.result_orderable_elements.each do |element|

app/services/reports/docx/draw_step.rb

@@ -29,6 +29,12 @@ module Reports::Docx::DrawStep
             timestamp: I18n.l(timestamp, format: :full)
           ), color: color[:gray]
         end
+        if !settings['exclude_task_metadata'] && step.results.size.positive?
+          text ' | '
+          text I18n.t('projects.reports.elements.step.linked_results'), color: color[:gray]
+          text ' '
+          text step.results.pluck(:name).join('; '), color: color[:gray]
+        end
       end
     end
 

app/views/reports/elements/_my_module_element.html.erb

@@ -86,6 +86,15 @@
           <% end %>
         </div>
 
+        <div class="user-time">
+          <% unless @settings['exclude_timestamps'] %>
+            <%= t('projects.reports.elements.result.user_time', user: result.user.full_name, timestamp: l(result.created_at, format: :full)) %>
+          <% end %>
+          <% if !@settings['exclude_task_metadata'] && result.steps.size.positive? %>
+            | <%= t("projects.reports.elements.result.linked_steps") %> <%= result.steps.pluck(:name).join('; ') %>
+          <% end %>
+        </div>
+
         <% result.result_orderable_elements.each do |element| %>
           <% if element.orderable_type == "ResultTable" && @settings.dig('task', 'table_results') %>
             <%= render partial: 'reports/elements/my_module_result_table_element', locals: { result: result, export_all: export_all, element: element} %>
@@ -96,11 +105,6 @@
 
         <% if @settings.dig('task', 'file_results')  %>
           <%= render partial: 'reports/elements/my_module_result_asset_element', locals: { result: result, report: report, export_all: export_all } %>
-          <% unless @settings['exclude_timestamps'] %>
-            <div class="user-time">
-              <%= t('projects.reports.elements.result.user_time', user: result.user.full_name, timestamp: l(result.created_at, format: :full)) %>
-            </div>
-          <% end %>
         <% end %>
 
         <div class="report-element-children">

app/views/reports/elements/_my_module_step_element.html.erb

@@ -12,11 +12,14 @@
         <%= step_status_label(step) %>
       <% end %>
     </h5>
-    <% unless @settings['exclude_timestamps'] %>
-      <div class="user-time">
+    <div class="user-time">
+      <% unless @settings['exclude_timestamps'] %>
         <%= t("projects.reports.elements.step.#{step_type_str}.user_time", user: user.full_name , timestamp: l(timestamp, format: :full)) %>
-      </div>
-    <% end %>
+      <% end %>
+      <% if !@settings['exclude_task_metadata'] && step.results.size.positive? %>
+      | <%= t("projects.reports.elements.step.linked_results") %> <%= step.results.pluck(:name).join('; ') %>
+      <% end %>
+    </div>
   </div>
   <div class="report-element-children">
     <% step.step_orderable_elements.order(:position).each do |e| %>

config/locales/en.yml

@@ -990,6 +990,7 @@ en:
           no_columns: "No columns selected"
         result:
           user_time: "Added on %{timestamp} by %{user}."
+          linked_steps: "Linked to steps: "
         result_asset:
           file_name: "%{file}"
           user_time: "Added on %{timestamp} by %{user}."
@@ -1003,6 +1004,7 @@ en:
           sidebar_name: "Step %{pos}: %{name}"
           step_pos: "Step %{pos}:"
           no_description: "No description"
+          linked_results: "Linked to results:"
           completed:
             user_time: "Completed by %{user} on %{timestamp}."
           uncompleted: