From 24f510d479a2d6bbcd1a0d73b51e388e15824b6c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 22 Mar 2021 14:16:49 +0000 Subject: [PATCH] Bug 28014: Add table settings to batch patron modification This patch adds table settings to the tables shown before and after a batch of patrons has been submitted for batch patron modification. To test you must have ExtendedPatronAttributes enabled and at least one configured. - Go to Tools -> Batch patron modification - Submit a set of patrons for modification - In the table showing patron records which will be modified, confirm that all DataTables controls work correctly. - Confirm that the column visibility settings work correctly, including the controls for extended patron attribute columns. - Submit a change to your patron batch. - On the page showing the results, confirm that the DataTables controls continue to work as expected. - Go to Administraion -> Table settings and confirm that making changes to the default configuration for this table (Tools -> batch_patron_modification -> borrowerst) results in the correct default columns being shown on the batch patron modification pages. Signed-off-by: Amit Gupta Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- admin/columns_settings.yml | 50 +++++++++++++++++++ .../prog/en/modules/tools/modborrowers.tt | 38 ++++++++++---- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index df9290d727..60107a6e70 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1434,6 +1434,56 @@ modules: columnname: spent tools: + batch_patron_modification: + borrowerst: + columns: + - + columnname: batch_patron_edit_selections + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: batch_patron_edit_cardnumber + - + columnname: batch_patron_edit_surname + - + columnname: batch_patron_edit_firstname + - + columnname: batch_patron_edit_branchcode + - + columnname: batch_patron_edit_categorycode + - + columnname: batch_patron_edit_streetnumber + - + columnname: batch_patron_edit_address + - + columnname: batch_patron_edit_address2 + - + columnname: batch_patron_edit_city + - + columnname: batch_patron_edit_state + - + columnname: batch_patron_edit_zipcode + - + columnname: batch_patron_edit_country + - + columnname: batch_patron_edit_email + - + columnname: batch_patron_edit_phone + - + columnname: batch_patron_edit_mobile + - + columnname: batch_patron_edit_dateenrolled + - + columnname: batch_patron_edit_dateexpiry + - + columnname: batch_patron_edit_borrowernotes + - + columnname: batch_patron_edit_opacnote + - + columnname: batch_patron_edit_debarred + - + columnname: batch_patron_edit_debarredcomment + logviewer: logst: columns: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 30943e522c..9cd7eca31f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -4,6 +4,7 @@ [% USE KohaDates %] [% USE Branches %] [% USE Categories %] +[% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Batch patron modification @@ -142,7 +143,9 @@ [% IF ( op == 'show' ) %] -   +   + [% ELSE %] +   [% END %] Card number Surname @@ -174,8 +177,12 @@ [% FOREACH borrower IN borrowers %] [% IF ( op == 'show' ) %] - + + [% ELSE %] + [% END %] + + [% borrower.cardnumber | html %] [% borrower.surname | html %] [% borrower.firstname | html %] @@ -344,21 +351,30 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] [% Asset.js("js/tools-menu.js") | $raw %]