From 097a92b3188d62e9797d18313715c35d9dc186b4 Mon Sep 17 00:00:00 2001 From: Lyon3 Team Date: Tue, 12 Nov 2013 15:32:34 -0400 Subject: [PATCH] Bug 11059: fix date sorting of import batches in basket add form This patch improves the sorting of staged import batches by date, particularly when the dateformat system preference is set to anything other than YYYY-MM-DD. Adds title-string sorting type to enable this. To test: [1] Ensure that there are at least three staged bib import batches, with upload timestamps such that date sorting errors would be apparent. [2] Set the dateformat system preference to either DD/MM/YYYY or MM/DD/YYYY. [3] Create a new basket in acquisitions, then chose to add a new order line from a staged record batch. [4] In the list of batches, click on the 'staged' column heading to sort by date. [5] Observe that dates are sorted in alphanumeric order, not date order. [6] Apply the patch and refresh. This time, dates should sort correctly. Signed-off-by: Fridolyn SOMERS Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- acqui/addorderiso2709.pl | 4 +--- .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index abfb870fef..d40e912c13 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -333,13 +333,11 @@ sub import_batches_list { # check if there is at least 1 line still staged my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged'); if (scalar @$stagedList) { - my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'}); push @list, { import_batch_id => $batch->{'import_batch_id'}, num_biblios => $batch->{'num_biblios'}, num_items => $batch->{'num_items'}, - staged_date => $staged_date, - staged_hour => $staged_hour, + staged_date => $batch->{'upload_timestamp'}, import_status => $batch->{'import_status'}, file_name => $batch->{'file_name'}, comments => $batch->{'comments'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 62f1519edf..92632fddeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -19,10 +19,14 @@ [% END %] $(document).ready(function() { var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumns": [ + null,null,null,{ "sType": "title-string" },null,null + ], "aoColumnDefs": [ { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false }, ], - "sPaginationType": "four_button" + "sPaginationType": "four_button", + "aaSorting": [] } ) ); $("form#Aform").submit(function() { @@ -109,7 +113,7 @@ [% batch_lis.file_name %] [% batch_lis.comments %] [% batch_lis.import_status %] - [% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %] + [% batch_lis.staged_date | $KohaDates %] [% batch_lis.num_biblios %] Add orders -- 2.39.5