From 755f31ca5957c53228549e5481b982e7985a7414 Mon Sep 17 00:00:00 2001 From: Lyon3 Team Date: Tue, 22 Oct 2013 11:16:18 +0200 Subject: [PATCH] Bug 11059 Not possible to sort staged dates in metric format call to dt_add_type_uk_date function was missing. --- acqui/addorderiso2709.pl | 4 +--- .../prog/en/modules/acqui/addorderiso2709.tt | 10 ++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index abfb870..d40e912 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 62f1519..446025b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -20,9 +20,14 @@ $(document).ready(function() { var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ + [% IF (dateformat == 'metric') %] + { "aTargets": [ 3 ], "sType": "uk_date" }, + [% END %] { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false }, ], - "sPaginationType": "four_button" + "sPaginationType": "four_button", + "aaSorting": [] + } ) ); $("form#Aform").submit(function() { @@ -37,6 +42,7 @@ return true; }); }); + //]]> @@ -109,7 +115,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 -- 1.7.2.5