From d5434816a4d9eabc5390376bcf2e1f9df788a8d9 Mon Sep 17 00:00:00 2001 From: Srdjan Jankovic Date: Wed, 9 Nov 2011 20:29:41 +1300 Subject: [PATCH] bug_7201: Add copynumber to holds reports --- circ/pendingreserves.pl | 4 ++++ circ/view_holdsqueue.pl | 2 +- circ/waitingreserves.pl | 1 + .../prog/en/modules/circ/pendingreserves.tt | 4 ++++ .../prog/en/modules/circ/view_holdsqueue.tt | 2 ++ .../prog/en/modules/circ/waitingreserves.tt | 4 ++++ 6 files changed, 16 insertions(+), 1 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index cf71094..5ac0701 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -141,6 +141,8 @@ if ( $run_report ) { ORDER BY items.itemnumber SEPARATOR '
') l_location, GROUP_CONCAT(DISTINCT items.itemcallnumber ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber, + GROUP_CONCAT(DISTINCT items.copynumber + ORDER BY items.itemnumber SEPARATOR '
') l_copynumber, items.itemnumber, notes, notificationdate, @@ -159,6 +161,7 @@ if ( $run_report ) { WHERE reserves.found IS NULL $sqldatewhere + AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber) AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL) AND issues.itemnumber IS NULL AND reserves.priority <> 0 @@ -200,6 +203,7 @@ if ( $run_report ) { holdingbranch => $data->{l_holdingbranch}, branch => $data->{l_branch}, itemcallnumber => $data->{l_itemcallnumber}, + copyno => $data->{l_copynumber}, notes => $data->{notes}, notificationdate => $data->{notificationdate}, reminderdate => $data->{reminderdate}, diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 3023cdf..4b51423 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -81,7 +81,7 @@ sub GetHoldsQueueItems { my $dbh = C4::Context->dbh; my @bind_params = (); - my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn + my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber FROM tmp_holdsqueue JOIN biblio USING (biblionumber) LEFT JOIN biblioitems USING (biblionumber) diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 128d1eb..d25599a 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -129,6 +129,7 @@ foreach my $num (@getreserves) { $getreserv{'homebranch'} = $gettitle->{'homebranch'}; $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; + $getreserv{'copynumber'} = $gettitle->{'copynumber'}; if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) { $getreserv{'dotransfer'} = 1; } 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 5668a75..254d0eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -72,6 +72,9 @@ $.tablesorter.addParser({ Sort + Available Copy No + + Available Itypes Sort @@ -131,6 +134,7 @@ $.tablesorter.addParser({ [% END %]

[% reserveloo.holdingbranch %]

[% reserveloo.itemcallnumber %]

+

[% reserveloo.copyno %]

[% reserveloo.itype %]

[% reserveloo.location %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index e54529a..78cf000 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -46,6 +46,7 @@ $(document).ready(function() { Title Collection Call Number + Copy Number Barcode Patron Send To @@ -65,6 +66,7 @@ $(document).ready(function() { [% itemsloo.ccode %] [% itemsloo.location %] [% itemsloo.itemcallnumber %] [% itemsloo.enumchron %] + [% itemsloo.copynumber %] [% IF ( itemsloo.item_level_request ) %] Only Item: [% itemsloo.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 7ecc3a1..6a06ae1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -79,6 +79,7 @@ $.tablesorter.addParser({ Title Patron Location + Copy Number Action [% FOREACH reserveloo IN reserveloop %] @@ -95,6 +96,7 @@ $.tablesorter.addParser({ [% reserveloo.borrowermail %][% END %] [% reserveloo.homebranch %]
[% reserveloo.itemcallnumber %] + [% reserveloo.copynumber %]
@@ -124,6 +126,7 @@ $.tablesorter.addParser({ Title Patron Location + Copy Number Action [% FOREACH overloo IN overloop %] @@ -139,6 +142,7 @@ $.tablesorter.addParser({ [% overloo.borrowermail %][% END %] [% overloo.homebranch %] [% overloo.itemcallnumber %] + [% overloo.copynumber %] -- 1.6.5