From a8b2f4692c7a3fbe9efa9d5b3bc5002326cf16bc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 29 May 2018 17:10:58 -0300 Subject: [PATCH] Bug 20726: Sort by statuses then ordernumbers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not received and most recent at the top. Signed-off-by: Séverine QUEUNE Signed-off-by: Josef Moravec --- .../prog/en/modules/serials/subscription-detail.tt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 6a02066..9af40c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -347,7 +347,7 @@ Order number Creation date Receive date - Status + Status Fund Ordered Spent @@ -376,11 +376,11 @@ [% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] [% SWITCH order.orderstatus %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled + [% CASE 'new' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled [% END %] [% order.fund.budget_name %] @@ -433,7 +433,7 @@ var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { 'bPaginate': false, 'bAutoWidth': false, - "aaSorting": [[ 4, "desc" ]], + "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber "aoColumnDefs": [ { "aTargets": "title-string", "sType": "title-string" } ] @@ -441,7 +441,7 @@ $("#hide_received_orders").click(function(e){ e.preventDefault(); - table.fnFilter( '.', 4, true ); // Not empty "Receive date" columns + table.fnFilter( '^$', 4, true ); // Not empty "Receive date" columns }); $("#show_all_orders").click(function(e){ e.preventDefault(); -- 2.1.4