From ac10f3445c2fbd9f454f4b8802d38af41c9e8ddc Mon Sep 17 00:00:00 2001
From: Lyon3 Team <koha@univ-lyon3.fr>
Date: Tue, 12 Nov 2013 15:32:34 -0400
Subject: [PATCH 1/2] Bug 11059 - Not possible to sort staged dates in metric
format
Adds title-string sorting type to enable this.
Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
---
acqui/addorderiso2709.pl | 4 +---
koha-tmpl/intranet-tmpl/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 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..92632fd 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 @@
<td>[% batch_lis.file_name %]</td>
<td>[% batch_lis.comments %]</td>
<td>[% batch_lis.import_status %]</td>
- <td>[% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %]</td>
+ <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates %]</span></td>
<td>[% batch_lis.num_biblios %]</td>
<td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]">Add orders</a></td>
</tr>
--
1.8.3.2