mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Revert "Fix result settings for reports [SCI-9693]"
This commit is contained in:
parent
7b6d60fed5
commit
9db6fb2ef5
|
@ -71,6 +71,7 @@
|
|||
<div class="results-title-name">
|
||||
<%= t('projects.reports.elements.module.results') %>
|
||||
</div><br>
|
||||
<% end %>
|
||||
|
||||
<% order_results_for_report(my_module.results, @settings.dig('task', 'result_order')).each do |result| %>
|
||||
<div class="result-name">
|
||||
|
@ -81,17 +82,14 @@
|
|||
</div>
|
||||
|
||||
<% 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} %>
|
||||
<% 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 } %>
|
||||
<% 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 } %>
|
||||
<% end %>
|
||||
|
||||
<div class="user-time">
|
||||
<%= t('projects.reports.elements.result.user_time', user: result.user.full_name, timestamp: l(result.created_at, format: :full)) %>
|
||||
</div>
|
||||
|
@ -102,7 +100,6 @@
|
|||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div><br>
|
||||
|
||||
<% if defined?(children) %>
|
||||
|
|
Loading…
Reference in a new issue