Bug 19494: Add reservedate to Holds awaiting pickup

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / waitingreserves.tt
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 80af602..b25615d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -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' %]
  <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
-[% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
-//<![CDATA[
-     $(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>
  </head>
+
  <body id="circ_waitingreserves" class="circ">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'circ-search.inc' %]
@@ -32,7 +17,7 @@
  &rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
  </div>
  
-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
+[% 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">
@@ -84,7 +69,8 @@
              [% IF ( reserveloop ) %]
                 <table id="holdst">
                 <thead><tr>
-                    <th class="title-string">Available since</th>
+                    <th class="title-string">Waiting since</th>
+                    <th>Reserve date</th>
                      <th class="anti-the">Title</th>
                      <th>Patron</th>
                      <th>Home branch</th>
@@ -97,6 +83,7 @@
                 <tbody>[% FOREACH reserveloo IN reserveloop %]
                  <tr>
                      <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 %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %]
                          </a>
@@ -137,12 +124,15 @@
          <div id="holdsover">
                  [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %]
                 [% IF ( overloop ) %]
-
                 <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
                     <input type="hidden" name="cancelall" value="1" />
                     <input type="hidden" name="allbranches" value="[% allbranches %]" />
                     <input type="hidden" name="tab" value="holdsover">
-                   <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" />
+                   [% 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)
@@ -150,7 +140,8 @@
  
                 <table id="holdso">
                 <thead><tr>
-                    <th class="title-string">Available since</th>
+                    <th class="title-string">Waiting since</th>
+                    <th>Reserve date</th>
                      <th class="anti-the">Title</th>
                      <th>Patron</th>
                      <th>Home branch</th>
@@ -163,6 +154,7 @@
                 <tbody>[% FOREACH overloo IN overloop %]
                      <tr>
                          <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>
@@ -210,4 +202,23 @@
  </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' %]