From 1ad17b4484c27c705a61e785709f36bf4b543c03 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 5 Oct 2018 12:50:26 +0000
Subject: [PATCH] Bug 21497: [17.11.x] Correctly format dates for ILL requests
 in OPAC

This patch updates the opac ILL template to use the $KohaDates plugin
for displaying dates. Also updated:

- Added "title-string" sorting to allow for correct sorting of dates in
  the table of requests.

To test, apply the patch and log in to the OPAC as a user who has
multiple outstanding ILL requests.

 - In the table of ILL requests, the "Request placed" and "Last updated"
   dates should be formatted according to your system's dateformat
   preference.
 - Sorting of those columns should work correctly.
 - View a request and confirm that "Request placed" and "Last updated"
   dates in this view are also formatted correctly.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a2418f743ce1e14d32229b5dd8d05aeb13f9e664)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit e68d3d988497289656bcf12b7f260cdc91cbc176)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../bootstrap/en/modules/opac-illrequests.tt        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 81fd2ba81e..fb1b39eb2e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE KohaDates %]
 [% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;   Your Interlibrary loan requests</title>[% INCLUDE 'doc-head-close.inc' %]
@@ -102,8 +103,8 @@
                                 <th>Requested from</th>
                                 <th>Request type</th>
                                 <th>Status</th>
-                                <th>Request placed</th>
-                                <th>Last updated</th>
+                                <th class="title-string">Request placed</th>
+                                <th class="title-string">Last updated</th>
                                 <th></th>
                             </tr>
                         </thead>
@@ -116,8 +117,8 @@
                                     <td>[% request.backend %]</td>
                                     <td>[% request.medium %]</td>
                                     <td>[% request.capabilities.$status.name %]</td>
-                                    <td>[% request.placed %]</td>
-                                    <td>[% request.updated %]</td>
+                                    <td>[% request.placed | $KohaDates %]</td>
+                                    <td>[% request.updated | $KohaDates %]</td>
                                     <td>
                                         <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&amp;illrequest_id=[% request.id %]" class="btn btn-default btn-small pull-right">View</a>
                                     </td>
@@ -157,11 +158,11 @@
                                     </li>
                                     <li>
                                         <label for="placed">Request placed:</label>
-                                        [% request.placed %]
+                                        [% request.placed | $KohaDates %]
                                     </li>
                                     <li>
                                         <label for="updated">Last updated:</label>
-                                        [% request.updated %]
+                                        [% request.updated | $KohaDates %]
                                     </li>
                                     <li>
                                         <label for="notesopac">Notes:</label>
-- 
2.39.5