scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-04 03:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix result settings for reports [SCI-9693]"

Browse source
This commit is contained in:
Martin Artnik 2023-11-15 09:23:38 +01:00 committed by GitHub
parent 7b6d60fed5
commit 9db6fb2ef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/views/reports/elements/_my_module_element.html.erb
View file

@ -71,6 +71,7 @@
<div class="results-title-name"> <div class="results-title-name">
<%= t('projects.reports.elements.module.results') %> <%= t('projects.reports.elements.module.results') %>
</div><br> </div><br>
<% end %>
<% order_results_for_report(my_module.results, @settings.dig('task', 'result_order')).each do |result| %> <% order_results_for_report(my_module.results, @settings.dig('task', 'result_order')).each do |result| %>
<div class="result-name"> <div class="result-name">
@ -81,17 +82,14 @@
</div> </div>
<% result.result_orderable_elements.each do |element| %> <% result.result_orderable_elements.each do |element| %>
<% if element.orderable_type == "ResultTable" && @settings.dig('task', 'table_results') %> <% if element.orderable_type == "ResultTable" %>
<%= render partial: 'reports/elements/my_module_result_table_element', locals: { result: result, export_all: export_all, element: element} %> <%= render partial: 'reports/elements/my_module_result_table_element', locals: { result: result, export_all: export_all, element: element} %>
<% elsif element.orderable_type == "ResultText" && @settings.dig('task', 'text_results') %> <% elsif element.orderable_type == "ResultText" %>
<%= render partial: 'reports/elements/my_module_result_text_element', locals: { result: result, export_all: export_all, element: element } %> <%= render partial: 'reports/elements/my_module_result_text_element', locals: { result: result, export_all: export_all, element: element } %>
<% end %> <% end %>
<% end %> <% end %>
<% if @settings.dig('task', 'file_results') %>
<%= render partial: 'reports/elements/my_module_result_asset_element', locals: { result: result, report: report, export_all: export_all } %> <%= render partial: 'reports/elements/my_module_result_asset_element', locals: { result: result, report: report, export_all: export_all } %>
<% end %>
<div class="user-time"> <div class="user-time">
<%= t('projects.reports.elements.result.user_time', user: result.user.full_name, timestamp: l(result.created_at, format: :full)) %> <%= t('projects.reports.elements.result.user_time', user: result.user.full_name, timestamp: l(result.created_at, format: :full)) %>
</div> </div>
@ -102,7 +100,6 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %>
</div><br> </div><br>
<% if defined?(children) %> <% if defined?(children) %>