[Koha-patches] [PATCH] Bug 12088 - Improve date handling and sorting in holds to pull report

[Owen Leonard]

The holds to pull report could be improved by improving sorting on the
title and date columns. This patch adds "anti-the" sorting to the title
column and "title-string" sorting to the date column.

Date formatting of another variable has been moved to the template for
formatting using KohaDates.

The patch includes other corrections for HTML validity.

To test, apply the patch and view the holds to pull report.
 - Sorting by date should work correctly regardless of dateformat system
   preference setting.
 - Sorting of the title columns should correctly ignore articles.
 - Formatting of the "Reported on" date should be correct.
---
 circ/pendingreserves.pl                            |    4 +--
 .../prog/en/modules/circ/pendingreserves.tt        |   28 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 0110deb..c6c9b82 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -166,7 +166,7 @@ if ( $run_report ) {
         push(
             @reservedata,
             {
-                reservedate     => format_date( $data->{l_reservedate} ),
+                reservedate     => $data->{l_reservedate},
                 priority        => $data->{priority},
                 name            => $data->{l_patron},
                 title           => $data->{title},
@@ -198,7 +198,7 @@ if ( $run_report ) {
 }
 
 $template->param(
-    todaysdate          => format_date($todaysdate),
+    todaysdate          => $todaysdate,
     from                => $startdate,
     to                  => $enddate,
     run_report          => $run_report,
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 78df0e4..9166cac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha › Circulation › Holds to pull</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -5,13 +6,14 @@
 <!-- Plugin datatables -->
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
-<script type="text/JavaScript" language="JavaScript">
+<script type="text/JavaScript">
 //<![CDATA[
 $(document).ready(function() {
-  [% IF (dateformat == 'metric') %]
-      dt_add_type_uk_date();
-  [% END %]
   var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
+    "aoColumnDefs": [
+        { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
+        { "sType": "title-string", "aTargets" : [ "title-string" ] }
+    ]
   }));
   holdst.fnAddFilters("filter");
   [%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %]
@@ -80,7 +82,7 @@ $(document).ready(function() {
 
 <h2>Holds to pull[% IF ( run_report ) %] placed between [% from %] and [% to %][% END %]</h2>
 [% IF ( run_report ) %]
-<h3>Reported on [% todaysdate %]</h3>
+<h3>Reported on [% todaysdate | $KohaDates %]</h3>
 <p>The following holds have not been filled. Please retrieve them and check them in.</p>
 <div class="searchresults">
     [% IF ( reserveloop ) %]
@@ -90,14 +92,14 @@ $(document).ready(function() {
         <th>Pull this many items</th>
         <th>Items available</th>
         <th>Patrons with holds</th>
-        <th>Title</th>
+        <th class="anti-the">Title</th>
         <th>Libraries</th>
         <th>Available call numbers</th>
         <th>Available copy numbers</th>
         <th>Available enumeration</th>
         <th>Available itypes</th>
         <th>Available locations</th>
-        <th>Earliest hold date</th>
+        <th class="title-string">Earliest hold date</th>
         </tr>
     </thead>
     <tbody>
@@ -109,10 +111,9 @@ $(document).ready(function() {
             <td>[% reserveloo.rcount %]</td>
             <td>
             <p>
-        [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
-                    [% reserveloo.title |html %]
-                </a> [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
-            </p>
+                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
+                [% reserveloo.title |html %]</a></p>
+                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
             </td>
         [% ELSE %]
             <td>"</td>
@@ -126,9 +127,8 @@ $(document).ready(function() {
         <td><p>[% reserveloo.enumchron %]</p></td>
         <td>[% reserveloo.itype %]</td>
         <td>[% reserveloo.location %]</td>
-        <td width="15%">
-            <p>[% reserveloo.reservedate %]</p>
-            <p>in [% reserveloo.branch %]</p>
+        <td>
+            <span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% reserveloo.branch %]</span>
             [% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]
         </td>
         </tr>
-- 
1.7.9.5