From 2413dc251ab9eb6540b8276a5dcbdeb463ca821f Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Sat, 28 Oct 2017 02:19:22 +0200 Subject: [PATCH] Added new preview tables code --- app/controllers/protocols_controller.rb | 1 + .../_import_json_protocol_p_desc.html.erb | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb index 64082b05a..a8af4f4af 100644 --- a/app/controllers/protocols_controller.rb +++ b/app/controllers/protocols_controller.rb @@ -1145,6 +1145,7 @@ class ProtocolsController < ApplicationController # return string_without_tables, tables return tables, string_without_tables end + helper_method :protocolsio_string_to_table_element def move_protocol(action) rollbacked = false 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 18af03bfa..d9fab4692 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 @@ -16,21 +16,26 @@

+ <% prot_info_string = '' %> <% if json_object['before_start'].present? %> <%= t('protocols.protocols_io_import.preview.b_s_p') %> <%= sanitize_input(json_object['before_start'].html_safe) %>
+ <% prot_info_string += (json_object['before_start']) %> <% end %> <% if json_object['warning'].present? %> <%= t('protocols.protocols_io_import.preview.warn') %> <%= sanitize_input(json_object['warning'].html_safe) %>
+ <% prot_info_string += (json_object['warning']) %> <% end %> <% if json_object['guidelines'].present? %> <%= t('protocols.protocols_io_import.preview.guideln') %> <%= sanitize_input(json_object['guidelines'].html_safe) %>
+ <% prot_info_string += (json_object['guidelines']) %> <% end %> <% if json_object['manuscript_citation'].present? %> <%= t('protocols.protocols_io_import.preview.manu_cit') %> <%= sanitize_input(json_object['manuscript_citation'].html_safe) %>
+ <% prot_info_string += (json_object['manuscript_citation']) %> <% end %> <% if json_object['publish_date'].present? %> <%= t('protocols.protocols_io_import.preview.pbl_date') %> @@ -58,6 +63,12 @@ <%= t('protocols.protocols_io_import.preview.p_link') %> <%= sanitize_input(json_object['link'].html_safe) %>
<% end %> + <% tables, garbage = protocolsio_string_to_table_element(prot_info_string) %> + <% tables.each do |index, table| %> + <% table_hash = JSON.parse(Base64.decode64(table['contents'])) %> + <% byebug %> + + <% end %>