From 3937fcb143888a2fce9bfaec294c0355dcf0b0ab Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 25 Mar 2021 11:41:16 +0000
Subject: [PATCH] Bug 27983: (follow-up) Address missing instances

This patch cleans up some instances I missed on the first round:

- Acquisitions -> Vendor -> Receive shipments
- Acquisitions -> "All available funds" table
  -> Click an "Ordered" value
  -> Click a "Spent" value
- Acquisitions -> Vendor
 -> test sorting of contracts in the "Contracts" table

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/acqui/ordered.tt          |  3 +-
 .../prog/en/modules/acqui/orderreceive.tt     | 39 ++++++++++++-------
 .../prog/en/modules/acqui/spent.tt            |  3 +-
 .../prog/en/modules/acqui/supplier.tt         |  3 +-
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 25c26b0481..7b6e6702fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -139,8 +139,7 @@
         $(document).ready(function() {
             $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
-                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
                 ],
                 "sPaginationType": "full"
             }));
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 7b7e44a889..50afa9748b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -115,10 +115,10 @@
                     <tr>
                         <th>Invoice</th>
                         <th>Order number</th>
-                        <th class="title-string">Creation date</th>
-                        <th class="title-string">Receive date</th>
+                        <th>Creation date</th>
+                        <th>Receive date</th>
                         <th>Quantity received</th>
-                        <th class="title-string">Status</th>
+                        <th>Status</th>
                         <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
                         <th>Internal note</th>
                     </tr>
@@ -137,17 +137,30 @@
                         [% END %]
                         </td>
                         <td>[% suborder.ordernumber | html %]</td>
-                        <td><span title="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</span></td>
-                        <td>[% IF suborder.datereceived %]<span title="[% suborder.datereceived | uri %]">[% suborder.datereceived | $KohaDates %]</span>[% END %]</td>
+                        <td data-order="[% suborder.basket.creationdate | uri %]">[% suborder.basket.creationdate | $KohaDates%]</td>
+                        <td data-order="[% suborder.datereceived | uri %]">
+                            [% IF suborder.datereceived %]
+                                [% suborder.datereceived | $KohaDates %]
+                            [% END %]
+                        </td>
                         <td>[% suborder.quantityreceived | html %]</td>
-                        <td>
-                          [% SWITCH suborder.orderstatus %]
-                          [%# FIXME We should only see/display Complete here, right? %]
-                            [% CASE 'new' %]<span title="status_1">New</span>
-                            [% CASE 'ordered' %]<span title="status_2">Ordered</span>
-                            [% CASE 'partial' %]<span title="status_3">Partial</span>
-                            [% CASE 'complete' %]<span title="status_4">Complete</span>
-                            [% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
+                        [% SWITCH suborder.orderstatus %]
+                            [%# FIXME We should only see/display Complete here, right? %]
+                            [% CASE 'new' %]
+                                <td data-order="status_1">
+                                    New
+                            [% CASE 'ordered' %]
+                                <td data-order="status_2">
+                                    Ordered
+                            [% CASE 'partial' %]
+                                <td data-order="status_3">
+                                    Partial
+                            [% CASE 'complete' %]
+                                <td data-order="status_4">
+                                    Complete
+                            [% CASE 'cancelled' %]
+                                <td data-order="status_5">
+                                    Cancelled
                           [% END %]
                         </td>
                         <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 0a63cf235a..1393e8c9a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -152,8 +152,7 @@
         $(document).ready(function() {
             $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
-                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
                 ],
                 "sPaginationType": "full"
             } ) );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 1eb364bed5..e8b0291156 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -469,8 +469,7 @@
          $(document).ready(function() {
             var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
-                    { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                    { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }
                 ],
                 'sDom': 't'
             } ) );
-- 
2.39.5