From 633ab68dc39707a40c40298939fb8e968c6a2838 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 9 Sep 2013 14:46:23 -0400
Subject: [PATCH] Bug 10794 - Sorting on billing date column in invoices table
doesn't work
This patch adds the sorting by title string option to the table of
invoices. This allows column data to be sorted based on the
ISO-formatted date rather than the formatted-for-display date. A "blank"
(0000-00-00) date is added to cells which contain no date data.
To test, view the Acquisitions Invoices page (acqui/invoices.pl) and
confirm that the "Billing date" column is sorted correctly regardless of
the dateformat system preference.
http://bugs.koha-community.org/show_bug.cgi?id=10749
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
---
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 40114ad..965fec5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -9,14 +9,11 @@
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
- [% IF (dateformat == 'metric') %]
- dt_add_type_uk_date();
- [% END %]
$("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
- bInfo: false,
- bPaginate: false,
- bFilter: false,
sDom: "t",
+ "aoColumns": [
+ null,null,{ "sType": "title-string" },null,null,null,null
+ ],
aoColumnDefs: [
{ "bSortable": false, "aTargets": [6] }
]
@@ -59,7 +56,9 @@ $(document).ready(function() {
<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
<td>
[% IF invoice.billingdate %]
- [% invoice.billingdate | $KohaDates %]
+ <span title="[% invoice.billingdate %]">[% invoice.billingdate | $KohaDates %]</span>
+ [% ELSE %]
+ <span title="0000-00-00"></span>
[% END %]
</td>
<td>[% invoice.receivedbiblios %]</td>
--
1.8.1.2