From f46ef40b92eca27a0d146195b4a9ad10de684598 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 5 Sep 2013 16:23:28 +0000 Subject: [PATCH] [SIGNED OFF] 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 [% formatted currency %] 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 Signed-off-by: Katrin Fischer Sorting now works correctly, for active and inactive funds. Passes all tests and QA script. --- .../prog/en/modules/acqui/acqui-home.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 db7192f..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 @@ -177,10 +177,10 @@ $(document).ready(function() { [% END %] [% loop_budge.budget_branchname %] - [% loop_budge.budget_amount %] - [% loop_budge.budget_ordered %] - [% loop_budge.budget_spent %] - [% loop_budge.budget_avail %] + [% loop_budge.formatted_budget_amount %] + [% loop_budge.formatted_budget_ordered %] + [% loop_budge.formatted_budget_spent %] + [% loop_budge.formatted_budget_avail %] [% END %] [% END %] -- 1.7.9.5