Attachment 118849 Details for Bug 27983 – Bug 27983: (follow-up) Address missing instances

[patch] Bug 27983: (follow-up) Address missing instances

Bug-27983-follow-up-Address-missing-instances.patch (text/plain), 6.68 KB, created by Martin Renvoize (ashimema) on 2021-03-26 11:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-03-26 11:50:48 UTC

Size: 6.68 KB

patch

obsolete

>From c4253cef7dd433c3ebee9a377b7b45367dc4725c 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>
>---
> .../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 ec75acdf95..87b4a646d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
>@@ -124,8 +124,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 de7522c5af..81fce0b5b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -96,10 +96,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>
>@@ -118,17 +118,30 @@
> [% END %]
> </td>
> <td>[% suborder.ordernumber | html %]</td>
>- <td>[% suborder.basket.creationdate | $KohaDates%]</td>
>- <td>[% IF suborder.datereceived %][% suborder.datereceived | $KohaDates %][% 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' %]New
>- [% CASE 'ordered' %]Ordered
>- [% CASE 'partial' %]Partial
>- [% CASE 'complete' %]Complete
>- [% CASE 'cancelled' %]Cancelled
>+ [% 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 48b0029b11..cce83c7cde 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
>@@ -137,8 +137,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 cb67dc7505..0b8cb91932 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -436,8 +436,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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27983: 118466 | 118467 | 118490 | 118579 | 118782 | 118848 | 118849