Bug 19494: Add reservedate to Holds awaiting pickup
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / waitingreserves.tt
index a77d330..b25615d 100644 (file)
@@ -1,28 +1,13 @@
+[% USE Koha %]
+[% USE KohaDates %]
+[% USE Branches %]
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Circulation &rsaquo; Holds awaiting pickup</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% 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() {
-         $('#resultlist').tabs();
-         $("th a").hide();
-         $.tablesorter.defaults.widgets = ['zebra'];
-         $("#holdst,#holdso").tablesorter({[% IF ( dateformat == 'metric' ) %]
-            dateFormat: 'uk',[% END %]
-            sortList: [[3,0]],
-            headers: { 1:{sorter:'articles'},3: { sorter: 'articles' },4:{sorter:false}}
-        }); 
-      });
-//]]>
-</script>
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 </head>
+
 <body id="circ_waitingreserves" class="circ">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
@@ -32,13 +17,14 @@ $.tablesorter.addParser({
 &rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
 </div>
 
-<div id="doc3" class="yui-t7">
+[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
 
    <div id="bd">
     <div id="yui-main">
+    [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
     <div class="yui-g">
 
-        <h2>Holds awaiting pickup for your library on: [% show_date %]
+        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
             [% IF ( all_branches_link ) %]
             <span style="margin-left:20px"><a href="[% all_branches_link %]">
             View all libraries</a></span>
@@ -48,12 +34,12 @@ $.tablesorter.addParser({
         [% FOREACH cancel_result %]
             [% IF ( messagetransfert ) %]
                 <div class="dialog message">
-                    <h2>This item is on hold for pick-up at another library</h2>
+                    <h2>This item is on hold for pick-up at [% Branches.GetName( branchname ) %]</h2>
                     <p><strong>[% nextreservtitle %]</strong> is on hold for <strong> [% nextreservsurname %], [% nextreservfirstname %]</strong>.
                     Please retain this item and check it in to process the hold.
                     </p>
-                    <form name="cancelReservewithtransfert" action="waitingreserves.pl" method="post">
-                        <input type="submit" class="submit" value="OK" />
+                    <form name="cancelReservewithtransfert" action="waitingreserves.pl#[% tab %]" method="post">
+                        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
                     </form>
                 </div>
             [% END %]
@@ -63,8 +49,8 @@ $.tablesorter.addParser({
                     <p><strong>[% nextreservtitle %]</strong> is on hold for <strong>[% nextreservsurname %], [% nextreservfirstname %]</strong>.
                     Please retain this item and check it in to process the hold.
                     </p>
-                    <form name="cancelReservewithwaiting" action="waitingreserves.pl" method="post">
-                        <input type="submit" class="submit" value="OK"/>
+                    <form name="cancelReservewithwaiting" action="waitingreserves.pl#[% tab %]" method="post">
+                        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
                     </form>
                 </div>
             [% END %]
@@ -72,35 +58,46 @@ $.tablesorter.addParser({
     [% ELSE %]
         <div id="resultlist" class="toptabs">
             <ul>
-                <li><a href="#holdswaiting">[% reservecount %] Hold(s) waiting</a></li>
-                <li><a href="#holdsover">[% overcount %] Hold(s) over</a></li>
+                <li><a href="#holdswaiting">Holds waiting: [% reservecount %]</a></li>
+                <li>
+                    <a href="#holdsover">
+                        Holds waiting over [% ReservesMaxPickUpDelay %] days: [% overcount %]
+                    </a>
+                </li>
             </ul>
             <div id="holdswaiting">
             [% IF ( reserveloop ) %]
                <table id="holdst">
                <thead><tr>
-                    <th>Available since</th>
-                    <th>Title</th>
+                    <th class="title-string">Waiting since</th>
+                    <th>Reserve date</th>
+                    <th class="anti-the">Title</th>
                     <th>Patron</th>
-                    <th>Location</th>
+                    <th>Home branch</th>
+                    <th>Current location</th>
+                    <th>Call number</th>
                     <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
                <tbody>[% FOREACH reserveloo IN reserveloop %]
                 <tr>
-                    <td><p>[% reserveloo.waitingdate %]</p></td>
+                    <td><span title="[% reserveloo.waitingdate %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
+                    <td>[% reserveloo.reservedate | $KohaDates %]</td>
                     <td>[% 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 %]
                         </a>
-                            &nbsp; (<b>[% reserveloo.itemtype %]</b>)
+                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
                             <br />Barcode: [% reserveloo.barcode %]
                     </td>
-                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br />
-                        [% IF ( reserveloo.borrowermail ) %]<a href="mailto:[% reserveloo.email %]?subject=Reservation: [% reserveloo.title %]">
+                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a>
+                        [% IF ( reserveloo.borrowerphone ) %]<br />[% reserveloo.borrowerphone %][% END %]
+                        [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]">
                         [% reserveloo.borrowermail %]</a>[% END %]
                     </td>
-                    <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td>
+                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
+                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
+                    <td>[% reserveloo.itemcallnumber %]</td>
                     <td>[% reserveloo.copynumber %]</td>
                     <td>[% reserveloo.enumchron %]</td>
                     <td>
@@ -109,8 +106,9 @@ $.tablesorter.addParser({
                             <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
                             <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" />
                             <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" />
+                            <input type="hidden" name="tab" value="holdswaiting">
                             [% IF ( reserveloo.dotransfer ) %]
-                            <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> 
+                            <input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.homebranch ) %]" />
                             [% ELSE %]
                             <input type="submit" value="Cancel hold" />
                             [% END %]
@@ -124,42 +122,52 @@ $.tablesorter.addParser({
         [% END %]
         </div>
         <div id="holdsover">
-                <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>
+                [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %]
                [% IF ( overloop ) %]
-               <p>
                <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
                    <input type="hidden" name="cancelall" value="1" />
                    <input type="hidden" name="allbranches" value="[% allbranches %]" />
-                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
+                   <input type="hidden" name="tab" value="holdsover">
+                   [% IF TransferWhenCancelAllWaitingHolds %]
+                       <input type="submit" value="Cancel and Transfer all" />
+                   [% ELSE %]
+                       <input type="submit" value="Cancel all" />
+                   [% END %]
                </form>
                [% 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 %]
-               </p>
-               <br/>
+
                <table id="holdso">
                <thead><tr>
-                    <th>Available since</th>
-                    <th>Title</th>
+                    <th class="title-string">Waiting since</th>
+                    <th>Reserve date</th>
+                    <th class="anti-the">Title</th>
                     <th>Patron</th>
-                    <th>Location</th>
+                    <th>Home branch</th>
+                    <th>Current location</th>
+                    <th>Call number</th>
                     <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
                <tbody>[% FOREACH overloo IN overloop %]
                     <tr>
-                        <td><p>[% overloo.waitingdate %]</p></td>
-                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %]
+                        <td><p><span title="[% overloo.waitingdate %]">[% overloo.waitingdate | $KohaDates %]</span></p></td>
+                        <td>[% overloo.reservedate | $KohaDates %]</td>
+                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %]
+                            [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %]
                         </a>
                             [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
                         <br />Barcode: [% overloo.barcode %]
                     </td>
                     <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
-                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.email %]?subject=Reservation: [% overloo.title |url %]">
+                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]">
         [% overloo.borrowermail %]</a>[% END %]
                     </td>
-                    <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td>
+                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
+                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
+                    <td>[% overloo.itemcallnumber %]</td>
                     <td>[% overloo.copynumber %]</td>
                     <td>[% overloo.enumchron %]</td>
                     <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
@@ -167,8 +175,9 @@ $.tablesorter.addParser({
                             <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
                             <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" />
                             <input type="hidden" name="tbr" value="[% overloo.homebranch %]" />
+                            <input type="hidden" name="tab" value="holdsover">
                             [% IF ( overloo.dotransfer ) %]
-                            <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" />
+                            <input type="submit" value="Cancel hold and return to : [% Branches.GetName( overloo.homebranch ) %]" />
                             [% ELSE %]
                             <input type="submit" value="Cancel hold" />
                             [% END %]
@@ -186,5 +195,30 @@ $.tablesorter.addParser({
 
 </div>
 </div>
+[% IF Koha.Preference('CircSidebar') %]
+</div>
+<div class="yui-b noprint">
+    [% INCLUDE 'circ-nav.inc' %]
 </div>
+[% END %]
+</div>
+
+[% MACRO jsinclude BLOCK %]
+    [% INCLUDE 'datatables.inc' %]
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#resultlist').tabs();
+            $("th a").hide();
+            $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, {
+                "aoColumnDefs": [
+                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
+                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                ],
+                "sPaginationType": "four_button"
+            }));
+        });
+    </script>
+[% END %]
+
 [% INCLUDE 'intranet-bottom.inc' %]