From 6a4c38bbee58f49ed80fcc1586833f13a1e42245 Mon Sep 17 00:00:00 2001
From: Zanz2 <zan.zagar@hotmail.com>
Date: Fri, 3 Nov 2017 01:04:50 +0100
Subject: [PATCH] Fixed table elements render bugs, now renders after shown
 event

---
 .../_import_json_protocol_p_desc.html.erb     | 40 ++++++++++-------
 .../_import_json_protocol_s_desc.html.erb     | 43 +++++++++++--------
 2 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb
index 2ad86270e..59b4d63e5 100644
--- a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb
+++ b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb
@@ -17,6 +17,7 @@
 <div data-val="description" class="ql-editor">
   <br>
   <% prot_info_string = '' %>
+  <% protocol_table_elements_array = [] %>
   <% if json_object['before_start'].present? %>
   <% prot_info_string += (json_object['before_start']) %>
   <strong><%= t('protocols.protocols_io_import.preview.b_s_p') %></strong>
@@ -67,21 +68,32 @@
   <% if tables.present? %>
   <br><hr><br>
   <% end %>
-  <%#= sanitize_input(garbage.html_safe) %>
   <% table_count = 0 %>
   <% tables.each do |index, table| %>
   <%   table_hash = JSON.parse((Base64.decode64(table['contents']))) %>
   <%   pio_table_id = "pio_table_prot_info_"+table_count.to_s %>
-  <div class="col-xs-12">
+  <%   protocol_table_elements_array.push([pio_table_id,table_hash['data']]) %>
+
   <div data-role="hot-table" class="hot-table">
   <div id="<%=pio_table_id%>" ></div>
   </div>
-  </div>
-  <script type="text/javascript" charset="utf-8">
 
-    var target = document.getElementById('<%= j pio_table_id%>');
-    var hot = new Handsontable(target, {
-    data: <%=raw sanitize_input(table_hash['data'].to_json)%>,
+  <%   table_count += 1 %>
+  <% end %>
+
+</div>
+</div>
+</div>
+</div>
+<script type="text/javascript">
+$('#modal-import-json-protocol-preview').on('shown.bs.modal', function (e) {
+  var javascript_table_elements_p = <%=raw sanitize_input(protocol_table_elements_array.to_json) %>
+  for(var j=0;j<javascript_table_elements_p.length;j++)
+  {
+  
+  var target = document.getElementById(javascript_table_elements_p[j][0]);
+  var hot = new Handsontable(target, {
+    data: javascript_table_elements_p[j][1],
     startRows: <%= Constants::HANDSONTABLE_INIT_ROWS_CNT %>,
     startCols: <%= Constants::HANDSONTABLE_INIT_COLS_CNT %>,
     rowHeaders: true,
@@ -89,12 +101,8 @@
     fillHandle: false,
     formulas: true,
     readOnly: true
-    });
-  
-  </script>
-  <%   table_count += 1 %>
-  <% end %>
-</div>
-</div>
-</div>
-</div>
+  });
+}
+})
+
+</script>
diff --git a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
index 9b79e4ba3..2654e9a19 100644
--- a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
+++ b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
@@ -114,31 +114,40 @@
         <% tables.each do |index, table| %>
         <%   table_hash = JSON.parse((Base64.decode64(table['contents']))) %>
         <%   pio_table_id = "pio_table_step_"+counter.to_s+"_info_"+table_count.to_s %>
-        <%   step_table_elements_array.push([pio_table_id,table_hash]) %>
-        <div class="col-xs-12">
+        <%   step_table_elements_array.push([pio_table_id,table_hash['data']]) %>
+
         <div data-role="hot-table" class="hot-table">
         <div id="<%=pio_table_id%>" ></div>
         </div>
-        </div>
-        <script type="text/javascript" charset="utf-8">
-         var target = document.getElementById('<%= j pio_table_id%>');
-         //alert(JSON.stringify(<%=raw sanitize_input(table_hash['data'].to_json)%>))
-         var hot = new Handsontable(target, {
-           data: <%=raw sanitize_input(table_hash['data'].to_json)%>,
-           startRows: <%= Constants::HANDSONTABLE_INIT_ROWS_CNT %>,
-           startCols: <%= Constants::HANDSONTABLE_INIT_COLS_CNT %>,
-           rowHeaders: true,
-           colHeaders: true,
-           fillHandle: false,
-           formulas: true,
-           readOnly: true
-          });
-        </script>
+
         <%   table_count += 1 %>
         <% end %>
+
         </div>
       </div>
     </div>
   </div>
   <% end  #step loop%>
   <br>
+  <script type="text/javascript">
+  $('#modal-import-json-protocol-preview').on('shown.bs.modal', function (e) {
+    var javascript_table_elements_s = <%=raw sanitize_input(step_table_elements_array.to_json) %>
+
+    for(var j=0;j<javascript_table_elements_s.length;j++)
+    {
+    
+    var target = document.getElementById(javascript_table_elements_s[j][0]);
+    var hot = new Handsontable(target, {
+      data: javascript_table_elements_s[j][1],
+      startRows: <%= Constants::HANDSONTABLE_INIT_ROWS_CNT %>,
+      startCols: <%= Constants::HANDSONTABLE_INIT_COLS_CNT %>,
+      rowHeaders: true,
+      colHeaders: true,
+      fillHandle: false,
+      formulas: true,
+      readOnly: true
+    });
+  }
+  })
+
+  </script>