=cut
use strict;
+use warnings;
use Number::Format;
use CGI;
my $branchname = GetBranchName($homebranch);
#my $count = scalar @results;
-my $count;
my $classlist = '';
my $total = 0;
my $totspent = 0;
+my $totordered = 0;
my $totcomtd = 0;
my $totavail = 0;
my @loop_budget = ();
$count = scalar @rates;
my $active_currency = GetCurrency;
-my $num = new Number::Format(-int_curr_symbol => '',
- -decimal_digits => "2" );
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
- my %line;
- $line{currency} = $rates[$i]->{'currency'} ;
- $line{currency_symbol} = $rates[$i]->{'symbol'};
- $line{rate} = sprintf ( '%.2f', $rates[$i]->{'rate'} );
- push @loop_currency, \%line;
-}
-
-# suggestions
-my $status = $query->param('status') || "ASKED";
-my $suggestion = CountSuggestion($status);
-my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
-# ---------------------------------------------------
-# number format
-my $cur_format = C4::Context->preference("CurrencyFormat");
my $num;
+my $cur_format = C4::Context->preference("CurrencyFormat");
if ( $cur_format eq 'FR' ) {
$num = new Number::Format(
'decimal_fill' => '2',
);
}
+my @loop_currency = ();
+for ( my $i = 0 ; $i < $count ; $i++ ) {
+ my %line;
+ $line{currency} = $rates[$i]->{'currency'} ;
+ $line{currency_symbol} = $rates[$i]->{'symbol'};
+ $line{rate} = sprintf ( '%.2f', $rates[$i]->{'rate'} );
+ push @loop_currency, \%line;
+}
+
+# suggestions
+my $status = $query->param('status') || "ASKED";
+my $suggestion = CountSuggestion($status);
+my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
+# ---------------------------------------------------
+# number format
my $period = GetBudgetPeriod;
my $budget_period_id = $period->{budget_period_id};
my $budget_branchcode = $period->{budget_branchcode};
my $moo = GetBudgetHierarchy('',$homebranch, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} );
-my @results = @$moo;
+@results = @$moo;
my $period_total = 0;
my $toggle = 0;
my @loop;
-my ( $total, $totspent, $totcomtd, $totavail );
foreach my $result (@results) {
# only get top-level budgets for display
my $r = GetBranchName( $result->{'budget_owner_id'} );
$result->{'budget_branchname'} = GetBranchName( $result->{'budget_branchcode'} );
- my $member = GetMember( $result->{'budget_owner_id'} );
- my $member_full = $member->{'firstname'} . ' ' . $member->{'surname'};
+ my $member = GetMember( borrowernumber => $result->{budget_owner_id} );
+ my $member_full = $member->{'firstname'} . ' ' . $member->{'surname'} if $member;
- $result->{'budget_owner'} = $member_full;
- $result->{'budget_avail'} = $result->{'budget_amount'} - $result->{'budget_spent'};
- $result->{'budget_spent'} = GetBudgetSpent( $result->{'budget_id'} );
+ $result->{'budget_owner'} = $member_full;
+ $result->{'budget_ordered'} = GetBudgetOrdered( $result->{'budget_id'} );
+ $result->{'budget_spent'} = GetBudgetSpent( $result->{'budget_id'} );
+ $result->{'budget_avail'} = $result->{'budget_amount'} - $result->{'budget_spent'} - $result->{'budget_ordered'};
- $total += $result->{'budget_amount'};
- $totspent += $result->{'budget_spent'};
- $totavail += $result->{'budget_avail'};
+ $total += $result->{'budget_amount'};
+ $totspent += $result->{'budget_spent'};
+ $totordered += $result->{'budget_ordered'};
+ $totavail += $result->{'budget_avail'};
- $result->{'budget_amount'} = $num->format_price( $result->{'budget_amount'} );
- $result->{'budget_spent'} = $num->format_price( $result->{'budget_spent'} );
- $result->{'budget_avail'} = $num->format_price( $result->{'budget_avail'} );
+ $result->{'budget_amount'} = $num->format_price( $result->{'budget_amount'} );
+ $result->{'budget_spent'} = $num->format_price( $result->{'budget_spent'} );
+ $result->{'budget_ordered'} = $num->format_price( $result->{'budget_ordered'} );
+ $result->{'budget_avail'} = $num->format_price( $result->{'budget_avail'} );
# my $spent_percent = ( $result->{'budget_spent'} / $result->{'budget_amount'} ) * 100;
# $result->{'budget_spent_percent'} = sprintf( "%00d", $spent_percent );
- my $borrower = &GetMember( $result->{budget_owner_id} );
- $result->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
+ if ($member) {
+ $result->{budget_owner_name} = $member->{'firstname'} . ' ' . $member->{'surname'};
+ }
push( @loop_budget, { %{$result}, toggle => $toggle++ % 2, } );
}
-
-# ---------------------------------------------------
-
-=c FIXME
-
-
-### $cur
-
-## suggestions
-
-my $dbh = C4::Context->dbh;
-
-
-## liste des domaines
-
-my $sth=$dbh->prepare("
-SELECT bookfundgroupnumber,bookfundgroupname
-FROM `aq2bookfundgroups`
-ORDER BY Bookfundgroupname
-");
-$sth->execute;
-
-my @bookfundgroup_loop; ## liste des domaines
-
-while (my $row=$sth->fetchrow_hashref) {
- push @bookfundgroup_loop,$row;
-}
-$sth->finish;
-
-
-## liste des BFG ayant des suggestions à traiter
-
-
-## nowsuggestions = Number Of Waiting Suggestions
-
-my $dbh = C4::Context->dbh;
-
-my $sth=$dbh->prepare("
-SELECT bookfundgroupnumber, count(*) AS nowsuggestions
-FROM `aq2orders`
-WHERE step=2
-AND STATUS='ASKED'
-GROUP BY bookfundgroupnumber
-");
-$sth->execute;
-
-my @nowsuggestionsneq0_loop; ## liste des BFG ayant des suggestions à traiter
-
-while (my $row=$sth->fetchrow_hashref) {
- push @nowsuggestionsneq0_loop,$row;
-}
-$sth->finish;
-
-
-## liste des BFG avec l'effectif des suggestions à traiter (effectif éventuellement nul)
-
-my @nowsuggestions_loop;
-
-foreach my $data1 (@bookfundgroup_loop) {
- $data1->{'nowsuggestions'}=0;
- foreach my $data2 (@nowsuggestionsneq0_loop) {
- if ($data1->{'bookfundgroupnumber'}==$data2->{'bookfundgroupnumber'}) {
- $data1->{'nowsuggestions'}=$data2->{'nowsuggestions'};
- }
- }
-}
-
-=cut
-
-
$template->param(
classlist => $classlist,
type => 'intranet',
branchname => $branchname,
budget => $period->{budget_name},
total => $num->format_price( $total ),
- totspent => $num->format_price($totspent ),
+ totspent => $num->format_price( $totspent ),
+ totordered => $num->format_price( $totordered ),
totcomtd => $num->format_price( $totcomtd ),
totavail => $num->format_price( $totavail ),
-
- # nowsuggestions_loop => \@nowsuggestions_loop,
- # bookfundgroup_loop => \@bookfundgroup_loop,
- # numberofwaitingsuggestionsgpd => $numberofwaitingsuggestionsgpd,
- # numberofwaitingsuggestionspd => $numberofwaitingsuggestionspd,
- # suggestions_loop => $suggestions_loop,
-
+ suggestion => $suggestion,
);
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff