sub Init{
my $suggestion= shift @_;
- foreach my $date qw(suggesteddate manageddate){
- $suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
- $suggestion->{$date}=C4::Dates->today:
- format_date($suggestion->{$date})
- );
- }
- foreach my $date qw(rejecteddate accepteddate){
+ # "Managed by" is used only when a suggestion is being edited (not when created)
+ if ($suggestion->{'suggesteddate'} eq "0000-00-00" ||$suggestion->{'suggesteddate'} eq "") {
+ # new suggestion
+ $suggestion->{'suggesteddate'} = C4::Dates->today;
+ $suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'suggestedby'});
+ }
+ else {
+ # editing of an existing suggestion
+ $suggestion->{'manageddate'} = C4::Dates->today;
+ $suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
+ # suggesteddate, when coming from the DB, needs to be formated
+ $suggestion->{'suggesteddate'} = format_date($suggestion->{'suggesteddate'});
+ }
+ foreach my $date ( qw(rejecteddate accepteddate) ){
$suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
"":
format_date($suggestion->{$date})
);
- }
- $suggestion->{'managedby'}=C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
- $suggestion->{'createdby'}=C4::Context->userenv->{"number"} unless ($suggestion->{'createdby'});
+ }
$suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
}
if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
return "" unless $borr;
- return $$borr{firstname} . ", " . $$borr{surname};
+ return $$borr{surname} . ", " . $$borr{firstname};
}
if ( $displayby =~ /budgetid/) {
my $budget = GetBudget($criteriumvalue);
}
$op = 'else';
}
+elsif ( $op eq 'show' ) {
+ $suggestion_ref=&GetSuggestion($$suggestion_ref{'suggestionid'});
+ $$suggestion_ref{branchname} = GetBranchName $$suggestion_ref{branchcode};
+ my $budget = GetBudget $$suggestion_ref{budgetid};
+ $$suggestion_ref{budgetname} = $$budget{budget_name};
+ Init($suggestion_ref);
+}
if ($op=~/else/) {
$op='else';
my $budget = GetBudget($suggestion->{budgetid});
$suggestion->{budget_name}=$budget->{budget_name} if $budget;
}
- foreach my $date qw(suggesteddate manageddate accepteddate){
+ foreach my $date ( qw(suggesteddate manageddate accepteddate) ){
if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
$suggestion->{$date}=format_date($suggestion->{$date}) ;
} else {
);
}
-foreach my $element qw(managedby suggestedby acceptedby) {
+foreach my $element ( qw(managedby suggestedby acceptedby) ) {
# $debug || warn $$suggestion_ref{$element};
if ($$suggestion_ref{$element}){
my $member=GetMember(borrowernumber=>$$suggestion_ref{$element});
# get currencies and rates
my @rates = GetCurrencies();
my $count = scalar @rates;
+my $active_currency = GetCurrency();
+my $selected_currency;
+if ($$suggestion_ref{'currency'}) {
+ $selected_currency = $$suggestion_ref{'currency'};
+}
+else {
+ $selected_currency = $active_currency->{currency};
+}
my @loop_currency = ();
for ( my $i = 0 ; $i < $count ; $i++ ) {
my %line;
$line{currcode} = $rates[$i]->{'currency'};
$line{rate} = $rates[$i]->{'rate'};
- $line{selected} = 1 if ($$suggestion_ref{'currency'} && $line{'currcode'} eq $$suggestion_ref{'currency'});
+ $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
push @loop_currency, \%line;
}
);
my %hashlists;
-foreach my $field qw(managedby acceptedby suggestedby budgetid) {
+foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) {
my $values_list;
$values_list=GetDistinctValues("suggestions.".$field) ;
my @codes_list = map{