sub GetCriteriumDesc{
my ($criteriumvalue,$displayby)=@_;
+ unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED) ) {
+ return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown";
+ }
return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
my $returnsuggested = $input->param('returnsuggested');
my $managedby = $input->param('managedby');
my $displayby = $input->param('displayby') || '';
-my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : '';
my $tabcode = $input->param('tabcode');
# filter informations which are not suggestion related.
$displayby||="STATUS";
delete $$suggestion_ref{'branchcode'} if($displayby eq "branchcode");
+ # distinct values of display by
my $criteria_list=GetDistinctValues("suggestions.".$displayby);
+ my (@criteria_dv, $criteria_has_empty);
+ foreach (@$criteria_list) {
+ if ($_->{value}) {
+ push @criteria_dv, $_->{value};
+ } else {
+ $criteria_has_empty = 1;
+ }
+ }
+ # agregate null and empty values under empty value
+ push @criteria_dv, '' if $criteria_has_empty;
+
my @allsuggestions;
my $reasonsloop = GetAuthorisedValues("SUGGEST");
- foreach my $criteriumvalue ( map { $$_{'value'} } @$criteria_list ) {
+ foreach my $criteriumvalue ( @criteria_dv ) {
# By default, display suggestions from current working branch
- if(not defined $branchfilter) {
+ unless ( exists $$suggestion_ref{'branchcode'} ) {
$$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
}
my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
$template->param(
%$suggestion_ref,
"op_$op" => 1,
- dateformat => C4::Context->preference("dateformat"),
"op" =>$op,
);
## Initializing selection lists
#branch display management
-my $onlymine=C4::Context->preference('IndependantBranches') &&
+my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : '';
+my $onlymine=C4::Context->preference('IndependentBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags}!=1 &&
C4::Context->userenv->{branch};
total => sprintf("%.2f", $$suggestion_ref{'total'}||0),
);
+# lists of distinct values (without empty) for filters
my %hashlists;
foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) {
my $values_list;
$values_list = GetDistinctValues( "suggestions." . $field );
my @codes_list = map {
{ 'code' => $$_{'value'},
- 'desc' => GetCriteriumDesc( $$_{'value'}, $field ),
+ 'desc' => GetCriteriumDesc( $$_{'value'}, $field ) || $$_{'value'},
'selected' => ($$suggestion_ref{$field}) ? $$_{'value'} eq $$suggestion_ref{$field} : 0,
}
+ } grep {
+ $$_{'value'}
} @$values_list;
$hashlists{ lc($field) . "_loop" } = \@codes_list;
}
$template->param(%hashlists);
-$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),);
+$template->param(
+ SuggestionStatuses => GetAuthorisedValues('SUGGEST_STATUS'),
+);
output_html_with_http_headers $input, $cookie, $template->output;