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

Add default text if not repository columns are selected for reports [SCI-11211]

Browse source
This commit is contained in:
Andrej 2024-10-25 12:46:58 +02:00
parent 6bd4d1a1bd
commit c2b7c12497
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,12 @@ module Reports::Docx::DrawMyModuleRepository
@docx.p I18n.t('projects.reports.elements.module_repository.name', @docx.p I18n.t('projects.reports.elements.module_repository.name',
repository: repository.name, repository: repository.name,
my_module: my_module.name), bold: true, size: Constants::REPORT_DOCX_STEP_ELEMENTS_TITLE_SIZE my_module: my_module.name), bold: true, size: Constants::REPORT_DOCX_STEP_ELEMENTS_TITLE_SIZE
if table.present?
@docx.table table, border_size: Constants::REPORT_DOCX_TABLE_BORDER_SIZE @docx.table table, border_size: Constants::REPORT_DOCX_TABLE_BORDER_SIZE
else
@docx.p I18n.t('projects.reports.elements.module_repository.no_columns'), italic: true
end
@docx.p @docx.p
@docx.p @docx.p

2
app/services/reports/docx/repository_helper.rb
View file

@ -5,6 +5,8 @@ module Reports::Docx::RepositoryHelper
include ActionView::Helpers::NumberHelper include ActionView::Helpers::NumberHelper
def prepare_row_columns_for_docx(repository_data, my_module = nil, repository = nil) def prepare_row_columns_for_docx(repository_data, my_module = nil, repository = nil)
return if repository_data[:headers].blank?
result = [repository_data[:headers]] result = [repository_data[:headers]]
excluded_columns = repository_data[:excluded_columns] excluded_columns = repository_data[:excluded_columns]

1
config/locales/en.yml
View file

@ -978,6 +978,7 @@ en:
name: "%{repository} of task %{my_module}" name: "%{repository} of task %{my_module}"
table_name: "%{name}" table_name: "%{name}"
no_items: "No items" no_items: "No items"
no_columns: "No columns selected"
result: result:
user_time: "Added on %{timestamp} by %{user}." user_time: "Added on %{timestamp} by %{user}."
result_asset: result_asset: