From 933b166900873cf980144afc8daabf6d60b17b9e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 22 Nov 2019 19:29:53 +0000 Subject: [PATCH] Bug 11281: Printing holds awaiting pickup prints both tabs This patch adds columns configuration to the holds awaiting pickup tables. Doing so helps solve the printing issue by adding a "Print" option to both tables. Using this print function will provide a printable version of only that table. To test you should have multiple holds in your system which are marked "waiting" and some which have been waiting longer than the value specified in the ReservesMaxPickUpDelay system preference. Apply the patch and go to Circulation -> Holds awaiting pickup. - On both the "Holds waiting" and "Holds waiting over..." tabs the DataTable should display correctly and all the controls should work, including the columns settings and the choices in the export menu. - Confirm that the "Print" action creates a printable version of only the table you are viewing. - Go to Administration -> Columns settings -> Circulation. - Change some visibility controls for the tables under the "holds_awaiting_pickup" heading (id=holdso and id=holdst). Confirm that these changes are reflected in the "Holds waiting" interface. Signed-off-by: David Nind --- admin/columns_settings.yml | 49 ++++++++++++++++++++++ .../prog/en/includes/waiting_holds.inc | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 32 ++++++++++---- 3 files changed, 74 insertions(+), 9 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 2bb203c345..f882e9f867 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -995,6 +995,55 @@ modules: - columnname: items_needed + holds_awaiting_pickup: + holdst: + - + columnname: waiting_since + - + columnname: date_hold_placed + - + columnname: title + - + columnname: patron + - + columnname: home_library + - + columnname: current_location + - + columnname: shelving_location + - + columnname: call_number + - + columnname: copy_number + - + columnname: enumeration + - + columnname: action + + holdso: + - + columnname: waiting_since + - + columnname: date_hold_placed + - + columnname: title + - + columnname: patron + - + columnname: home_library + - + columnname: current_location + - + columnname: shelving_location + - + columnname: call_number + - + columnname: copy_number + - + columnname: enumeration + - + columnname: action + overdues: circ-overdues: - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index f8a3045f56..3ec275f7fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -13,7 +13,7 @@ Call number Copy number Enumeration - Action + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index b4dd22773b..43a26845a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -3,6 +3,7 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% USE ColumnsSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Holds awaiting pickup @@ -27,7 +28,7 @@ [% IF Koha.Preference('CircSidebar') %]
[% ELSE %] -
+
[% END %]

Holds awaiting pickup for your library on: [% show_date | $KohaDates %] @@ -120,18 +121,33 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] [% END %] -- 2.11.0