From 7677b3ac2a0a5eed1525af1cc2f2bd7e8693bbe9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Sep 2014 11:19:52 +0200 Subject: [PATCH] Bug 12984: Improvement of the funds list view - acqui home Bug 11578 improved the funds list view in the administration module. It would be great to have the same improvement on the acquisition home page. This improvement groups funds by budget and displays them with a hierarchy. Test plan: 0/ Create a budget and fund hierarchy, with active and inactive budgets. 1/ Go on the acquisition home page and verify the values are the same as before 2/ Verify the funds are correctly listed 3/ Verify the links on top of table work (expand/collapse all, show/hide inactive budgets). Signed-off-by: Paola Rossi Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/acqui/acqui-home.tt | 150 ++++++++++-------- 1 file changed, 88 insertions(+), 62 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 3c1df1020e..d5ca87f312 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 @@ -1,9 +1,12 @@ [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions - [% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'datatables.inc' %] + + + @@ -102,28 +142,33 @@ $(document).ready(function() {

All available funds[% IF ( branchname ) %] for [% branchname %][% END %]

-

+ + - + + + - - + - - - - - + + + @@ -132,8 +177,14 @@ $(document).ready(function() { [% FOREACH loop_budge IN loop_budget %] - [% IF ( loop_budge.budget_period_active ) %] - + [% IF loop_budge.budget_parent_id %] + + [% ELSE %] + + [% END %] + + + - - [% ELSE %] - - - - - - - - - - - - [% END %] [% END %]
+ Expand all + | Collapse all + | Hide inactive budgets + | Show inactive budgets +
FundActiveBudget period descriptionFund code Fund nameActive Owner Library Amount Ordered SpentAvailTotal available
Total    Total [% total %][% total_active | $Price %] [% totordered %][% totordered_active | $Price %] [% totspent %][% totspent_active | $Price %]
[% loop_budge.budget_period_active %]Budget [% loop_budge.budget_period_description %] [id=[% loop_budge.budget_period_id %]][% UNLESS loop_budge.budget_period_active %] (inactive)[% END %] [% IF ( CAN_user_acquisition_budget_manage ) %] [% loop_budge.budget_code %] @@ -142,7 +193,6 @@ $(document).ready(function() { [% END %] [% loop_budge.budget_name %]Active [% IF ( loop_budge.budget_owner_borrowernumber ) %] [% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %] [% ELSE %] @@ -155,30 +205,6 @@ $(document).ready(function() { [% loop_budge.budget_spent | $Price %] [% loop_budge.budget_avail | $Price %]
- [% IF ( CAN_user_acquisition_budget_manage ) %] - [% loop_budge.budget_code %] - [% ELSE %] - [% loop_budge.budget_code %] - [% END %] - [% loop_budge.budget_name %]Inactive[% IF ( loop_budge.budget_owner_borrowernumber ) %] - [% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %] - [% ELSE %] -   - [% END %] - [% loop_budge.budget_branchname %][% loop_budge.budget_amount | $Price %][% loop_budge.budget_ordered | $Price %][% loop_budge.budget_spent | $Price %][% loop_budge.budget_avail | $Price %]
-- 2.39.5