=cut
-## modules
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
+
use Number::Format qw(format_price);
use CGI;
use List::Util qw/min/;
-use C4::Dates qw/format_date format_date_in_iso/;
+use Koha::DateUtils;
+use Koha::Database;
use C4::Koha;
use C4::Context;
use C4::Auth;
use C4::Acquisition;
use C4::Budgets;
use C4::Debug;
-use C4::SQLHelper;
my $dbh = C4::Context->dbh;
my $input = new CGI;
-my $searchfield = $input->param('searchfield');
+my $searchfield = $input->param('searchfield') // '';
my $budget_period_id = $input->param('budget_period_id');
my $op = $input->param('op')||"else";
-
-my $budget_period_hashref= $input->Vars;
#my $sort1_authcat = $input->param('sort1_authcat');
#my $sort2_authcat = $input->param('sort2_authcat');
-my $pagesize = 20;
+# get only the columns of aqbudgetperiods in budget_period_hashref
+my @columns = Koha::Database->new()->schema->source('Aqbudgetperiod')->columns;
+my $budget_period_hashref = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $input->param($_) ) : () } keys( %{$input->Vars()} ) } ;
+$budget_period_hashref->{budget_period_startdate} = dt_from_string( $input->param('budget_period_startdate') );
+$budget_period_hashref->{budget_period_enddate} = dt_from_string( $input->param('budget_period_enddate') );
+
+my $activepagesize = 20;
+my $inactivepagesize = 20;
$searchfield =~ s/\,//g;
my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
## add or modify a budget period (preparation)
## get information about the budget period that must be modified
-
if ($budget_period_id) { # MOD
my $budgetperiod_hash=GetBudgetPeriod($budget_period_id);
# get dropboxes
- FormatData($budgetperiod_hash);
my $editnum = new Number::Format(
'int_curr_symbol' => '',
%$budgetperiod_hash
);
} # IF-MOD
- $template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),);
}
elsif ( $op eq 'add_validate' ) {
## add or modify a budget period (confirmation)
- ## update budget period data
+ ## update budget period data
if ( $budget_period_id ne '' ) {
$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
my $status=ModBudgetPeriod($budget_period_hashref);
my $total = 0;
my $data = GetBudgetPeriod( $budget_period_id);
- FormatData($data);
$$data{'budget_period_total'}=$num->format_price( $data->{'budget_period_total'});
$template->param(
%$data
# display the form for duplicating
elsif ( $op eq 'duplicate_form'){
$template->param(
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
'duplicate_form' => '1',
'budget_period_id' => $budget_period_id,
);
# handle the actual duplication
elsif ( $op eq 'duplicate_budget' ){
die "please specify a budget period id\n" if( !defined $budget_period_id || $budget_period_id eq '' );
- my $startdate = $input->param('budget_period_startdate');
- my $enddate = $input->param('budget_period_enddate');
my $data = GetBudgetPeriod( $budget_period_id);
-
- $data->{'budget_period_startdate'} = $startdate;
- $data->{'budget_period_enddate'} = $enddate;
+ $data->{'budget_period_startdate'} = $budget_period_hashref->{budget_period_startdate};
+ $data->{'budget_period_enddate'} = $budget_period_hashref->{budget_period_enddate};
delete $data->{'budget_period_id'};
- my $new_budget_period_id = C4::SQLHelper::InsertInTable('aqbudgetperiods', $data);
+ my $new_budget_period_id = AddBudgetPeriod($data);
my $tree = GetBudgetHierarchy( $budget_period_id );
$orphan = 1;
}
+ # get only the columns of aqbudgets
+ my @columns = Koha::Database->new()->schema->source('Aqbudget')->columns;
+ my $new_entry = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $entry->{$_} ) : () } keys(%$entry) };
# write it to db
- my $new_id = C4::SQLHelper::InsertInTable('aqbudgets', $entry);
+ my $new_id = AddBudget($new_entry);
$old_new{$old_id} = $new_id;
push @{$parent_children{$parent_id}}, $new_id if $orphan;
if( defined $parent_children{$old_id} ){
# tell my children my new id
for my $child ( @{$parent_children{$old_id}} ){
- C4::SQLHelper::UpdateInTable('aqcudgets', [ 'budget_id' => $child, 'budget_parent_id' => $new_id ]);
+ ModBudget( { 'budget_id' => $child, 'budget_parent_id' => $new_id } );
}
delete $parent_children{$old_id};
}
# 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 },
+ { -asc => 'budget_period_description' },
+);
+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;
+ $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 },
+ { -desc => 'budget_period_enddate' },
+);
+
+$first = ( $inactivepage - 1 ) * $inactivepagesize;
+$last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, );
+my @period_inactive_loop;
+foreach my $result ( @{$results}[ $first .. $last ] ) {
+ my $budgetperiod = $result;
+ $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,
+);
$template->param($op=>1);
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha_fer / blobdiff