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

Merge pull request #3401 from artoscinote/ma_SCI_5837

Browse source 
Fixed report docx generation [SCI-5837]
This commit is contained in:
artoscinote 2021-06-21 14:23:19 +02:00 committed by GitHub
commit fb105f8632
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,8 @@ module Reports::Docx::DrawMyModuleRepository
my_module = subject.my_module
repository = subject.repository
repository = assigned_repository_or_snapshot(my_module, repository)
return unless can_read_experiment?(@user, my_module.experiment) &&
return unless repository && can_read_experiment?(@user, my_module.experiment) &&
(repository.is_a?(RepositorySnapshot) || can_read_repository?(@user, repository))
repository_data = my_module.repository_docx_json(repository)

70
app/views/reports/elements/_my_module_repository_element.html.erb
View file

@ -1,43 +1,45 @@
<% my_module ||= report_element.my_module %>
<% repository ||= report_element.repository %>
<% repository ||= assigned_repository_or_snapshot(my_module, repository) %>
<% rows_json = my_module.repository_json_hot(repository, :desc) %>
<div class="report-element report-module-repository-element">
<div class="report-element-header">
<div class="row">
<div class="pull-left repository-icon">
<i class="fas fa-list-alt"></i>
<% repository = assigned_repository_or_snapshot(my_module, repository) %>
<% if repository %>
<% rows_json = my_module.repository_json_hot(repository, :desc) %>
<div class="report-element report-module-repository-element">
<div class="report-element-header">
<div class="row">
<div class="pull-left repository-icon">
<i class="fas fa-list-alt"></i>
</div>
<div class="pull-left repository-name">
<%= t('projects.reports.elements.module_repository.name', repository: repository.name, my_module: my_module.name) %>
<i><%= t('projects.reports.index.deleted') if repository.is_a?(RepositorySnapshot) && !repository.original_repository %></i>
</div>
<% if defined?(export_all) && export_all %>
<div class="pull-left table-name">
<% file_link = @obj_filenames.dig(:repositories, repository.id, :file) %>
<a href="<%= file_link %>">
<em><%= t('projects.reports.elements.module_repository.table_name', name: file_link&.split('/')&.last) %></em>
</a>
</div>
<% end %>
</div>
<div class="pull-left repository-name">
<%= t('projects.reports.elements.module_repository.name', repository: repository.name, my_module: my_module.name) %>
<i><%= t('projects.reports.index.deleted') if repository.is_a?(RepositorySnapshot) && !repository.original_repository %></i>
</div>
<% if defined?(export_all) && export_all %>
<div class="pull-left table-name">
<% file_link = @obj_filenames.dig(:repositories, repository.id, :file) %>
<a href="<%= file_link %>">
<em><%= t('projects.reports.elements.module_repository.table_name', name: file_link&.split('/')&.last) %></em>
</a>
</div>
<div class="report-element-body">
<% if rows_json[:data].count > 0 %>
<input type="hidden" class="hot-table-contents hot-repository-items" value='<%= rows_json.to_json.force_encoding(Encoding::UTF_8) %>' />
<div class="hot-table-container"></div>
<table class="report-common-table-format"></table>
<% else %>
<div class="row">
<div class="col-xs-12">
<em><%= t('projects.reports.elements.module_repository.no_items') %></em>
</div>
</div>
<% end %>
</div>
</div>
<div class="report-element-body">
<% if rows_json[:data].count > 0 %>
<input type="hidden" class="hot-table-contents hot-repository-items" value='<%= rows_json.to_json.force_encoding(Encoding::UTF_8) %>' />
<div class="hot-table-container"></div>
<table class="report-common-table-format"></table>
<% else %>
<div class="row">
<div class="col-xs-12">
<em><%= t('projects.reports.elements.module_repository.no_items') %></em>
</div>
<% if defined?(children) %>
<div class="report-element-children">
<%= children %>
</div>
<% end %>
</div>
<% if defined?(children) %>
<div class="report-element-children">
<%= children %>
</div>
<% end %>
</div>
<% end %>