From 8207f617e8b8200f1e09648386e22d3085b71dc8 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 7 Feb 2017 17:44:12 +0100 Subject: [PATCH] Bug 18073: Holds to pull table enhancement Test plan: 0) apply the patch 1) enable on shelf hold in administration -> circulation and fines rules 2) create some holds on avalaible items 3) go to administration -> columns settings and confirm there is new holds-to-pull table in circulation section 4) go to circulation -> holds to pull page and confirm that 4a) that the page does work as before 4b) there is ne "Column visibility" button in datatable toolbar 4c) the column configuration does work as expected 4d) there is new column "First patron" with link to patron which is first in holds queue for given record 4e) sorting works ax expected 4f) filters (in teh bottom of table) work as expected --- admin/columns_settings.yml | 27 +++++++++++++++++++ circ/pendingreserves.pl | 4 ++- .../prog/en/modules/circ/pendingreserves.tt | 31 +++++++++++++--------- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index ee73b1e..e212edd 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -394,3 +394,30 @@ modules: columnname: date - columnname: notes + + holds: + holds-to-pull: + - + columnname: pull_items + - + columnname: avalaible_items + - + columnname: patrons + - + columnname: patron + - + columnname: title + - + columnname: libraries + - + columnname: call_numbers + - + columnname: copy_numbers + - + columnname: enumeration + - + columnname: itemtypes + - + columnname: locations + - + columnname: hold_date diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index e9cee0c..f601659 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -122,12 +122,14 @@ if ( $run_report ) { biblio.title, biblio.author, count(DISTINCT items.itemnumber) as icount, - count(DISTINCT reserves.borrowernumber) as rcount + count(DISTINCT reserves.borrowernumber) as rcount, + CONCAT_WS(' ', borrowers.firstname, borrowers.surname) as l_patron FROM reserves LEFT JOIN items ON items.biblionumber=reserves.biblionumber LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber LEFT JOIN issues ON items.itemnumber=issues.itemnumber + LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber WHERE reserves.found IS NULL $sqldatewhere diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 11c7a0f..7bda261 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE ColumnsSettings %] [% USE AuthorisedValues %] [%- USE Branches -%] [%- USE ItemTypes -%] @@ -9,17 +10,19 @@ [% INCLUDE 'datatables.inc' %] +[% INCLUDE 'columns_settings.inc' %]