From d373c174eedb4f63f09c7056309c28ade3382e3e Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Tue, 27 Jul 2021 12:34:13 +0200 Subject: [PATCH] Add print label button to repository toolbar (#3453) --- .../javascripts/repositories/repository_datatable.js | 4 ++++ .../sitewide/repository_row_info_modal.js | 1 + app/controllers/repository_rows_controller.rb | 3 ++- app/views/repositories/_print_label_modal.html.erb | 12 ++++++++---- .../repositories/_repository_row_info_modal.html.erb | 2 +- app/views/repositories/_toolbar_buttons.html.erb | 5 +++++ config/locales/en.yml | 1 + config/routes.rb | 4 +++- 8 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index d0698f9fe..c57c5b113 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -65,6 +65,7 @@ var RepositoryDatatable = (function(global) { $('#restoreRepositoryRecords').prop('disabled', true); $('#deleteRepositoryRecords').prop('disabled', true); $('#editDeleteCopy').hide(); + $('#toolbarPrintLabel').hide(); } else { if (rowsSelected.length === 1) { $('#editRepositoryRecord').prop('disabled', false); @@ -82,6 +83,7 @@ var RepositoryDatatable = (function(global) { $('#archiveRepositoryRecordsButton').prop('disabled', true); } $('#editDeleteCopy').show(); + $('#toolbarPrintLabel').show(); } } else if (currentMode === 'editMode') { $(TABLE_WRAPPER_ID).addClass('editing'); @@ -100,6 +102,8 @@ var RepositoryDatatable = (function(global) { $('.repository-row-selector').prop('disabled', true); $('.dataTables_filter input').prop('disabled', true); } + + $('#toolbarPrintLabel').data('rows', JSON.stringify(rowsSelected)); } function clearRowSelection() { diff --git a/app/assets/javascripts/sitewide/repository_row_info_modal.js b/app/assets/javascripts/sitewide/repository_row_info_modal.js index 8044aea9a..b80b1029f 100644 --- a/app/assets/javascripts/sitewide/repository_row_info_modal.js +++ b/app/assets/javascripts/sitewide/repository_row_info_modal.js @@ -56,6 +56,7 @@ $.ajax({ method: 'GET', url: $(this).data('url'), + data: { rows: JSON.parse($(this).data('rows')) }, dataType: 'json' }).done(function(xhr, settings, data) { $('body').append($.parseHTML(data.responseJSON.html)); diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index 20664ba8c..bf285b3cc 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -5,7 +5,7 @@ class RepositoryRowsController < ApplicationController include MyModulesHelper before_action :load_repository, except: :show - before_action :load_repository_row, only: %i(update assigned_task_list print_modal) + before_action :load_repository_row, only: %i(update assigned_task_list) before_action :check_read_permissions, except: %i(show create update delete_records copy_records) before_action :check_snapshotting_status, only: %i(create update delete_records copy_records) before_action :check_create_permissions, only: :create @@ -72,6 +72,7 @@ class RepositoryRowsController < ApplicationController end def print_modal + @repository_rows = @repository.repository_rows.where(id: params[:rows]) @printers = ['test1', 'test2', 'test3'] respond_to do |format| format.json do diff --git a/app/views/repositories/_print_label_modal.html.erb b/app/views/repositories/_print_label_modal.html.erb index 21f55a3f0..344f7e93a 100644 --- a/app/views/repositories/_print_label_modal.html.erb +++ b/app/views/repositories/_print_label_modal.html.erb @@ -4,10 +4,14 @@

- <%= t('repository_row.modal_print_label.head_title', repository_row: @repository_row.name) %> - - <%= t('repository_row.modal_print_label.id_label', repository_row_id: @repository_row.id) %> - + <% if @repository_rows.size == 1 %> + <%= t('repository_row.modal_print_label.head_title', repository_row: @repository_rows.first.name) %> + + <%= t('repository_row.modal_print_label.id_label', repository_row_id: @repository_rows.first.id) %> + + <% else %> + <%= t('repository_row.modal_print_label.head_title_multiple', repository_rows: @repository_rows.size) %> + <% end %>

diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb index f9b3ae42b..cb9e6e9a7 100644 --- a/app/views/repositories/_repository_row_info_modal.html.erb +++ b/app/views/repositories/_repository_row_info_modal.html.erb @@ -107,7 +107,7 @@
- +
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb index 38a689f7a..08d8a8db4 100644 --- a/app/views/repositories/_toolbar_buttons.html.erb +++ b/app/views/repositories/_toolbar_buttons.html.erb @@ -64,6 +64,11 @@

<%= t('repositories.index.view_only_permission_label') %>

<% end %> <% end %> +
<% if @repository.active? %> <%= t('repositories.show.archived_view_label.active', repository_name: @repository.name) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index fcb9b26f1..fc06e1d24 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1609,6 +1609,7 @@ en: no_tasks: "This item in not assigned to any task." modal_print_label: head_title: "Print label - %{repository_row}" + head_title_multiple: "Print label - %{repository_rows} rows" id_label: "ID: %{repository_row_id}" printer: "Printer" number_of_copies: "Number of copies" diff --git a/config/routes.rb b/config/routes.rb index 4086ae71f..45722a73d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -560,8 +560,10 @@ Rails.application.routes.draw do resources :repository_columns, only: %i(index new edit destroy) resources :repository_rows, only: %i(create show update) do - member do + collection do get :print_modal + end + member do get :assigned_task_list end end