diff --git a/app/assets/javascripts/protocols/import_export/import.js b/app/assets/javascripts/protocols/import_export/import.js index d1e98c722..25b5103f0 100644 --- a/app/assets/javascripts/protocols/import_export/import.js +++ b/app/assets/javascripts/protocols/import_export/import.js @@ -329,13 +329,12 @@ function importProtocolFromFile( } function addStepTextPreview(stepEl, stepTextNode, folder, stepGuid) { - var itemId = $(stepTextNode).attr('id'); + const itemName = $(stepTextNode).children('name').text(); + const itemText = displayTinyMceAssetInDescription(stepTextNode, folder, stepGuid); - var itemText = displayTinyMceAssetInDescription(stepTextNode, folder, stepGuid); - - var textEl = newPreviewElement( + const textEl = newPreviewElement( 'step-text', - { text: itemText } + { name: itemName, text: itemText } ); stepEl.append(textEl); diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index 308bfaf8d..589d11422 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -430,8 +430,16 @@ label { } } -/* Result text element style */ +// Text element style +.report-step-text-element, .report-result-text-element { + .report-element-header { + .text-name { + font-size: 10pt; + font-weight: bold; + } + } + .report-element-body { .text-container { border-radius: 4px; diff --git a/app/models/result_text.rb b/app/models/result_text.rb index b9df20fcd..ec2dfd371 100644 --- a/app/models/result_text.rb +++ b/app/models/result_text.rb @@ -15,7 +15,8 @@ class ResultText < ApplicationRecord def duplicate(result, position = nil) ActiveRecord::Base.transaction do new_result_text = result.result_texts.create!( - text: text + text: text, + name: name ) # Copy results tinyMce assets diff --git a/app/models/step_text.rb b/app/models/step_text.rb index 292312716..4fd1c4fc3 100644 --- a/app/models/step_text.rb +++ b/app/models/step_text.rb @@ -21,7 +21,8 @@ class StepText < ApplicationRecord def duplicate(step, position = nil) ActiveRecord::Base.transaction do new_step_text = step.step_texts.create!( - text: text + text: text, + name: name ) # Copy steps tinyMce assets diff --git a/app/services/reports/docx/draw_result_text.rb b/app/services/reports/docx/draw_result_text.rb index 53049fc82..5a7ce8b4a 100644 --- a/app/services/reports/docx/draw_result_text.rb +++ b/app/services/reports/docx/draw_result_text.rb @@ -4,16 +4,8 @@ module Reports::Docx::DrawResultText def draw_result_text(element) result = element.result result_text = element.orderable - timestamp = result.created_at color = @color - @docx.p - @docx.p do - text result.name.presence || I18n.t('projects.reports.unnamed'), italic: true - text " #{I18n.t('search.index.archived')} ", bold: true if result.archived? - text ' ' - text I18n.t('projects.reports.elements.result_table.user_time', - timestamp: I18n.l(timestamp, format: :full), user: result.user.full_name), color: color[:gray] - end + @docx.p result_text.name.presence || '', italic: true html = custom_auto_link(result_text.text, team: @report_team) Reports::HtmlToWordConverter.new(@docx, { scinote_url: @scinote_url, link_style: @link_style }).html_to_word_converter(html) diff --git a/app/services/reports/docx/draw_step_text.rb b/app/services/reports/docx/draw_step_text.rb index 9729ca3b3..984462c80 100644 --- a/app/services/reports/docx/draw_step_text.rb +++ b/app/services/reports/docx/draw_step_text.rb @@ -2,6 +2,7 @@ module Reports::Docx::DrawStepText def draw_step_text(step_text) + @docx.p step_text.name.presence || '', italic: true if step_text.text.present? html = custom_auto_link(step_text.text, team: @report_team) Reports::HtmlToWordConverter.new(@docx, { scinote_url: @scinote_url, diff --git a/app/utilities/protocols_exporter_v2.rb b/app/utilities/protocols_exporter_v2.rb index f6cd3b877..a4e2ba3ea 100644 --- a/app/utilities/protocols_exporter_v2.rb +++ b/app/utilities/protocols_exporter_v2.rb @@ -86,6 +86,7 @@ module ProtocolsExporterV2 def step_text_xml(step_text) xml = "\n" \ + "#{step_text.name}\n"\ "\n" \ ""\ "\n" diff --git a/app/views/protocols/import_export/_preview_templates.html.erb b/app/views/protocols/import_export/_preview_templates.html.erb index a65349d5a..532aafbb8 100644 --- a/app/views/protocols/import_export/_preview_templates.html.erb +++ b/app/views/protocols/import_export/_preview_templates.html.erb @@ -46,6 +46,9 @@
+
+ +
diff --git a/app/views/reports/elements/_my_module_result_text_element.html.erb b/app/views/reports/elements/_my_module_result_text_element.html.erb index ddbe85f35..fc5ed5eb4 100644 --- a/app/views/reports/elements/_my_module_result_text_element.html.erb +++ b/app/views/reports/elements/_my_module_result_text_element.html.erb @@ -5,15 +5,12 @@ <% export_all = defined?(export_all) && export_all %>
-
- <%= name.presence || I18n.t('projects.reports.unnamed') %> - <% if result.archived? %> - <%= t('search.index.archived') %> +
+ <% if result_text.name.present? %> + + <%= truncate(result_text.name, length: Constants::FILENAME_TRUNCATION_LENGTH) %> + <% end %> -
-
- <%= t('projects.reports.elements.result_text.user_time', user: result.user.full_name, timestamp: l(timestamp, format: :full)) %> -
diff --git a/app/views/reports/elements/_step_text_element.html.erb b/app/views/reports/elements/_step_text_element.html.erb index ab212ba09..acc306215 100644 --- a/app/views/reports/elements/_step_text_element.html.erb +++ b/app/views/reports/elements/_step_text_element.html.erb @@ -1,4 +1,12 @@
+
+
+ <% if step_text.name.present? %> + + <%= truncate(step_text.name, length: Constants::FILENAME_TRUNCATION_LENGTH) %> + + <% end %> +
<% if step_text.text.present? %> <%= custom_auto_link(step_text.prepare_for_report(:text, export_all),