From 9d7aa100f9ef8ef7769333e7a0101b09e2d944e1 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Date: Thu, 4 Aug 2016 10:05:20 +0200 Subject: [PATCH] Bug 19494: Add reservedate to Holds awaiting pickup 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 <m.de.rooy@rijksmuseum.nl> Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> --- 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 8527f2d..d7e47be 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -108,6 +108,7 @@ foreach my $num (@getreserves) { my $patron = Koha::Patrons->find( $num->{borrowernumber} ); my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype ); $getreserv{'waitingdate'} = $num->{'waitingdate'}; + $getreserv{'reservedate'} = $num->{'reservedate'}; my ( $expire_year, $expire_month, $expire_day ) = split (/-/, $num->{'expirationdate'}); my $calcDate = Date_to_Days( $expire_year, $expire_month, $expire_day ); 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 e0f7169..f4dd244 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -84,7 +84,8 @@ [% IF ( reserveloop ) %] <table id="holdst"> <thead><tr> - <th class="title-string">Available since</th> + <th class="title-string">Waiting since</th> + <th>Reserve date</th> <th class="anti-the">Title</th> <th>Patron</th> <th>Home branch</th> @@ -97,6 +98,7 @@ <tbody>[% FOREACH reserveloo IN reserveloop %] <tr> <td><span title="[% reserveloo.waitingdate %]">[% reserveloo.waitingdate | $KohaDates %]</span></td> + <td>[% reserveloo.reservedate | $KohaDates %]</td> <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] [% reserveloo.title |html %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] </a> @@ -153,7 +155,8 @@ <table id="holdso"> <thead><tr> - <th class="title-string">Available since</th> + <th class="title-string">Waiting since</th> + <th>Reserve date</th> <th class="anti-the">Title</th> <th>Patron</th> <th>Home branch</th> @@ -166,6 +169,7 @@ <tbody>[% FOREACH overloo IN overloop %] <tr> <td><p><span title="[% overloo.waitingdate %]">[% overloo.waitingdate | $KohaDates %]</span></p></td> + <td>[% overloo.reservedate | $KohaDates %]</td> <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] </a> -- 2.7.4