projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 78f0396)
Adding additional information and consolidating display of information in holds queue...
authorOwen Leonard <oleonard@myacpl.org>
Fri, 20 Feb 2009 16:59:28 +0000 (10:59 -0600)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 16 Sep 2009 21:19:03 +0000 (23:19 +0200)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
circ/view_holdsqueue.pl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl patch | blob | history

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 63f2e24..920f852 100755 (executable)
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -95,9 +95,10 @@ 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
+       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
                   FROM tmp_holdsqueue
                   JOIN biblio USING (biblionumber)
+                                 LEFT JOIN biblioitems USING (biblionumber)
                   LEFT JOIN items USING (itemnumber)
                 /;
     if ($branchlimit) {
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 ff25fdf..ebd04a6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
@@ -1,25 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Holds Queue</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/JavaScript" language="JavaScript">
-//<![CDATA[
-//$.tablesorter.addParser({
-//    id: 'articles', 
-//    is: function(s) {return false;  }, 
-//    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
-//    type: 'text' 
-//});
-//      $(document).ready(function() {
-//             $.tablesorter.defaults.widgets = ['zebra']; 
-//             $("#holdst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
-//             dateFormat: 'uk',<!-- /TMPL_IF -->
-//             sortList: [[1,0]],
-//             headers: { 0: { sorter: 'articles' }}
-//             });
-//      });
-//]]>
-</script>
+<style type="text/css"> p { margin-top: 0; }</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -50,23 +32,26 @@
        <thead>
        <tr>
         <th>Title</th>
-        <th>Author</th>
         <th>Collection</th>
-        <th>Shelving Location</th>
         <th>Call Number</th>
         <th>Barcode</th>
-        <th>Enumeration</th>
+               <th>Patron</th>
         <th>Send To</th>
         <th>Date</th>
     </tr>
        </thead>
      <tbody><!-- TMPL_LOOP NAME="itemsloop"-->
         <tr>
-            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->"><!-- TMPL_VAR NAME="title" escape="html"--></a></td>
-            <td><!-- TMPL_VAR NAME="author" --></td>
+            <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>
             <td><!-- TMPL_VAR NAME="ccode" --></td>
-            <td><!-- TMPL_VAR NAME="location" --></td>
-            <td><!-- TMPL_VAR NAME="itemcallnumber"--></td>
+            <td><!-- TMPL_VAR NAME="location" --> <!-- TMPL_VAR NAME="itemcallnumber"--> <!-- TMPL_VAR NAME="enumchron" --></td>
             <td>
                 <!-- TMPL_IF NAME="item_level_request" -->
                     <!-- TMPL_VAR NAME="barcode" -->
@@ -74,7 +59,7 @@
                     <em>Any available copy</em>
                 <!-- /TMPL_IF -->
             </td>
-            <td><!-- TMPL_VAR NAME="enumchron" --></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>
         </tr>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git