@@ -, +, @@
---
admin/aqbudgetperiods.pl | 73 ++++++---
.../prog/en/modules/admin/aqbudgetperiods.tt | 171 ++++++++++++++------
2 files changed, 172 insertions(+), 72 deletions(-)
--- a/admin/aqbudgetperiods.pl
+++ a/admin/aqbudgetperiods.pl
@@ -72,7 +72,8 @@ my $budget_period_hashref= $input->Vars;
#my $sort1_authcat = $input->param('sort1_authcat');
#my $sort2_authcat = $input->param('sort2_authcat');
-my $pagesize = 20;
+my $activepagesize = 20;
+my $inactivepagesize = 20;
$searchfield =~ s/\,//g;
my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
@@ -245,27 +246,57 @@ elsif ( $op eq 'duplicate_budget' ){
# DEFAULT - DISPLAY AQPERIODS TABLE
# -------------------------------------------------------------------
# display the list of budget periods
- my $results = GetBudgetPeriods();
- $template->param( period_button_only => 1 ) unless (@$results) ;
- my $page = $input->param('page') || 1;
- my $first = ( $page - 1 ) * $pagesize;
- # if we are on the last page, the number of the last word to display
- # must not exceed the length of the results array
- my $last = min( $first + $pagesize - 1, scalar @{$results} - 1, );
- my $toggle = 0;
- my @period_loop;
- foreach my $result ( @{$results}[ $first .. $last ] ) {
- my $budgetperiod = $result;
- FormatData($budgetperiod);
- $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
- $budgetperiod->{budget_active} = 1;
- push( @period_loop, $budgetperiod );
- }
- $template->param(
- period_loop => \@period_loop,
- pagination_bar => pagination_bar("aqbudgetperiods.pl",getnbpages(scalar(@$results),$pagesize),$page),
- );
+my $activepage = $input->param('apage') || 1;
+my $inactivepage = $input->param('ipage') || 1;
+# Get active budget periods
+my $results = GetBudgetPeriods(
+ {budget_period_active => 1},
+ [{budget_period_description => 0}]
+);
+my $first = ( $activepage - 1 ) * $activepagesize;
+my $last = min( $first + $activepagesize - 1, scalar @{$results} - 1, );
+my @period_active_loop;
+
+foreach my $result ( @{$results}[ $first .. $last ] ) {
+ my $budgetperiod = $result;
+ FormatData($budgetperiod);
+ $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
+ $budgetperiod->{budget_active} = 1;
+ push( @period_active_loop, $budgetperiod );
+}
+my $url = "aqbudgetperiods.pl";
+$url .= "?ipage=$inactivepage" if($inactivepage != 1);
+my $active_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $activepagesize), $activepage, "apage");
+
+# Get inactive budget periods
+$results = GetBudgetPeriods(
+ {budget_period_active => 0},
+ [{budget_period_enddate => 1}]
+);
+my $first = ( $inactivepage - 1 ) * $inactivepagesize;
+my $last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, );
+my @period_inactive_loop;
+foreach my $result ( @{$results}[ $first .. $last ] ) {
+ my $budgetperiod = $result;
+ FormatData($budgetperiod);
+ $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
+ $budgetperiod->{budget_active} = 1;
+ push( @period_inactive_loop, $budgetperiod );
+}
+$url = "aqbudgetperiods.pl?tab=2";
+$url .= "&apage=$activepage" if($activepage != 1);
+my $inactive_pagination_bar = pagination_bar ($url, getnbpages( scalar(@$results), $inactivepagesize), $inactivepage, "ipage");
+
+my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0;
+$template->param(
+ period_active_loop => \@period_active_loop,
+ period_inactive_loop => \@period_inactive_loop,
+ active_pagination_bar => $active_pagination_bar,
+ inactive_pagination_bar => $inactive_pagination_bar,
+ tab => $tab,
+ dateformat => C4::Context->preference('dateformat'),
+);
$template->param($op=>1);
output_html_with_http_headers $input, $cookie, $template->output;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -1,9 +1,11 @@
[% INCLUDE 'doc-head-open.inc' %]
+
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
-
+
+[% INCLUDE 'datatables-strings.inc' %]
+
-
@@ -327,48 +349,95 @@
[% END %]
[% IF ( else ) %]
- Budgets administration
-
- [% INCLUDE 'budgets-active-currency.inc' %]
-
-
-
-
- Budget name |
- Start date |
- End date |
- Active |
- Locked |
- Total |
- Actions |
-
-
-
- [% FOREACH period_loo IN period_loop %]
- [% IF ( loop.odd ) %]
-
- [% ELSE %]
-
- [% END %]
- [% period_loo.budget_period_description %] |
- [% period_loo.budget_period_startdate %] |
- [% period_loo.budget_period_enddate %] |
- [% IF ( period_loo.budget_period_active ) %]Active [% ELSE %][% END %] |
- [% IF ( period_loo.budget_period_locked ) %]Locked [% ELSE %][% END %] |
- [% period_loo.budget_period_total %] |
-
- Edit
- Delete
- Add fund
- |
-
- [% END %]
- [% UNLESS ( period_loop ) %]
- No budget |
- [% END %]
-
-
- [% pagination_bar %]
+ Budgets administration
+
+ [% INCLUDE 'budgets-active-currency.inc' %]
+
+
+
+
+
+
Active Budgets
+
+
+
+ Budget Name |
+ Start Date |
+ End Date |
+ Locked |
+ Total |
+ Actions |
+
+
+
+ [% FOREACH period_active IN period_active_loop %]
+
+ [% period_active.budget_period_description %] |
+ [% period_active.budget_period_startdate %] |
+ [% period_active.budget_period_enddate %] |
+
+ [% IF ( period_active.budget_period_locked ) %]
+ Locked
+ [% END %]
+ |
+ [% period_active.budget_period_total %] |
+
+ Edit
+ Delete
+ Add Fund
+ |
+
+ [% END %]
+ [% UNLESS ( period_active_loop ) %]
+ No budget |
+ [% END %]
+
+
+
+
+
+
Inactive Budgets
+
+
+
+ Budget name |
+ Start date |
+ End date |
+ Locked |
+ Total |
+ Actions |
+
+
+
+ [% FOREACH period_loo IN period_inactive_loop %]
+ [% IF ( loop.odd ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% period_loo.budget_period_description %] |
+ [% period_loo.budget_period_startdate %] |
+ [% period_loo.budget_period_enddate %] |
+ [% IF ( period_loo.budget_period_locked ) %]Locked [% ELSE %][% END %] |
+ [% period_loo.budget_period_total %] |
+
+ Edit
+ Delete
+ Add fund
+ |
+
+ [% END %]
+ [% UNLESS ( period_inactive_loop ) %]
+ No budget |
+ [% END %]
+
+
+
[% inactive_pagination_bar %]
+
+
[% END %]
--