From e531a9f7a92b2de0a208ff9300703eb542f56357 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Sep 2014 17:16:48 +0200 Subject: [PATCH] Bug 12988: Update table footer with the visible rows - budgets On the budget list view, the total was not updated. With this patch, the footer (totals) will be updated on filtering rows. Test plan: To test with both CurrencyFormat pref values. 1/ Go on the budget list view 2/ Verify the totals are correct. 3/ Filter the table using the filter input and verify the totals are updated with the rows shown 4/ Hide/Show inactive budgets and verify the totals are still corrects. --- .../prog/en/modules/admin/aqbudgets.tt | 31 +++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index b0c4344..50566a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -152,6 +152,8 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") // Period allocated [% IF ( budget_period_total ) %][% budget_period_total %][% END %] - [% period_alloc_total %] + - [% ordered_total %] + - [% spent_total %] + - [% available_total %] + @@ -320,35 +327,35 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") [% IF budget.budget_parent_id %] [% budget.budget_amount %] [% ELSE %] - [% budget.budget_amount %] + [% budget.budget_amount %] [% END %] [% IF budget.budget_parent_id %] [% budget.budget_ordered %] [% ELSE %] - [% budget.budget_ordered %] + [% budget.budget_ordered %] [% END %] [% IF budget.budget_parent_id %] [% budget.total_ordered %] [% ELSE %] - [% budget.total_ordered %] + [% budget.total_ordered %] [% END %] [% IF budget.budget_parent_id %] [% budget.budget_spent %] [% ELSE %] - [% budget.budget_spent %] + [% budget.budget_spent %] [% END %] [% IF budget.budget_parent_id %] [% budget.total_spent %] [% ELSE %] - [% budget.total_spent %] + [% budget.total_spent %] [% END %] @@ -364,11 +371,11 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") [% END %] [% ELSE %] [% IF (value > 0) %] - + [% ELSIF (value < 0) %] - + [% ELSE %] - + [% END %] [% END %] [% text %] -- 2.1.0