diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index 15ffcb80d..bfb0bba9c 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -210,25 +210,14 @@ label { width: 100%; margin-bottom: 15px; - .report-element-header { - border-bottom: 2px solid $color-black; - .user-time { - color: $color-emperor; - margin-left: 15px; - white-space: nowrap; - } - .controls { - margin-right: 15px; - font-size: $font-size-h6; - opacity: 0.05; - } + .user-time { + color: $color-silver-chalice; + white-space: nowrap; } .report-element-body { padding-top: 10px; - padding-left: 15px; - padding-right: 15px; .report-export-img { max-height: 300px; @@ -237,7 +226,6 @@ label { } .report-element-children { - padding-left: 45px; padding-top: 15px; } @@ -256,14 +244,14 @@ label { /* Project header element style */ .report-project-header-element { - margin-bottom: 60px; + margin-bottom: 20px; .report-element-header { border-bottom: none; } .report-element-body { .project-name { - border-bottom: 4px solid $color-black; + @include font-h2; } } @@ -272,6 +260,21 @@ label { } } +// Experiment element style +.report-experiment-element { + .experiment-name { + @include font-main; + } +} + +// Protocol element style +.report-module-protocol-element { + .protcol-name { + @include font-small; + font-weight: bold; + } +} + /* Module element style */ .report-module-element { margin-top: 15px; @@ -279,7 +282,8 @@ label { .report-element-body { .module-name { - margin-left: 15px; + @include font-button; + font-weight: bold; } .module-start-date, @@ -338,12 +342,12 @@ label { .result-icon { display: inline-block; - margin-left: 15px; } .result-name { + @include font-small; display: inline-block; - margin-left: 5px; + font-weight: bold; } .user-time { @@ -366,7 +370,8 @@ label { .report-result-asset-element { .report-element-header { .file-name { - margin-left: 15px; + font-size: 10px; + font-weight: bold; } .image-icon.report { @@ -383,7 +388,8 @@ label { .report-result-table-element { .report-element-header { .table-name { - margin-left: 15px; + font-size: 10px; + font-weight: bold; } } @@ -405,6 +411,11 @@ label { /** Step element style */ .report-step-element { + .step-name { + font-size: 11px; + font-weight: bold; + } + &:hover > .report-element-body .step-name { color: $brand-primary; } @@ -450,13 +461,15 @@ label { .report-step-table-element { .report-element-header { .table-name { - margin-left: 5px; + font-size: 10px; + font-weight: bold; } } &:hover > .report-element-header { .table-name { color: $brand-primary; + } } } @@ -465,7 +478,8 @@ label { .report-step-asset-element { .report-element-header { .file-name { - margin-left: 5px; + font-size: 10px; + font-weight: bold; white-space: nowrap; } @@ -483,7 +497,8 @@ label { .report-step-checklist-element { .report-element-header { .checklist-name { - margin-left: 5px; + font-size: 10px; + font-weight: bold; } } @@ -510,8 +525,9 @@ label { } .comments-name { - margin-left: 5px; color: $color-emperor; + font-size: 10px; + font-weight: bold; } } @@ -519,7 +535,6 @@ label { .comments-container { border-radius: 4px; padding: 5px; - background-color: $color-alabaster; .comment { margin: 3px 2px; @@ -556,11 +571,8 @@ label { border-bottom: 0; .repository-name { - margin-left: 5px; - } - - .table-name { - margin-left: 15px; + @include font-small; + font-weight: bold; } } @@ -584,7 +596,8 @@ label { border-bottom: none; .activity-name { - margin-left: 5px; + @include font-small; + font-weight: bold; } } @@ -592,7 +605,6 @@ label { .activity-container { border-radius: 4px; padding: 5px; - background-color: $color-alabaster; .activity { margin: 3px 2px; diff --git a/app/assets/stylesheets/reports/new.scss b/app/assets/stylesheets/reports/new.scss index 03a25a88e..00b0ba81e 100644 --- a/app/assets/stylesheets/reports/new.scss +++ b/app/assets/stylesheets/reports/new.scss @@ -453,7 +453,7 @@ } .experiment-name { - @include font-h1; + @include font-main; display: inline-block; overflow: hidden; text-overflow: ellipsis; diff --git a/app/views/reports/elements/_experiment_element.html.erb b/app/views/reports/elements/_experiment_element.html.erb index dc90adf49..fa2db5fd2 100644 --- a/app/views/reports/elements/_experiment_element.html.erb +++ b/app/views/reports/elements/_experiment_element.html.erb @@ -2,35 +2,19 @@ <% timestamp = experiment.created_at %> <% export_all = defined?(export_all) && export_all %>
-
-
-
- <%= t('projects.reports.elements.experiment.user_time', code: experiment.code, timestamp: l(timestamp, format: :full)) %> - <%= link_to t('projects.reports.elements.all.scinote_link'),canvas_experiment_url(experiment), target: :_blank %> -
-
-
-
-
-

- - <%= experiment.name %> - <% if experiment.archived? %> - <%= t('search.index.archived') %> - <% end %> -

-
+
+ <%= link_to experiment.name, canvas_experiment_url(experiment), target: :_blank %> + <% if experiment.archived? %> + <%= t('search.index.archived') %> + <% end %>
-
-
- <% if experiment.description.present? %> - <%= custom_auto_link(experiment.description, team: current_team, base64_encoded_imgs: export_all) %> - <% else %> - <%= t('projects.reports.elements.experiment.no_description') %> - <% end %> -
+
+ <%= t('projects.reports.elements.experiment.user_time', code: experiment.code, timestamp: l(timestamp, format: :full)) %>
+ <% if experiment.description.present? %> + <%= custom_auto_link(experiment.description, team: current_team, base64_encoded_imgs: export_all) %> + <% end %>
<% if defined?(children) %>
diff --git a/app/views/reports/elements/_my_module_activity_element.html.erb b/app/views/reports/elements/_my_module_activity_element.html.erb index d9add9ddb..b925e7de4 100644 --- a/app/views/reports/elements/_my_module_activity_element.html.erb +++ b/app/views/reports/elements/_my_module_activity_element.html.erb @@ -1,20 +1,15 @@ <% my_module ||= report_element.my_module %> <% activities = ActivitiesService.my_module_activities(my_module).order(created_at: :desc) %> -
-
-
-
- -
-
- <%= t('projects.reports.elements.module_activity.name', my_module: my_module.name) %> +<% if activities.present? %> +
+
+
+ <%= t('projects.reports.elements.module_activity.name') %>
-
-
-
-
- <% if activities.present? %> +
+
+
    <% activities.each do |activity| %>
  • @@ -32,15 +27,13 @@
  • <% end %>
- <% else %> - <%= t('projects.reports.elements.module_activity.no_activity') %> - <% end %> +
+ <% if defined?(children) %> +
+ <%= children %> +
+ <% end %>
- <% if defined?(children) %> -
- <%= children %> -
- <% end %> -
+<% end %> diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index a63d6bcbf..5d927906e 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -2,38 +2,24 @@ <% timestamp = my_module.created_at %> <% export_all = defined?(export_all) && export_all %>
-
-
-
- <%= t('projects.reports.elements.module.user_time', timestamp: l(timestamp, format: :full)) %> - <%= link_to t('projects.reports.elements.all.scinote_link'), protocols_my_module_url(my_module), target: :_blank %> -
-
-
-
-
-

- - <%= my_module.name %> - <% if my_module.archived? %> - <%= t('search.index.archived') %> - <% end %> -

-
+
+ <%= link_to my_module.name, protocols_my_module_url(my_module), target: :_blank %> + <% if my_module.archived? %> + <%= t('search.index.archived') %> + <% end %> +
+
+ <%= t('projects.reports.elements.module.user_time', timestamp: l(timestamp, format: :full)) %>

<% if my_module.started_on.present? %> <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> - <% else %> - <%= t('projects.reports.elements.module.no_start_date') %> <% end %>

<% if my_module.due_date.present? %> <%= t('projects.reports.elements.module.due_date', due_date: l(my_module.due_date, format: :full)) %> - <% else %> - <%= t('projects.reports.elements.module.no_due_date') %> <% end %>

@@ -59,10 +45,6 @@ <%= tag.name %>

<% end %> - <% else %> -
- <%= t('projects.reports.elements.module.no_tags') %> -
<% end %>
@@ -72,8 +54,6 @@ team: current_team, simple_format: false, base64_encoded_imgs: export_all) %> - <% else %> - <%= t('projects.reports.elements.module.no_description') %> <% end %>
diff --git a/app/views/reports/elements/_my_module_protocol_element.html.erb b/app/views/reports/elements/_my_module_protocol_element.html.erb index 2d654b755..62235fab0 100644 --- a/app/views/reports/elements/_my_module_protocol_element.html.erb +++ b/app/views/reports/elements/_my_module_protocol_element.html.erb @@ -1,27 +1,19 @@ <% protocol ||= report_element.my_module.protocol %> <% export_all = defined?(export_all) && export_all %>
-
-
-
- <%= t('projects.reports.elements.module.protocol.user_time', timestamp: l(protocol.created_at, format: :full)) %> -
-
-
-
-

- <%= protocol.name %> -

-
+
+ <%= protocol.name || t('projects.reports.elements.module.protocol.name') %> +
+
+ <%= t('projects.reports.elements.module.protocol.user_time', timestamp: l(protocol.created_at, format: :full)) %> +
<% if protocol.description.present? %> <%= custom_auto_link(protocol.prepare_for_report(:description, export_all), team: current_team, simple_format: false, base64_encoded_imgs: export_all) %> - <% else %> - <%= t('my_modules.protocols.protocol_status_bar.no_description') %> <% end %>
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 e826d41b5..f995a6aa6 100644 --- a/app/views/reports/elements/_my_module_repository_element.html.erb +++ b/app/views/reports/elements/_my_module_repository_element.html.erb @@ -5,23 +5,18 @@ <% rows_json = my_module.repository_json_hot(repository, :desc) %>
-
-
- -
-
- <%= t('projects.reports.elements.module_repository.name', repository: repository.name, my_module: my_module.name) %> - <%= t('projects.reports.index.deleted') if repository.is_a?(RepositorySnapshot) && !repository.original_repository %> -
- <% if defined?(export_all) && export_all %> -
- <% file_link = @obj_filenames.dig(:repositories, repository.id, :file) %> - - <%= t('projects.reports.elements.module_repository.table_name', name: file_link&.split('/')&.last) %> - -
- <% end %> +
+ <%= repository.name %> + <%= t('projects.reports.index.deleted') if repository.is_a?(RepositorySnapshot) && !repository.original_repository %>
+ <% if defined?(export_all) && export_all %> +
+ <% file_link = @obj_filenames.dig(:repositories, repository.id, :file) %> + + <%= t('projects.reports.elements.module_repository.table_name', name: file_link&.split('/')&.last) %> + +
+ <% end %>
<% if rows_json[:data].count > 0 %> diff --git a/app/views/reports/elements/_my_module_result_asset_element.html.erb b/app/views/reports/elements/_my_module_result_asset_element.html.erb index 9d05af416..b82fee7e2 100644 --- a/app/views/reports/elements/_my_module_result_asset_element.html.erb +++ b/app/views/reports/elements/_my_module_result_asset_element.html.erb @@ -4,16 +4,16 @@
-
+
<%= file_extension_icon_html(asset, true) %>
-
+
<%= result.name %> <% if result.archived? %> <%= t('search.index.archived') %> <% end %>
-
+
<% if defined? export_all and export_all %> <% if @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> <% file_link = @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> @@ -21,23 +21,23 @@ <% file_link = @obj_filenames.dig(:assets, asset.id, :file) %> <% end %> - <%= t("projects.reports.elements.result_asset.file_name", file: file_link&.split('/')&.last) %> + <%= file_link&.split('/')&.last %> <% else %> <% if asset.file.metadata[:asset_type] == 'bio_eddie' %> - <%= t("projects.reports.elements.result_asset.file_name", file: truncate("#{asset.file.metadata[:name]}.helm", length: Constants::FILENAME_TRUNCATION_LENGTH)) %> + <%= truncate("#{asset.file.metadata[:name]}.helm", length: Constants::FILENAME_TRUNCATION_LENGTH) %> <%= t('Download')%> <% else %> - <%= t("projects.reports.elements.result_asset.file_name", file: truncate(asset.file_name, length: Constants::FILENAME_TRUNCATION_LENGTH)) %> + <%= truncate(asset.file_name, length: Constants::FILENAME_TRUNCATION_LENGTH) %> <%= link_to t('projects.reports.elements.download'), asset_download_url(asset, disposition: 'attachment'), class: 'download-link', target: :_blank %> <% end %> <% end %>
-
+
<%= t("projects.reports.elements.result_asset.user_time", user: result.user.full_name, timestamp: l(timestamp, format: :full)) %> <% if report.settings.dig(:task, :file_results_previews) %> <%= t('projects.reports.elements.result_asset.full_preview_attached') %> diff --git a/app/views/reports/elements/_my_module_result_table_element.html.erb b/app/views/reports/elements/_my_module_result_table_element.html.erb index 14aad23c6..b6e7db5db 100644 --- a/app/views/reports/elements/_my_module_result_table_element.html.erb +++ b/app/views/reports/elements/_my_module_result_table_element.html.erb @@ -3,28 +3,23 @@ <% timestamp = table.created_at %>
-
-
-
- -
-
- <%= result.name %> - <% if result.archived? %> - <%= t('search.index.archived') %> - <% end %> -
- <% if defined? export_all and export_all %> -
- <% file_link = @obj_filenames.dig(:tables, table.id, :file) %> - - <%=t "projects.reports.elements.result_table.table_name", name: file_link&.split('/')&.last %> - -
+
+
+ <%= result.name %> + <% if result.archived? %> + <%= t('search.index.archived') %> <% end %> -
- <%= t('projects.reports.elements.result_table.user_time', user: result.user.full_name , timestamp: l(timestamp, format: :full)) %> +
+ <% if defined? export_all and export_all %> +
+ <% file_link = @obj_filenames.dig(:tables, table.id, :file) %> + + <%= file_link&.split('/')&.last %> +
+ <% end %> +
+ <%= t('projects.reports.elements.result_table.user_time', user: result.user.full_name , timestamp: l(timestamp, format: :full)) %>
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 5d8fc6a78..e9ea2bb9e 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,30 +5,23 @@ <% export_all = defined?(export_all) && export_all %>
-
-
- -
-
- <%= name %> - <% if result.archived? %> - <%= t('search.index.archived') %> - <% end %> -
-
- <%= t('projects.reports.elements.result_text.user_time', user: result.user.full_name, timestamp: l(timestamp, format: :full)) %> -
+
+ <%= name %> + <% if result.archived? %> + <%= t('search.index.archived') %> + <% end %> +
+
+ <%= t('projects.reports.elements.result_text.user_time', user: result.user.full_name, timestamp: l(timestamp, format: :full)) %>
-
-
- <%= custom_auto_link(result_text.prepare_for_report(:text, export_all), - team: current_team, - simple_format: false, - tags: %w(img), - base64_encoded_imgs: export_all) %> -
+
+ <%= custom_auto_link(result_text.prepare_for_report(:text, export_all), + team: current_team, + simple_format: false, + tags: %w(img), + base64_encoded_imgs: export_all) %>
diff --git a/app/views/reports/elements/_my_module_step_element.html.erb b/app/views/reports/elements/_my_module_step_element.html.erb index 444abb1f1..cbd7ae46e 100644 --- a/app/views/reports/elements/_my_module_step_element.html.erb +++ b/app/views/reports/elements/_my_module_step_element.html.erb @@ -5,35 +5,22 @@ <% assets = step.assets %> <% export_all = defined?(export_all) && export_all %>
-
-
-
- <%= t("projects.reports.elements.step.#{step_type_str}.user_time", user: user.full_name , timestamp: l(timestamp, format: :full)) %> -
-
-
-
-
-
- - <%= t('projects.reports.elements.step.step_pos', pos: (step.position_plus_one)) %> <%= step.name %> - <%= step_status_label(step) %> -
-
+
+ <%= t('projects.reports.elements.step.step_pos', pos: (step.position_plus_one)) %> <%= step.name %> + <%= step_status_label(step) %>
-
-
- <% if step.description.present? %> - <%= custom_auto_link(step.prepare_for_report(:description, export_all), - team: current_team, - simple_format: false, - tags: %w(img), - base64_encoded_imgs: export_all) %> - <% else %> - <%= t('projects.reports.elements.step.no_description') %> - <% end %> -
+
+ <%= t("projects.reports.elements.step.#{step_type_str}.user_time", user: user.full_name , timestamp: l(timestamp, format: :full)) %> +
+
+ <% if step.description.present? %> + <%= custom_auto_link(step.prepare_for_report(:description, export_all), + team: current_team, + simple_format: false, + tags: %w(img), + base64_encoded_imgs: export_all) %> + <% end %>
diff --git a/app/views/reports/elements/_project_header_element.html.erb b/app/views/reports/elements/_project_header_element.html.erb index 45791ef9b..1f0f4d5ce 100644 --- a/app/views/reports/elements/_project_header_element.html.erb +++ b/app/views/reports/elements/_project_header_element.html.erb @@ -1,22 +1,14 @@ <% project ||= report_element.project %>
-
-
-
- <%= t('projects.reports.elements.project_header.user_time', timestamp: l(project.created_at, format: :full)) %> -
-
-
-
-
-

- <%= t('projects.reports.elements.project_header.title', project: project.name) %> - <% if project.archived? %> - <%= t('search.index.archived') %> - <% end %> -

-
+
+ <%= link_to t('projects.reports.elements.project_header.title', project: project.name), project_url(project), target: :_blank %> + <% if project.archived? %> + <%= t('search.index.archived') %> + <% end %> +
+
+ <%= t('projects.reports.elements.project_header.user_time', timestamp: l(project.created_at, format: :full)) %>
<% if defined?(children) %> diff --git a/app/views/reports/elements/_result_comments_element.html.erb b/app/views/reports/elements/_result_comments_element.html.erb index fdab09b47..b1b786a5b 100644 --- a/app/views/reports/elements/_result_comments_element.html.erb +++ b/app/views/reports/elements/_result_comments_element.html.erb @@ -1,36 +1,31 @@ <% result ||= report_element.result %> <% comments = result.result_comments.order(created_at: :desc) %> <% export_all = defined?(export_all) && export_all %> -
-
-
-
- -
-
- <%= t('projects.reports.elements.result_comments.name', result: result.name) %> +<% if comments.present? %> +
+
+
+
+ <%= t('projects.reports.elements.result_comments.name', result: result.name) %> +
-
-
-
-
- <% if comments.present? %> +
+
+
    <% comments.each do |comment| %> <%= render partial: 'shared/comments/item.html.erb', - locals: { comment: comment, readonly: true, report: true, export_all: export_all } %> + locals: { comment: comment, readonly: true, report: true, export_all: export_all } %> <% end %>
- <% else %> - <%= t('projects.reports.elements.result_comments.no_comments') %> - <% end %> +
+ <% if defined?(children) %> +
+ <%= children %> +
+ <% end %>
- <% if defined?(children) %> -
- <%= children %> -
- <% end %> -
+<% end %> diff --git a/app/views/reports/elements/_step_asset_element.html.erb b/app/views/reports/elements/_step_asset_element.html.erb index ea23fd175..6640b0ba1 100644 --- a/app/views/reports/elements/_step_asset_element.html.erb +++ b/app/views/reports/elements/_step_asset_element.html.erb @@ -2,37 +2,35 @@ <% timestamp = asset.created_at %>
-
-
- <%= file_extension_icon_html(asset, true) %> -
-
- <% if defined? export_all and export_all %> - <% if @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> - <% file_link = @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> - <% else %> - <% file_link = @obj_filenames.dig(:assets, asset.id, :file) %> - <% end %> - - <%= t('projects.reports.elements.step_asset.file_name', file: file_link&.split('/')&.last) %> - +
+ <%= file_extension_icon_html(asset, true) %> +
+
+ <% if defined? export_all and export_all %> + <% if @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> + <% file_link = @obj_filenames.dig(:assets, asset.id, :bio_eddie) %> <% else %> - - <% if asset.file.metadata[:asset_type] == 'bio_eddie' %> - <%= t('projects.reports.elements.step_asset.file_name', file: truncate("#{asset.file.metadata[:name]}.helm", length: Constants::FILENAME_TRUNCATION_LENGTH)) %> - - <%= t('Download')%> - - <% else %> - <%= t('projects.reports.elements.step_asset.file_name', file: truncate(asset.file_name, length: Constants::FILENAME_TRUNCATION_LENGTH)) %> - <%= link_to t('projects.reports.elements.download'), asset_download_url(asset, disposition: 'attachment'), class: 'download-link', target: :_blank %> - <% end %> - + <% file_link = @obj_filenames.dig(:assets, asset.id, :file) %> <% end %> -
-
- <%= t('projects.reports.elements.step_asset.user_time', timestamp: l(timestamp, format: :full)) %> -
+ + <%= file_link&.split('/')&.last %> + + <% else %> + + <% if asset.file.metadata[:asset_type] == 'bio_eddie' %> + <%= truncate("#{asset.file.metadata[:name]}.helm", length: Constants::FILENAME_TRUNCATION_LENGTH) %> + + <%= t('Download')%> + + <% else %> + <%= truncate(asset.file_name, length: Constants::FILENAME_TRUNCATION_LENGTH) %> + <%= link_to t('projects.reports.elements.download'), asset_download_url(asset, disposition: 'attachment'), class: 'download-link', target: :_blank %> + <% end %> + + <% end %> +
+
+ <%= t('projects.reports.elements.step_asset.user_time', timestamp: l(timestamp, format: :full)) %>
diff --git a/app/views/reports/elements/_step_checklist_element.html.erb b/app/views/reports/elements/_step_checklist_element.html.erb index c05c9132f..11d7445b4 100644 --- a/app/views/reports/elements/_step_checklist_element.html.erb +++ b/app/views/reports/elements/_step_checklist_element.html.erb @@ -4,19 +4,13 @@ <% export_all = defined?(export_all) && export_all %>
-
-
- -
-
- <%= custom_auto_link(t('projects.reports.elements.step_checklist.checklist_name', - name: checklist.name), - team: current_team, - base64_encoded_imgs: export_all) %> -
-
- <%= t('projects.reports.elements.step_checklist.user_time', timestamp: l(timestamp, format: :full)) %> -
+
+ <%= custom_auto_link(name: checklist.name, + team: current_team, + base64_encoded_imgs: export_all) %> +
+
+ <%= t('projects.reports.elements.step_checklist.user_time', timestamp: l(timestamp, format: :full)) %>
diff --git a/app/views/reports/elements/_step_comments_element.html.erb b/app/views/reports/elements/_step_comments_element.html.erb index 7ae577bc6..780566379 100644 --- a/app/views/reports/elements/_step_comments_element.html.erb +++ b/app/views/reports/elements/_step_comments_element.html.erb @@ -1,36 +1,29 @@ <% step ||= report_element.step %> <% comments = step.step_comments.order(created_at: :desc) %> <% export_all = defined?(export_all) && export_all %> -
-
-
-
- -
+<% if comments.present? %> +
+
- <%= t('projects.reports.elements.step_comments.name', step: step.name) %> + <%= t('projects.reports.elements.step_comments.name') %>
-
-
-
-
- <% if comments.present? %> +
+
+
    <% comments.each do |comment| %> <%= render partial: 'shared/comments/item.html.erb', - locals: { comment: comment, readonly: true, report: true, export_all: export_all } %> + locals: { comment: comment, readonly: true, report: true, export_all: export_all } %> <% end %>
- <% else %> - <%= t('projects.reports.elements.step_comments.no_comments') %> - <% end %> +
+ <% if defined?(children) %> +
+ <%= children %> +
+ <% end %>
- <% if defined?(children) %> -
- <%= children %> -
- <% end %> -
+<% end %> diff --git a/app/views/reports/elements/_step_table_element.html.erb b/app/views/reports/elements/_step_table_element.html.erb index cd7ea7563..5b7ff50d7 100644 --- a/app/views/reports/elements/_step_table_element.html.erb +++ b/app/views/reports/elements/_step_table_element.html.erb @@ -2,29 +2,24 @@ <% timestamp = table.created_at %>
-
-
- -
-
- <% if defined? export_all and export_all %> - <% file_link = @obj_filenames.dig(:tables, table.id, :file) %> - - - <%= t('projects.reports.elements.step_table.table_name', name: file_link&.split('/')&.last) %> - - - <% else %> - <% if table.try(:name) %> - - <%= t('projects.reports.elements.step_table.table_name', name: truncate(table.name, length: Constants::FILENAME_TRUNCATION_LENGTH)) %> - - <% end %> +
+ <% if defined? export_all and export_all %> + <% file_link = @obj_filenames.dig(:tables, table.id, :file) %> + + + <%= file_link&.split('/')&.last %> + + + <% else %> + <% if table.try(:name) %> + + <%= truncate(table.name, length: Constants::FILENAME_TRUNCATION_LENGTH) %> + <% end %> -
-
- <%= t('projects.reports.elements.step_table.user_time', timestamp: l(timestamp, format: :full)) %> -
+ <% end %> +
+
+ <%= t('projects.reports.elements.step_table.user_time', timestamp: l(timestamp, format: :full)) %>
diff --git a/app/views/reports/templates/scinote_template/footer.html.erb b/app/views/reports/templates/scinote_template/footer.html.erb index 1dba70ad5..fa89161dd 100644 --- a/app/views/reports/templates/scinote_template/footer.html.erb +++ b/app/views/reports/templates/scinote_template/footer.html.erb @@ -1,7 +1,6 @@