From de62e98d7e56b1e8521d8f59035bf252f7033ead Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 4 Aug 2016 10:05:20 +0200 Subject: [PATCH] Bug 19494: Add reservedate to Holds awaiting pickup Content-Type: text/plain; charset=utf-8 Add reservedate to report. Change label "Available since" to "Waiting since". Note: The table (already) crosses the boundaries of its container. Also the vertical spacing for the first column (already) is not the same as the others. (Adding the second date only makes it more visible.) These minor design issues should be solved on another report. Test plan: [1] Go to Circulation, Holds awaiting pickup [2] Note the additional column for reservedate. Signed-off-by: Marcel de Rooy Signed-off-by: Simon Pouchol --- circ/waitingreserves.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 66fe438..332c5dd 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -104,6 +104,7 @@ while ( my $hold = $holds->next ) { title => $biblio->title, itemnumber => $item->itemnumber, waitingdate => $hold->waitingdate, + reservedate => $hold->reservedate, borrowernum => $patron->borrowernumber, biblionumber => $biblio->biblionumber, barcode => $item->barcode, 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 b703728..b25615d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -69,7 +69,8 @@ [% IF ( reserveloop ) %] - + + @@ -82,6 +83,7 @@ [% FOREACH reserveloo IN reserveloop %] +
Available sinceWaiting sinceReserve date Title Patron Home branch
[% reserveloo.waitingdate | $KohaDates %][% reserveloo.reservedate | $KohaDates %] [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] [% reserveloo.title |html %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] @@ -138,7 +140,8 @@ - + + @@ -151,6 +154,7 @@ [% FOREACH overloo IN overloop %] +
Available sinceWaiting sinceReserve date Title Patron Home branch

[% overloo.waitingdate | $KohaDates %]

[% overloo.reservedate | $KohaDates %] [% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] -- 2.1.4