Attachment 32817 Details for Bug 12989 – [PASSED QA] Bug 12989: Update table footer with the visible rows - acqui-home

[patch] [PASSED QA] Bug 12989: Update table footer with the visible rows - acqui-home

PASSED-QA-Bug-12989-Update-table-footer-with-the-v.patch (text/plain), 5.44 KB, created by Katrin Fischer on 2014-10-27 22:50:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-10-27 22:50:44 UTC

Size: 5.44 KB

patch

obsolete

>From 70925066434f8de5cb5c0da491cb850bc9178c35 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 24 Sep 2014 17:23:42 +0200
>Subject: [PATCH] [PASSED QA] Bug 12989: Update table footer with the visible
> rows - acqui-home
>
>Note that bug 12984 changes the view of this table.
>
>On the acqui-home page, the total was not updated.
>With this patch, the footer (totals) will be updated on filtering rows.
>
>Test plan:
>1/ Go on the acqui home page.
>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>
>---
> .../prog/en/modules/acqui/acqui-home.tt | 53 ++++++++++++++++------
> 1 file changed, 40 insertions(+), 13 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 d5ca87f..f73ff27 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
>@@ -14,11 +14,6 @@ dt_overwrite_html_sorting_localeCompare();
> 
> $(document).ready(function() {
> 
>- var inactive = $(".b_inactive,.bu_active");
>- var active = $(".bu_inactive");
>- inactive.hide();
>- active.show();
>-
> var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
> "fnDrawCallback": function ( oSettings ) {
> if ( oSettings.aiDisplay.length == 0 )
>@@ -46,6 +41,10 @@ $(document).ready(function() {
> }
> }
> },
>+ "footerCallback": function ( row, data, start, end, display ) {
>+ var api = this.api(), data;
>+ footer_column_sum( api, [ 6, 7, 8, 9 ] );
>+ },
> "aoColumnDefs": [
> { "bVisible": false, "aTargets": [ 0, 1 ] },
> { "bSortable": false, "aTargets": ["_all"] }
>@@ -169,10 +168,10 @@ $(document).ready(function() {
> <th></th>
> <th></th>
> <th colspan="4">Total</th>
>- <th class="data">[% total %][% total_active | $Price %]</th>
>- <th class="data">[% totordered %][% totordered_active | $Price %]</th>
>- <th class="data">[% totspent %][% totspent_active | $Price %]</th>
>- <th class="data">[% totavail %][% totavail_active | $Price %]</th>
>+ <th class="data"></th>
>+ <th class="data"></th>
>+ <th class="data"></th>
>+ <th class="data"></th>
> </tr>
> </tfoot>
> <tbody>
>@@ -200,10 +199,38 @@ $(document).ready(function() {
> [% END %]
> </td>
> <td>[% loop_budge.budget_branchname %]</td>
>- <td class="data">[% loop_budge.budget_amount | $Price %]</td>
>- <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered | $Price %]</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 | $Price %]</a></td>
>- <td class="data">[% loop_budge.budget_avail | $Price %]</td>
>+ <td class="data">
>+ [% IF loop_budge.budget_parent_id %]
>+ [% loop_budge.budget_amount | $Price %]
>+ [% ELSE %]
>+ [% loop_budge.budget_amount | $Price %]
>+ [% END %]
>+ </td>
>+ <td class="data">
>+ <a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">
>+ [% IF loop_budge.budget_parent_id %]
>+ [% loop_budge.budget_ordered | $Price %]
>+ [% ELSE %]
>+ [% loop_budge.budget_ordered | $Price %]
>+ [% END %]
>+ </a>
>+ </td>
>+ <td class="data">
>+ <a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">
>+ [% IF loop_budge.budget_parent_id %]
>+ [% loop_budge.budget_spent | $Price %]
>+ [% ELSE %]
>+ [% loop_budge.budget_spent | $Price %]
>+ [% END %]
>+ </a>
>+ </td>
>+ <td class="data">
>+ [% IF loop_budge.budget_parent_id %]
>+ [% loop_budge.budget_avail | $Price %]
>+ [% ELSE %]
>+ [% loop_budge.budget_avail | $Price %]
>+ [% END %]
>+ </td>
> </tr>
> [% END %]
> </tbody>
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12989: 31856 | 31977 | 32149 | 32150 | 32348 | 32349 | 32817 | 32818