Attachment 21046 Details for Bug 10792 – Bug 10792: fix sorting of funds table on acquisitions home page

[patch] Bug 10792: fix sorting of funds table on acquisitions home page

Bug-10792-fix-sorting-of-funds-table-on-acquisitio.patch (text/plain), 7.21 KB, created by Kyle M Hall (khall) on 2013-09-12 14:51:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2013-09-12 14:51:06 UTC

Size: 7.21 KB

patch

obsolete

>From f4ab42c2073aef1cf66b78fc288fc98e169cdd0a Mon Sep 17 00:00:00 2001
>From: Galen Charlton <gmc@esilibrary.com>
>Date: Thu, 5 Sep 2013 16:23:28 +0000
>Subject: [PATCH] Bug 10792: fix sorting of funds table on acquisitions home page
>
>This patch introduces a DataTables sorting plugin, title-numeric,
>for sorting cells based on a decimal number embedded in a span title
>attribute. This allows currency amounts to be formatted properly
>for display without having to writing a sorting plugin that's
>super-smart about removing the formatting, particularly for locales
>that use a comma as the decimal mark.
>
>The sorter plugin can be used like this:
>
>- In the DataTables config:
>
>"aoColumns": [
> { "sType": "title-numeric" },
>]
>
>- In the table data
>
><td>
> [% formatted currency %]
></td>
>
>To test:
>
>[1] Ensure that there is at least one active budget and at least
> one inactive one.
>[2] Go to the acquisitions home page. Note that changing the sort order
> on the amount, ordered, spent, or avail columns results in incorrect
> sorting that is either ASCII-betical or which ignores any component
> of large numbers that occur after the thousands separator.
>[3] Apply the patch.
>[4] Verify that the sorting now works correctly and that no JavaScript
> errors appear in the JS debug console of your choice.
>
>Signed-off-by: Galen Charlton <gmc@esilibrary.com>
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Sorting now works correctly, for active and inactive funds.
>Passes all tests and QA script.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> acqui/acqui-home.pl | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 30 +++++++++++++++++++-
> .../prog/en/modules/acqui/acqui-home.tt | 24 ++++++++--------
> 3 files changed, 42 insertions(+), 14 deletions(-)
>
>diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
>index 5688452..cd56831 100755
>--- a/acqui/acqui-home.pl
>+++ b/acqui/acqui-home.pl
>@@ -135,7 +135,7 @@ foreach my $budget ( @{$budget_arr} ) {
> }
> 
> for my $field (qw( budget_amount budget_spent budget_ordered budget_avail ) ) {
>- $budget->{$field} = $num_formatter->format_price( $budget->{$field} );
>+ $budget->{"formatted_$field"} = $num_formatter->format_price( $budget->{$field} );
> }
> 
> push @budget_loop, $budget;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>index fc24036..d243392 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>@@ -495,6 +495,34 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
> }
> } );
> 
>+
>+/* Plugin to allow sorting on numeric data stored in a span's title attribute
>+ *
>+ * Ex: <td>
>+ * [% formatted currency %]
>+ * </td>
>+ *
>+ * In DataTables config:
>+ * "aoColumns": [
>+ * { "sType": "title-numeric" },
>+ * ]
>+ * http://datatables.net/plug-ins/sorting#hidden_title
>+ */
>+jQuery.extend( jQuery.fn.dataTableExt.oSort, {
>+ "title-numeric-pre": function ( a ) {
>+ var x = a.match(/title="*(-?[0-9\.]+)/)[1];
>+ return parseFloat( x );
>+ },
>+
>+ "title-numeric-asc": function ( a, b ) {
>+ return ((a < b) ? -1 : ((a > b) ? 1 : 0));
>+ },
>+
>+ "title-numeric-desc": function ( a, b ) {
>+ return ((a < b) ? 1 : ((a > b) ? -1 : 0));
>+ }
>+} );
>+
> (function() {
> 
> /* Plugin to allow text sorting to ignore articles
>@@ -537,4 +565,4 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
> }
> });
> 
>-}());
>\ No newline at end of file
>+}());
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>index 2ee9d0b..4fabffe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
>@@ -32,10 +32,10 @@ $(document).ready(function() {
> null,
> null,
> null,
>- null,
>- { "sType": "num-html" },
>- { "sType": "num-html" },
>- null
>+ { "sType": "title-numeric" },
>+ { "sType": "title-numeric" },
>+ { "sType": "title-numeric" },
>+ { "sType": "title-numeric" }
> ],
> 'sDom': 't',
> 'bPaginate': false,
>@@ -154,10 +154,10 @@ $(document).ready(function() {
> [% END %]
> </td>
> <td>[% loop_budge.budget_branchname %]</td>
>- <td class="data">[% loop_budge.budget_amount %]</td>
>- <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
>- <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
>- <td class="data">[% loop_budge.budget_avail %]</td>
>+ <td class="data">[% loop_budge.formatted_budget_amount %]</td>
>+ <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.formatted_budget_ordered %]</a></td>
>+ <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.formatted_budget_spent %]</a></td>
>+ <td class="data">[% loop_budge.formatted_budget_avail %]</td>
> </tr>
> [% ELSE %]
> <tr class="b_inactive">
>@@ -177,10 +177,10 @@ $(document).ready(function() {
> [% END %]
> </td>
> <td>[% loop_budge.budget_branchname %]</td>
>- <td class="data">[% loop_budge.budget_amount %]</td>
>- <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
>- <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
>- <td class="data">[% loop_budge.budget_avail %]</td>
>+ <td class="data">[% loop_budge.formatted_budget_amount %]</td>
>+ <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.formatted_budget_ordered %]</a></td>
>+ <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.formatted_budget_spent %]</a></td>
>+ <td class="data">[% loop_budge.formatted_budget_avail %]</td>
> </tr>
> [% END %]
> [% END %]
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 10792: 20674 | 20805 | 20839 | 20855 | 20858 | 20859 | 21046