Bug 13887: Display the due date as a due date + sort on info

The due dates should be displayed as due dates :)
i.e not displayed with 23:59

On the way, this patch fixes the sort on the info column.
The column is now sorted using the due dates

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index d3f8668..f991680 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2402,6 +2402,8 @@ sub GetItemIssue {
     $sth->execute($itemnumber);
     my $data = $sth->fetchrow_hashref;
     return unless $data;
+    $data->{issuedate_sql} = $data->{issuedate};
+    $data->{date_due_sql} = $data->{date_due};
     $data->{issuedate} = dt_from_string($data->{issuedate}, 'sql');
     $data->{issuedate}->truncate(to => 'minute');
     $data->{date_due} = dt_from_string($data->{date_due}, 'sql');

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index f072fb9..80be359 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -45,6 +45,9 @@ $(document).ready(function() {
     var my_table = $("#requestspecific").dataTable($.extend(true, {}, dataTablesDefaults, {
         'bPaginate': false,
         "sDom": '<"top pager"ilf>t',
+        "aoColumnDefs": [
+            { "sType": "title-string", "aTargets" : [ "title-string" ] }
+        ]
     }));
 
     //Override fieldset styling for dataTables search box
@@ -456,7 +459,7 @@ function checkMultiHold() {
                 [% IF itemdata_enumchron %]
                     <th>Vol no.</th>
                 [% END %]
-                    <th>Information</th>
+                    <th class="title-string">Information</th>
                 </tr>
             </thead>
             <tbody>
@@ -504,14 +507,16 @@ function checkMultiHold() {
                     </td>
                 [% END %]
                     <td>
-               [% IF ( itemloo.onloan ) %]
-                    <span class="checkedout">Due [% itemloo.date_due %]</span>
+                [% IF ( itemloo.onloan ) %]
+                    <span title="[% itemloo.date_due %]" class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
                 [% ELSE %]
-                    [% IF ( itemloo.transfertwhen ) %]
-                        In transit from [% itemloo.transfertfrom %],
-                        to [% itemloo.transfertto %], since [% itemloo.transfertwhen %]
-                    [% END %]
-               [% END %]
+                    <span title="0000-00-00">
+                        [% IF ( itemloo.transfertwhen ) %]
+                            In transit from [% itemloo.transfertfrom %],
+                            to [% itemloo.transfertto %], since [% itemloo.transfertwhen %]
+                        [% END %]
+                    </span>
+                [% END %]
 
                 [% IF ( itemloo.message ) %]
                    Unavailable (lost or missing)

diff --git a/reserve/request.pl b/reserve/request.pl
index d849a48..c30fb21 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -347,7 +347,7 @@ foreach my $biblionumber (@biblionumbers) {
             # change the background color
             my $issues= GetItemIssue($itemnumber);
             if ( $issues->{'date_due'} ) {
-                $item->{date_due} = format_sqldatetime($issues->{date_due});
+                $item->{date_due} = $issues->{date_due_sql};
                 $item->{backgroundcolor} = 'onloan';
             }