From ca0f5348a128f7290b8a93c6fdd16db4d04eb2bb Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Tue, 11 May 2021 17:09:39 +0200
Subject: [PATCH] Improve rendering of inventories in reports [SCI-5709]

---
 app/assets/javascripts/reports/content.js                | 8 ++++----
 app/views/reports/elements/_my_module_element.html.erb   | 9 +++++----
 .../elements/_my_module_repository_element.html.erb      | 6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/reports/content.js b/app/assets/javascripts/reports/content.js
index 7b61ec9fd..ec6e45249 100644
--- a/app/assets/javascripts/reports/content.js
+++ b/app/assets/javascripts/reports/content.js
@@ -11,9 +11,9 @@
 
     // Special handling if this is a repository table
     if (input.hasClass('hot-repository-items')) {
-      var headers = inputObj.headers;
-      var parentEl = el.closest('.report-module-repository-element');
-      var order = parentEl.attr('data-order') === 'asc';
+      let headers = inputObj.headers;
+      let parentEl = el.closest('.report-module-repository-element');
+      let order = parentEl.attr('data-order') === 'asc';
 
       el.handsontable({
         disableVisualSelection: true,
@@ -52,6 +52,6 @@
 
   $('.hot-table-container').each(function() {
     initializeHandsonTable($(this));
-    reportHandsonTableConverter();
   });
+  reportHandsonTableConverter();
 }());
diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb
index c35fa1c79..7eca56a45 100644
--- a/app/views/reports/elements/_my_module_element.html.erb
+++ b/app/views/reports/elements/_my_module_element.html.erb
@@ -98,12 +98,13 @@
         <%= render partial: 'reports/elements/my_module_result_text_element.html.erb', locals: { result: result } %>
       <% end %>
     <% end %>
-
-    <% if @settings.dig('task', 'activities') %>
-      <%= render partial: 'reports/elements/my_module_activity_element.html.erb', locals: { my_module: my_module } %>
-    <% end %>
   </div>
   <div class="report-element-children">
     <%= children if (defined? children and children.present?) %>
   </div>
+  <% if @settings.dig('task', 'activities') %>
+    <div class="report-element-children">
+      <%= render partial: 'reports/elements/my_module_activity_element.html.erb', locals: { my_module: my_module } %>
+    </div>
+  <% end %>
 </div>
diff --git a/app/views/reports/elements/_my_module_repository_element.html.erb b/app/views/reports/elements/_my_module_repository_element.html.erb
index e0a2f6a5c..3c99b6568 100644
--- a/app/views/reports/elements/_my_module_repository_element.html.erb
+++ b/app/views/reports/elements/_my_module_repository_element.html.erb
@@ -36,9 +36,9 @@
   </div>
   <div class="report-element-body">
     <% if rows_json[:data].count > 0 %>
-    <input type="hidden" class="hot-table-contents hot-repository-items" value='<%= rows_json.to_json.force_encoding(Encoding::UTF_8) %>' />
-    <div class="hot-table-container"></div>
-    <table class="report-common-table-format"></table>
+      <input type="hidden" class="hot-table-contents hot-repository-items" value='<%= rows_json.to_json.force_encoding(Encoding::UTF_8) %>' />
+      <div class="hot-table-container"></div>
+      <table class="report-common-table-format"></table>
     <% else %>
       <div class="row">
         <div class="col-xs-12">