@@ -, +, @@ - Add several suggestions to your installation, make sure you have: - suggestions from various libraries and at least one for 'Any library' that has been created from the intranet - suggestions from different users - suggestions with different status - suggestions with different selected itypes - Add 1 or 2 custom status to SUGGEST_STATUS authorized value. - Verify display is still correct and your new status are displayed. --- .../prog/en/modules/suggestion/suggestion.tt | 28 ++++++++++++-------- suggestion/suggestion.pl | 15 ++++++++--- 2 files changed, 28 insertions(+), 15 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -422,19 +422,25 @@ $(document).ready(function() { calcNewsuggTotal(); }); [% IF ( suggestion.suggestiontypelabel ) %] - [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending - [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted - [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked - [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected - [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available - [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered - [% ELSE %][% suggestion.suggestiontypelabel %][% END %] - [% ELSE %] - [% IF ( suggestion.suggestiontype ) %] - [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) %] + [% IF (displayby == "STATUS") %] + [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending + [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted + [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked + [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected + [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available + [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered + [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Unknown + [% ELSIF ( suggestion.suggestiontype ) %] + [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) %] + [% ELSE %] + Unknown + [% END %] [% ELSE %] - No name + [% IF (suggestion.suggestiontypelabel == "Any") %]Any library + [% ELSE %][% suggestion.suggestiontypelabel %][% END %] [% END %] + [% ELSE %] + Unknown [% END %] ([% suggestion.suggestions_loop.size %]) --- a/suggestion/suggestion.pl +++ a/suggestion/suggestion.pl @@ -58,11 +58,17 @@ sub Init{ sub GetCriteriumDesc{ my ($criteriumvalue,$displayby)=@_; - unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED ORDERED AVAILABLE) ) { + if ($displayby =~ /status/i ) { + if ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED ORDERED AVAILABLE) ) { + return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) + } + else { return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || $criteriumvalue; + } + } + if ($displayby =~/branchcode/) { + return (GetBranchName($criteriumvalue)) || "Any"; } - return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); - return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); @@ -86,6 +92,7 @@ my $returnsuggested = $input->param('returnsuggested'); my $managedby = $input->param('managedby'); my $displayby = $input->param('displayby') || ''; my $tabcode = $input->param('tabcode'); +my $branchcodesel = $input->param('branchcode'); # filter informations which are not suggestion related. my $suggestion_ref = $input->Vars; @@ -209,7 +216,7 @@ if ($op=~/else/) { my $reasonsloop = GetAuthorisedValues("SUGGEST"); foreach my $criteriumvalue ( @criteria_dv ) { # By default, display suggestions from current working branch - unless ( exists $$suggestion_ref{'branchcode'} ) { + unless ( exists $$suggestion_ref{'branchcode'} || $branchcodesel eq "__ANY__" ) { $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'}; } my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne ""; --