X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Faqbudgets.pl;h=1a66c9c0f4d672aba1349649ae1437c6b40099cb;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=71514c4b746ac4d2d4b59aae8563c8417d4b6458;hpb=5429c5f497fe426b6905b5ef9693f4e42afff5d7;p=koha_fer diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 71514c4b74..1a66c9c0f4 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -15,33 +15,34 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; -use strict; use CGI; use List::Util qw/min/; use Number::Format qw(format_price); +use Koha::Database; use C4::Auth qw/get_user_subpermissions/; use C4::Branch; # GetBranches use C4::Dates qw/format_date format_date_in_iso/; use C4::Auth; use C4::Acquisition; -use C4::Budgets; # +use C4::Budgets; use C4::Members; # calls GetSortDetails() use C4::Context; use C4::Output; use C4::Koha; use C4::Debug; -#use POSIX qw(locale_h); my $input = new CGI; my $dbh = C4::Context->dbh; my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( - { template_name => "admin/aqbudgets.tmpl", + { template_name => "admin/aqbudgets.tt", query => $input, type => "intranet", authnotrequired => 0, @@ -51,56 +52,54 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( ); my $cur = GetCurrency(); -$template->param( cur => $cur->{symbol} ); +$template->param( symbol => $cur->{symbol}, + currency => $cur->{currency} + ); -my $op = $input->param('op'); +my $op = $input->param('op') || 'list'; -# see if the user want to see all budgets or only owned ones -my $show_mine = 1; #SHOW BY DEFAULT -my $show = $input->param('show'); # SET TO 1, BY A FORM SUMBIT -$show_mine = $input->param('show_mine') if $show == 1; +# see if the user want to see all budgets or only owned ones by default +my $show_mine = $input->param('show_mine') // 1; # IF USER DOESNT HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW... -if ( not defined $template->{param_map}->{'CAN_user_acquisition_budget_add_del'} && $op == 'add_form' ) { - $op = ''; +if (not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'} + and $op eq 'add_form') +{ + $op = 'list'; } - my $num=FormatNumber; -my $script_name = "/cgi-bin/koha/admin/aqbudgets.pl"; -my $budget_hash=$input->Vars; -my $budget_id = $$budget_hash{budget_id}; +# get only the columns of aqbudgets in budget_hash +my @columns = Koha::Database->new()->schema->source('Aqbudget')->columns; +my $budget_hash = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $input->param($_) ) : () } keys( %{$input->Vars()}) } ; + +my $budget_id = $input->param('budget_id'); +my $budget_period_id = $input->param('budget_period_id'); my $budget_permission = $input->param('budget_permission'); -my $budget_period_dropbox = $input->param('budget_period_dropbox'); -#filtering non budget keys -delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; -my $filter_budgetbranch = $input->param('filter_budgetbranch'); +my $budget_users_ids = $input->param('budget_users_ids'); +my $filter_budgetbranch = $input->param('filter_budgetbranch') // ''; my $filter_budgetname = $input->param('filter_budgetname'); -$template->param( - notree => ($filter_budgetbranch or $show_mine) -); + + # ' ------- get periods stuff ------------------' # IF PERIODID IS DEFINED, GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT -my $period = GetBudgetPeriod($$budget_hash{budget_period_id}); +my $period; +if ( $budget_period_id ) { + $period = GetBudgetPeriod( $budget_period_id ); +} -$template->param( - %$period -); # ------- get periods stuff ------------------ # USED FOR PERMISSION COMPARISON LATER -my $borrower_id = $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'}; +my $borrower_id = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'}; my $user = GetMemberDetails($borrower_id); my $user_branchcode = $user->{'branchcode'}; $template->param( - action => $script_name, - script_name => $script_name, show_mine => $show_mine, - $op || else => 1, + op => $op, ); - # retrieve branches my ( $budget, ); @@ -115,21 +114,26 @@ foreach my $thisbranch (keys %$branches) { push @branchloop2, \%row; } -$template->param(auth_cats_loop => GetBudgetAuthCats($$period{budget_period_id}) ); +$template->param(auth_cats_loop => GetBudgetAuthCats( $budget_period_id )) + if $budget_period_id; # Used to create form to add or modify a record if ($op eq 'add_form') { #### ------------------- ADD_FORM ------------------------- - # if no buget_id is passed then its an add # pass the period_id to build the dropbox - because we only want to show budgets from this period my $dropbox_disabled; if (defined $budget_id ) { ### MOD - $budget = GetBudget($budget_id); + $budget = GetBudget($budget_id); + if (!CanUserModifyBudget($borrowernumber, $budget, $staffflags)) { + $template->param(error_not_authorised_to_modify => 1); + output_html_with_http_headers $input, $cookie, $template->output; + exit; + } $dropbox_disabled = BudgetHasChildren($budget_id); my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; - $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{/amount/} keys %$budget; + $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget; } # build budget hierarchy @@ -183,16 +187,33 @@ if ($op eq 'add_form') { $template->param(authorised_value_categories1 => \@auth_cats_loop1); $template->param(authorised_value_categories2 => \@auth_cats_loop2); - my $budget_perm_dropbox = - GetBudgetPermDropbox($budget->{'budget_permission'}); - + if($budget->{'budget_permission'}){ + my $budget_permission = "budget_perm_".$budget->{'budget_permission'}; + $template->param($budget_permission => 1); + } + + if ($budget) { + my @budgetusers = GetBudgetUsers($budget->{budget_id}); + my @budgetusers_loop; + foreach my $borrowernumber (@budgetusers) { + my $member = C4::Members::GetMember( + borrowernumber => $borrowernumber); + push @budgetusers_loop, { + firstname => $member->{firstname}, + surname => $member->{surname}, + borrowernumber => $borrowernumber + }; + } + $template->param( + budget_users => \@budgetusers_loop, + budget_users_ids => join ':', @budgetusers + ); + } + # if no buget_id is passed then its an add $template->param( - add_validate => 1, - dateformat => C4::Dates->new()->visual(), budget_parent_id => $budget_parent->{'budget_id'}, budget_parent_name => $budget_parent->{'budget_name'}, - budget_perm_dropbox => $budget_perm_dropbox, branchloop_select => \@branchloop_select, %$period, %$budget, @@ -212,108 +233,134 @@ if ($op eq 'add_form') { ); # END $OP eq DELETE_CONFIRM # called by delete_confirm, used to effectively confirm deletion of data in DB -} else{ - if ( $op eq 'delete_confirmed' ) { - my $rc = DelBudget($budget_id); - }elsif( $op eq 'add_validate' ) { - if ( defined $$budget_hash{budget_id} ) { +} elsif ( $op eq 'delete_confirmed' ) { + my $rc = DelBudget($budget_id); + $op = 'list'; +} elsif( $op eq 'add_validate' ) { + my @budgetusersid; + if (defined $budget_users_ids){ + @budgetusersid = split(':', $budget_users_ids); + } + + if (defined $budget_id) { + if (CanUserModifyBudget($borrowernumber, $budget_hash->{budget_id}, + $staffflags) + ) { ModBudget( $budget_hash ); - } else { - AddBudget( $budget_hash ); + ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid); + } + else { + $template->param(error_not_authorised_to_modify => 1); } + } else { + AddBudget( $budget_hash ); + ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid); } + $op = 'list'; +} + +if ( $op eq 'list' ) { my $branches = GetBranches(); - my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} ); $template->param( - budget_period_dropbox => $budget_period_dropbox, - budget_id => $budget_id, + budget_id => $budget_id, %$period, ); - my $moo = GetBudgetHierarchy($$period{budget_period_id}, C4::Context->userenv->{branchcode}, $show_mine?$borrower_id:''); - my @budgets = @$moo; #FIXME + my @budgets = @{ + GetBudgetHierarchy($$period{budget_period_id}, + C4::Context->userenv->{branchcode}, $show_mine ? $borrower_id : '') + }; - my $toggle = 0; - my @loop; my $period_total = 0; - my ( $period_alloc_total, $base_spent_total ); + my ($period_alloc_total, $spent_total, $ordered_total, $available_total) = (0,0,0,0); - use YAML; - $debug && warn Dump(@budgets); #This Looks WEIRD to me : should budgets be filtered in such a way ppl who donot own it would not see the amount spent on the budget by others ? foreach my $budget (@budgets) { # PERMISSIONS - unless($staffflags->{'superlibrarian'} % 2 == 1 ) { - #IF NO PERMS, THEN DISABLE EDIT/DELETE - unless ( $template->{param_map}->{'CAN_user_acquisition_budget_modify'} ) { - $budget->{'budget_lock'} = 1; - } - # check budget permission - if ( $$period{budget_period_locked} == 1 ) { - $budget->{'budget_lock'} = 1; - - } elsif ( $budget->{budget_permission} == 1 ) { - - if ( $borrower_id != $budget->{'budget_owner_id'} ) { - $budget->{'budget_lock'} = 1; - } - # check parent perms too - my $parents_perm = 0; - if ( $budget->{depth} > 0 ) { - $parents_perm = CheckBudgetParentPerm( $budget, $borrower_id ); - delete $budget->{'budget_lock'} if $parents_perm == '1'; - } - } elsif ( $budget->{budget_permission} == 2 ) { - - $budget->{'budget_lock'} = 1 if $user_branchcode ne $budget->{budget_branchcode}; - } - } # ...SUPER_LIB END + unless(CanUserModifyBudget($borrowernumber, $budget, $staffflags)) { + $budget->{'budget_lock'} = 1; + } # if a budget search doesnt match, next - if ($filter_budgetname ) { - next unless $budget->{budget_code} =~ m/$filter_budgetname/ || - $budget->{name} =~ m/$filter_budgetname/ ; + if ($filter_budgetname) { + next + unless $budget->{budget_code} =~ m/$filter_budgetname/i + || $budget->{budget_name} =~ m/$filter_budgetname/i; } if ($filter_budgetbranch ) { - next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/; + next unless $budget->{budget_branchcode} eq $filter_budgetbranch; } ## TOTALS + $budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'budget_spent'} - $budget->{budget_ordered}; + $budget->{'total_remaining'} = $budget->{'budget_amount'} - $budget->{'total_spent'} - $budget->{total_ordered}; # adds to total - only if budget is a 'top-level' budget - $period_alloc_total += $budget->{'budget_amount_total'} if $budget->{'depth'} == 0; - $base_spent_total += $budget->{'budget_spent'}; - $budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'budget_spent'}; + if ($budget->{depth} == 0) { + $period_alloc_total += $budget->{'budget_amount'}; + $spent_total += $budget->{total_spent}; + $ordered_total += $budget->{total_ordered}; + $available_total += $budget->{total_remaining}; + } # if amount == 0 dont display... - delete $budget->{'budget_unalloc_sublevel'} if $budget->{'budget_unalloc_sublevel'} == 0 ; + delete $budget->{'budget_unalloc_sublevel'} + if (!defined $budget->{'budget_unalloc_sublevel'} + or $budget->{'budget_unalloc_sublevel'} == 0); - $budget->{'remaining_pos'} = 1 if $budget->{'budget_remaining'} > 0; - $budget->{'remaining_neg'} = 1 if $budget->{'budget_remaining'} < 0; - for (grep {/budget_spent|budget_amount|budget_remaining|budget_unalloc/} keys %$budget){ - $$budget{$_} = $num->format_price( $$budget{$_} ) if defined($$budget{$_}) + for (grep {/total_spent|budget_spent|total_ordered|budget_ordered|budget_amount/} keys %$budget){ + $budget->{$_} = $num->format_price( $budget->{$_} ) if defined($budget->{$_}) } + for (qw/budget_remaining total_remaining/) { + if (defined $budget->{$_}) { + $budget->{$_.'_display'} = $num->format_price($budget->{$_}); + } + } + + # Value of budget_spent equals 0 instead of undefined value + $budget->{"budget_spent"} = $num->format_price(0) unless defined($budget->{"budget_spent"}); + $budget->{budget_ordered} = $num->format_price(0) unless defined($budget->{"budget_ordered"}); my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{"budget_owner_name"} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; $budget->{"budget_borrowernumber"} = $borrower->{'borrowernumber'}; - push( @loop, { %{$budget}, - branchname => $branches->{ $budget->{branchcode} }->{branchname}, - } - ); + #Make a list of parents of the bugdet + my @budget_hierarchy; + push @budget_hierarchy, { element_name => $budget->{"budget_name"}, element_id => $budget->{"budget_id"} }; + my $parent_id = $budget->{"budget_parent_id"}; + while ($parent_id) { + my $parent = GetBudget($parent_id); + push @budget_hierarchy, { element_name => $parent->{"budget_name"}, element_id => $parent->{"budget_id"} }; + $parent_id = $parent->{"budget_parent_id"}; + } + push @budget_hierarchy, { element_name => $period->{"budget_period_description"} }; + @budget_hierarchy = reverse(@budget_hierarchy); + + $budget->{branchname} = $branches->{ $budget->{branchcode} }->{branchname}; + $budget->{budget_hierarchy} = \@budget_hierarchy; } - my $budget_period_total = $num->format_price($$period{budget_period_total}) if $$period{budget_period_total}; + my $budget_period_total = $period->{budget_period_total}; + + foreach ($budget_period_total, $period_alloc_total, $spent_total, $ordered_total, $available_total) { + $_ = $num->format_price($_); + } + + my $periods = GetBudgetPeriods(); + $template->param( - else => 1, - budget => \@loop, + op => 'list', + budgets => \@budgets, + periods => $periods, budget_period_total => $budget_period_total, - period_alloc_total => $num->format_price($period_alloc_total), - base_spent_total => $num->format_price($base_spent_total), + period_alloc_total => $period_alloc_total, + spent_total => $spent_total, + ordered_total => $ordered_total, + available_total => $available_total, branchloop => \@branchloop2, ); -} #---- END $OP eq DEFAULT +} #---- END list output_html_with_http_headers $input, $cookie, $template->output;