Bugzilla – Attachment 7535 Details for
Bug 7201
Hold to pull report needs extra fields
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug_7201: Holds reports: add copynumber and enumchron
bug7201-Holds-reports-add-copynumber-and-enumchron.patch (text/plain), 9.12 KB, created by
Liz Rea
on 2012-02-09 15:50:16 UTC
(
hide
)
Description:
bug_7201: Holds reports: add copynumber and enumchron
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2012-02-09 15:50:16 UTC
Size:
9.12 KB
patch
obsolete
>From 34a03c19c210dd31b0f693141984bff3b1b513fa Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Thu, 9 Feb 2012 13:24:35 +1300 >Subject: [PATCH] bug_7201: Holds reports: add copynumber and enumchron >Content-Type: text/plain; charset="utf-8" > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >Data is there and correct - very helpful patch, thanks! >passes prove t xt t/db_dependent in line with current master failures. >--- > circ/pendingreserves.pl | 8 +++++++- > circ/view_holdsqueue.pl | 2 +- > circ/waitingreserves.pl | 2 ++ > .../prog/en/modules/circ/pendingreserves.tt | 8 ++++++++ > .../prog/en/modules/circ/view_holdsqueue.tt | 6 +++++- > .../prog/en/modules/circ/waitingreserves.tt | 8 ++++++++ > 6 files changed, 31 insertions(+), 3 deletions(-) > >diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl >index cf71094..d723bc2 100755 >--- a/circ/pendingreserves.pl >+++ b/circ/pendingreserves.pl >@@ -134,13 +134,16 @@ if ( $run_report ) { > GROUP_CONCAT(DISTINCT reserves.branchcode > ORDER BY items.itemnumber SEPARATOR ', ') l_branch, > items.holdingbranch as branch, >- items.itemcallnumber, > GROUP_CONCAT(DISTINCT items.itype > ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype, > GROUP_CONCAT(DISTINCT items.location > ORDER BY items.itemnumber SEPARATOR '<br/>') l_location, > GROUP_CONCAT(DISTINCT items.itemcallnumber > ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber, >+ GROUP_CONCAT(DISTINCT items.enumchron >+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron, >+ GROUP_CONCAT(DISTINCT items.copynumber >+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber, > items.itemnumber, > notes, > notificationdate, >@@ -159,6 +162,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 +204,8 @@ if ( $run_report ) { > holdingbranch => $data->{l_holdingbranch}, > branch => $data->{l_branch}, > itemcallnumber => $data->{l_itemcallnumber}, >+ enumchron => $data->{l_enumchron}, >+ 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..039a0d0 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -129,6 +129,8 @@ foreach my $num (@getreserves) { > $getreserv{'homebranch'} = $gettitle->{'homebranch'}; > $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; > $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; >+ $getreserv{'enumchron'} = $gettitle->{'enumchron'}; >+ $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..613dd98 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,12 @@ $.tablesorter.addParser({ > <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&from=[% from %]&to=[% to %]">Sort</a> > </th> > <th> >+ Available Copy No >+ </th> >+ <th> >+ Available Enumeration >+ </th> >+ <th> > Available Itypes > <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&from=[% from %]&to=[% to %]">Sort</a> > </th> >@@ -131,6 +137,8 @@ $.tablesorter.addParser({ > [% END %] > <td><p>[% reserveloo.holdingbranch %]</p></td> > <td><p>[% reserveloo.itemcallnumber %]</p></td> >+ <td><p>[% reserveloo.copyno %]</p></td> >+ <td><p>[% reserveloo.enumchron %]</p></td> > <td><p>[% reserveloo.itype %]</p></td> > <td><p>[% reserveloo.location %]</p></td> > <td width="15%"> >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 8f0d9cb..d9ba8fc 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,8 @@ $(document).ready(function() { > <th class="hq-title">Title</th> > <th class="hq-collection">Collection</th> > <th class="hq-callnumber">Call Number</th> >+ <th class="hq-copynumber">Copy Number</th> >+ <th class="hq-enumchron">Enumeration</th> > <th class="hq-barcode">Barcode</th> > <th class="hq-patron">Patron</th> > <th class="hq-sendto">Send To</th> >@@ -65,7 +67,9 @@ $(document).ready(function() { > </div> > </td> > <td class="hq-collection">[% itemsloo.ccode %]</td> >- <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %] [% itemsloo.enumchron %]</td> >+ <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %]</td> >+ <td class="hq-copynumber">[% itemsloo.copynumber %]</td> >+ <td class="hq-enumchron">[% itemsloo.enumchron %]</td> > <td class="hq-barcode"> > [% IF ( itemsloo.item_level_request ) %] > <em>Only Item:</em> <strong>[% itemsloo.barcode %]</strong> >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..d5b7bbf 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,8 @@ $.tablesorter.addParser({ > <th>Title</th> > <th>Patron</th> > <th>Location</th> >+ <th>Copy Number</th> >+ <th>Enumeration</th> > <th>Action</th> > </tr></thead> > <tbody>[% FOREACH reserveloo IN reserveloop %] >@@ -95,6 +97,8 @@ $.tablesorter.addParser({ > [% reserveloo.borrowermail %]</a>[% END %] > </td> > <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td> >+ <td>[% reserveloo.copynumber %]</td> >+ <td>[% reserveloo.enumchron %]</td> > <td> > <form name="cancelReserve" action="waitingreserves.pl" method="post"> > <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" /> >@@ -124,6 +128,8 @@ $.tablesorter.addParser({ > <th>Title</th> > <th>Patron</th> > <th>Location</th> >+ <th>Copy Number</th> >+ <th>Enumeration</th> > <th>Action</th> > </tr></thead> > <tbody>[% FOREACH overloo IN overloop %] >@@ -139,6 +145,8 @@ $.tablesorter.addParser({ > [% overloo.borrowermail %]</a>[% END %] > </td> > <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td> >+ <td>[% overloo.copynumber %]</td> >+ <td>[% overloo.enumchron %]</td> > <td><form name="cancelReserve" action="waitingreserves.pl" method="post"> > <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" /> > <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" /> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7201
:
6264
|
6309
|
6318
|
6319
|
7519
| 7535