From: Chris Cormack <[email protected]> Squashed commit of the following:
commit 555e8a872408371ca9e730b41a61d4fdbb897d51 Author: Chris Cormack <[email protected]> Date: Wed Aug 18 21:52:32 2010 +1200 Removing IE debug commit 11df1c363af3fe660e25fb1b18885d205137adb4 Author: Chris Cormack <[email protected]> Date: Wed Aug 18 09:52:31 2010 +1200 Final fix for this bug 5143 commit efbb69d898c07332404d6ca906f801ad7ae89707 Author: Chris Cormack <[email protected]> Date: Wed Aug 18 09:40:09 2010 +1200 Typo fix commit 0b9423ab3910138e561d73e63190a2a51c7bb603 Author: Chris Cormack <[email protected]> Date: Wed Aug 18 09:36:47 2010 +1200 Bug 5143, adding subtile, parts and numbers to the holdsqueue report [Bug 5143] Subtitles not showing on view-holdsqueue.pl Seeking sign off. adds: - the subtitles into the title link (originally Chris Cormack) - barcodes for every listed hold - denoted which items were only item and which could be filled by any item on that bib. - added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed) [bug 5143] Fixing whitespace errors. More whitespace corrections --- circ/view_holdsqueue.pl | 8 +++- .../prog/en/modules/circ/view_holdsqueue.tmpl | 54 ++++++++++---------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 668bdd1..3023cdf 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -96,7 +96,13 @@ sub GetHoldsQueueItems { $sth->execute(@bind_params); my $items = []; while ( my $row = $sth->fetchrow_hashref ){ - $row->{reservedate} = format_date($row->{reservedate}); + $row->{reservedate} = format_date($row->{reservedate}); + my $record = GetMarcBiblio($row->{biblionumber}); + if ($record){ + $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield}; + $row->{parts} = GetRecordValue('parts',$record,'')->[0]->{subfield}; + $row->{numbers} = GetRecordValue('numbers',$record,'')->[0]->{subfield}; + } push @$items, $row; } return $items; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl index 52ddd85..a9d737e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl @@ -14,7 +14,7 @@ </div> <div id="doc" class="yui-t7"> - + <div id="bd"> <div id="yui-main"> <div class="yui-g"> @@ -29,48 +29,48 @@ <!-- TMPL_ELSE--> <div class="dialog message">No items found.</div> <!-- /TMPL_IF --> - <!-- TMPL_IF NAME="itemsloop" --> <table id="holdst"> <thead> <tr> - <th>Title</th> - <th>Collection</th> - <th>Call Number</th> - <th>Barcode</th> - <th>Patron</th> - <th>Send To</th> - <th>Date</th> + <th id="hq-title">Title</th> + <th id="hq-collection">Collection</th> + <th id="hq-callnumber">Call Number</th> + <th id="hq-barcode">Barcode</th> + <th id="hq-patron">Patron</th> + <th id="hq-sendto">Send To</th> + <th id="hq-date">Date</th> </tr> </thead> <tbody><!-- TMPL_LOOP NAME="itemsloop"--> <tr> - <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->"><strong><!-- TMPL_VAR NAME="title" escape="html"--></strong></a></p> - <p><strong><!-- TMPL_VAR NAME="author" --></strong> - <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --> - <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --> - <!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --> - <!-- TMPL_IF name="pages" -->: <!-- TMPL_VAR name="pages" --> <!-- /TMPL_IF --> - <!-- TMPL_IF name="size" --><!-- TMPL_VAR name="size" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --></p> + <td id="hq-title"><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->"><strong><!-- TMPL_VAR NAME="title" escape="html"--></strong></a></p> + <p><strong><!-- TMPL_VAR NAME="author" --></strong> + <div id="hq-pubdata"> <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --> + <!-- TMPL_ELSIF name="copyrightdate"-->, <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="pages" -->: <!-- TMPL_VAR name="pages" --> <!-- /TMPL_IF --> + <!-- TMPL_IF name="size" --><!-- TMPL_VAR name="size" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --></p> + </div> </td> - <td><!-- TMPL_VAR NAME="ccode" --></td> - <td><!-- TMPL_VAR NAME="location" --> <!-- TMPL_VAR NAME="itemcallnumber"--> <!-- TMPL_VAR NAME="enumchron" --></td> - <td> + <td id="hq-collection"><!-- TMPL_VAR NAME="ccode" --></td> + <td id="hq-callnumber"><!-- TMPL_VAR NAME="location" --> <!-- TMPL_VAR NAME="itemcallnumber"--> <!-- TMPL_VAR NAME="enumchron" --></td> + <td id="hq-barcode"> <!-- TMPL_IF NAME="item_level_request" --> - <!-- TMPL_VAR NAME="barcode" --> + <em>Only Item: </em><!-- TMPL_VAR NAME="barcode" --> <!-- TMPL_ELSE --> - <em>Any available copy</em> + <strong><!-- TMPL_VAR NAME="barcode" --></strong></br><em>or Any available</em> <!-- /TMPL_IF --> </td> - <td><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->#reserves"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></p> <p><!-- TMPL_VAR NAME="phone" --></p></td> - <td><!-- TMPL_VAR NAME="pickbranch" --></td> - <td><!-- TMPL_VAR NAME="reservedate" --></td> + <td id="hq-patron"><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->#reserves"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></p> <p><!-- TMPL_VAR NAME="phone" --></p></td> + <td id="hq-sendto"><!-- TMPL_VAR NAME="pickbranch" --></td> + <td id="hq-date"><!-- TMPL_VAR NAME="reservedate" --></td> </tr> <!-- /TMPL_LOOP --></tbody> </table> <!-- /TMPL_IF --> - <!-- /TMPL_IF --> - + <!-- /TMPL_IF --> + <!-- TMPL_UNLESS NAME="total" --> <form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post"> <fieldset class="rows"> @@ -84,7 +84,7 @@ <!-- /TMPL_IF --> <!-- /TMPL_LOOP --> </select></li> - <!-- Not working yet + <!-- FIXME Not working yet <li><label for="itemtypeslimit">Item Type: </label><select name="itemtypeslimit" id="itemtypeslimit"> <option value="">All</option> <!-- TMPL_LOOP name="itemtypeloop" --> -- 1.5.6.5 _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
