scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-16 21:59:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Ensure reports work with new results [SCI-9245]

Browse source
This commit is contained in:
Giga Chubinidze 2023-09-11 12:13:22 +04:00
parent 520f978f35
commit a11a879d90
3 changed files with 31 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/services/reports/docx/draw_my_module.rb
View file

@ -72,13 +72,7 @@ module Reports::Docx::DrawMyModule
@docx.h4 I18n.t('Results') if my_module.results.any? && (%w(file_results table_results text_results).any? { |k| @settings.dig('task', k) }) @docx.h4 I18n.t('Results') if my_module.results.any? && (%w(file_results table_results text_results).any? { |k| @settings.dig('task', k) })
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|
if result.is_asset && @settings.dig('task', 'file_results')
draw_result_asset(result, @settings) draw_result_asset(result, @settings)
elsif result.is_table && @settings.dig('task', 'table_results')
draw_result_table(result)
elsif result.is_text && @settings.dig('task', 'text_results')
draw_result_text(result)
end
end end
@docx.p @docx.p

3
app/services/reports/docx/draw_result_asset.rb
View file

@ -2,7 +2,7 @@
module Reports::Docx::DrawResultAsset module Reports::Docx::DrawResultAsset
def draw_result_asset(result, settings) def draw_result_asset(result, settings)
asset = result.asset result.assets.each do |asset|
timestamp = asset.created_at timestamp = asset.created_at
asset_url = Rails.application.routes.url_helpers.asset_download_url(asset) asset_url = Rails.application.routes.url_helpers.asset_download_url(asset)
color = @color color = @color
@ -35,4 +35,5 @@ module Reports::Docx::DrawResultAsset
draw_result_comments(result) if @settings.dig('task', 'result_comments') draw_result_comments(result) if @settings.dig('task', 'result_comments')
end end
end
end end

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

@ -74,13 +74,7 @@
<% end %> <% 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| %>
<% if result.is_asset && @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 } %>
<% elsif result.is_table && @settings.dig('task', 'table_results') %>
<%= render partial: 'reports/elements/my_module_result_table_element', locals: { result: result, export_all: export_all } %>
<% elsif result.is_text && @settings.dig('task', 'text_results') %>
<%= render partial: 'reports/elements/my_module_result_text_element', locals: { result: result, export_all: export_all } %>
<% end %>
<% end %> <% end %>
</div><br> </div><br>