From dc836fe9377d33ffa949c1526871dea30d931a6d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 1 Aug 2014 14:05:45 -0400 Subject: [PATCH] Bug 12692 - Markup improvements to holds awaiting pickup report Content-Type: text/plain; charset="utf-8" This patch makes some minor updates to the output of the holds awaiting pickup report. To test you should have several holds which are marked as "waiting," including some which have been waiting longer than the number of days specified in the ReservesMaxPickUpDelay system preference. - Go to Circulation -> Holds awaiting pickup - In both the "waiting" and "over" tabs, confirm that titles display any associated subtitle - Confirm that library name is shown instead of library code - Confirm that the patron name mailto: link works correctly --- circ/waitingreserves.pl | 1 + .../prog/en/modules/circ/waitingreserves.tt | 28 +++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 07190a1..222939c 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -114,6 +114,7 @@ foreach my $num (@getreserves) { $getreserv{'itemtype'} = $itemtypeinfo->{'description'}; $getreserv{'title'} = $gettitle->{'title'}; + $getreserv{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'})); $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; $getreserv{'barcode'} = $gettitle->{'barcode'}; $getreserv{'branchname'} = GetBranchName($gettitle->{'homebranch'}); 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 7ba913a..1d5faf4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Holds awaiting pickup [% INCLUDE 'doc-head-close.inc' %] @@ -89,16 +90,17 @@ [% reserveloo.waitingdate | $KohaDates %] [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] - [% reserveloo.title |html %] [% reserveloo.subtitle |html %] + [% reserveloo.title |html %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] -   ([% reserveloo.itemtype %]) + [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]  ([% reserveloo.itemtype %])[% END %][% END %]
Barcode: [% reserveloo.barcode %] - [% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]
[% reserveloo.borrowerphone %]
- [% IF ( reserveloo.borrowermail ) %] + [% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %] + [% IF ( reserveloo.borrowerphone ) %]
[% reserveloo.borrowerphone %][% END %] + [% IF ( reserveloo.borrowermail ) %]
[% reserveloo.borrowermail %][% END %] - [% reserveloo.homebranch %]
[% reserveloo.itemcallnumber %] + [% Branches.GetName( reserveloo.homebranch ) %]
[% reserveloo.itemcallnumber %] [% reserveloo.copynumber %] [% reserveloo.enumchron %] @@ -122,19 +124,18 @@ [% END %]
-

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.

+ [% IF ( ReservesMaxPickUpDelay ) %]

Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.

[% END %] [% IF ( overloop ) %] -

+

[% UNLESS TransferWhenCancelAllWaitingHolds %] - Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) + Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) [% END %] -

-
+ @@ -148,16 +149,17 @@ [% FOREACH overloo IN overloop %] - - +
Available since

[% overloo.waitingdate | $KohaDates %]

[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] + [% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] + [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %]
Barcode: [% overloo.barcode %]
[% overloo.borrowername %], [% overloo.borrowerfirstname %]
[% overloo.borrowerphone %]
- [% IF ( overloo.borrowermail ) %] + [% IF ( overloo.borrowermail ) %] [% overloo.borrowermail %][% END %]
[% overloo.homebranch %] [% overloo.itemcallnumber %][% Branches.GetName( overloo.homebranch ) %] [% overloo.itemcallnumber %] [% overloo.copynumber %] [% overloo.enumchron %]
-- 1.7.9.5