Attachment 32819 Details for Bug 12988 – [PASSED QA] Bug 12988: Update table footer with the visible rows - budgets

[patch] [PASSED QA] Bug 12988: Update table footer with the visible rows - budgets

PASSED-QA-Bug-12988-Update-table-footer-with-the-v.patch (text/plain), 4.58 KB, created by Katrin Fischer on 2014-10-27 23:04:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-10-27 23:04:13 UTC

Size: 4.58 KB

patch

obsolete

>From 6e4ac60c2243194757d332af67c7d9ccc6c0198c Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 24 Sep 2014 17:16:48 +0200
>Subject: [PATCH] [PASSED QA] 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.
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Works as described.
>---
> .../prog/en/modules/admin/aqbudgets.tt | 23 ++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 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 bec6272..daa1b6a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -153,6 +153,8 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
> //<![CDATA[
> //
> $(document).ready(function() {
>+
>+
> var oTable = $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
> "fnDrawCallback": function ( oSettings ) {
> if ( oSettings.aiDisplay.length == 0 )
>@@ -180,6 +182,10 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
> }
> }
> },
>+ "footerCallback": function ( row, data, start, end, display ) {
>+ var api = this.api(), data;
>+ footer_column_sum( api, [ 4, 6, 8, 10 ], 2 );
>+ },
> "aoColumnDefs": [
> { "bVisible": false, "aTargets": [ 0, 1 ] },
> { "bSortable": false, "aTargets": ["_all"] }
>@@ -214,6 +220,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
> });
> $("#hide_inactive").click();
> [% END %]
>+ oTable.fnAddFilters("filter", 750);
> 
> $("#filterbutton").click(function() {
> $("#fundfilters").slideToggle(0);
>@@ -321,35 +328,35 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
> [% IF budget.budget_parent_id %]
> [% budget.budget_amount | $Price %]
> [% ELSE %]
>- [% budget.budget_amount | $Price %]
>+ [% budget.budget_amount | $Price %]
> [% END %]
> </td>
> <td class="data">
> [% IF budget.budget_parent_id %]
> [% budget.budget_ordered | $Price %]
> [% ELSE %]
>- [% budget.budget_ordered | $Price %]
>+ [% budget.budget_ordered | $Price %]
> [% END %]
> </td>
> <td class="data">
> [% IF budget.budget_parent_id %]
> [% budget.total_ordered | $Price %]
> [% ELSE %]
>- [% budget.total_ordered | $Price %]
>+ [% budget.total_ordered | $Price %]
> [% END %]
> </td>
> <td class="data">
> [% IF budget.budget_parent_id %]
> [% budget.budget_spent | $Price %]
> [% ELSE %]
>- [% budget.budget_spent | $Price %]
>+ [% budget.budget_spent | $Price %]
> [% END %]
> </td>
> <td class="data">
> [% IF budget.budget_parent_id %]
> [% budget.total_spent | $Price %]
> [% ELSE %]
>- [% budget.total_spent | $Price %]
>+ [% budget.total_spent | $Price %]
> [% END %]
> </td>
> 
>@@ -365,11 +372,11 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
> [% END %]
> [% ELSE %]
> [% IF (value > 0) %]
>- 
>+ 
> [% ELSIF (value < 0) %]
>- 
>+ 
> [% ELSE %]
>- 
>+ 
> [% END %]
> [% END %]
> [% value | $Price %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12988: 31855 | 32016 | 32145 | 32346 | 32819