use C4::Dates qw(format_date);
use C4::Members;
use C4::Debug;
+use URI::Escape;
sub Init{
my $suggestion= shift @_;
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 $input = CGI->new;
+my $redirect = $input->param('redirect');
my $suggestedbyme = (defined $input->param('suggestedbyme')? $input->param('suggestedbyme'):1);
my $op = $input->param('op')||'else';
my @editsuggestions = $input->param('edit_field');
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.
}
);
+$borrowernumber = $input->param('borrowernumber') if ( $input->param('borrowernumber') );
+$template->param('borrowernumber' => $borrowernumber);
+
#########################################
## Operations
##
if ( $op =~ /save/i ) {
- if ( $$suggestion_ref{"STATUS"} ) {
+ if ( $$suggestion_ref{"STATUS"} ) {
if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
$$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
$$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" } = C4::Context->userenv->{number};
my $suggestions_loop =
SearchSuggestion( $suggestion_ref );
if (@$suggestions_loop>=1){
- #some suggestion are answering the request Donot Add
+ #some suggestion are answering the request Donot Add
}
else {
## Adding some informations related to suggestion
}
map{delete $$suggestion_ref{$_}} keys %$suggestion_ref;
$op = 'else';
+
+ if( $redirect eq 'purchase_suggestions' ) {
+ print $input->redirect("/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=$borrowernumber");
+ }
+
}
elsif ($op=~/add/) {
#Adds suggestion
$$suggestion_ref{"rejecteddate"}=C4::Dates->today;
$$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
}
- if ($$suggestion_ref{"STATUS"}){
- $$suggestion_ref{"manageddate"}=C4::Dates->today;
- $$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
- }
- if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
- if ( $reason eq "other" ) {
- $reason = $$suggestion_ref{"other_reason$tabcode"};
- }
- $$suggestion_ref{'reason'}=$reason;
- }
- delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
- foreach (keys %$suggestion_ref){
- delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
- }
+ if ($$suggestion_ref{"STATUS"}){
+ $$suggestion_ref{"manageddate"}=C4::Dates->today;
+ $$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
+ }
+ if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
+ if ( $reason eq "other" ) {
+ $reason = $$suggestion_ref{"other_reason$tabcode"};
+ }
+ $$suggestion_ref{'reason'}=$reason;
+ }
+ delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
+ foreach (keys %$suggestion_ref){
+ delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
+ }
foreach my $suggestionid (@editsuggestions) {
next unless $suggestionid;
$$suggestion_ref{'suggestionid'}=$suggestionid;
&ModSuggestion($suggestion_ref);
}
- $op = 'else';
+ my $params = '';
+ foreach my $key (
+ qw(
+ displayby branchcode title author isbn publishercode copyrightdate
+ collectiontitle suggestedby suggesteddate_from suggesteddate_to
+ manageddate_from manageddate_to accepteddate_from
+ accepteddate_to budgetid
+ )
+ )
+ {
+ $params .= $key . '=' . uri_escape($input->param($key)) . '&'
+ if defined($input->param($key));
+ }
+ print $input->redirect("/cgi-bin/koha/suggestion/suggestion.pl?$params");
}elsif ($op eq "delete" ) {
foreach my $delete_field (@editsuggestions) {
&DelSuggestion( $borrowernumber, $delete_field,'intranet' );
$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 "";
my $bud = GetBudget( $suggestion->{budgetid} );
$suggestion->{budget_name} = $bud->{budget_name} if $bud;
}
- foreach my $date qw(suggesteddate manageddate accepteddate) {
- if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ) {
+ foreach my $date (qw(suggesteddate manageddate accepteddate)) {
+ if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00") {
$suggestion->{$date} = format_date( $suggestion->{$date} );
} else {
$suggestion->{$date} = "";
}
}
- foreach my $date ( qw(suggesteddate manageddate accepteddate) ){
- if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
- $suggestion->{$date}=format_date($suggestion->{$date}) ;
- } else {
- $suggestion->{$date}="" ;
- }
- }
}
push @allsuggestions,{
"suggestiontype"=>$criteriumvalue||"suggest",
$template->param(
%$suggestion_ref,
"op_$op" => 1,
- dateformat => C4::Context->preference("dateformat"),
"op" =>$op,
);
if(defined($returnsuggested) and $returnsuggested ne "noone")
{
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
}
####################
## Initializing selection lists
#branch display management
-my $onlymine=C4::Context->preference('IndependantBranches') &&
- C4::Context->userenv &&
- C4::Context->userenv->{flags}!=1 &&
- C4::Context->userenv->{branch};
+my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : '';
+my $onlymine =
+ C4::Context->preference('IndependentBranches')
+ && C4::Context->userenv
+ && !C4::Context->IsSuperLibrarian()
+ && C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
my %line;
$line{currcode} = $rates[$i]->{'currency'};
$line{rate} = $rates[$i]->{'rate'};
- $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
+ $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
push @loop_currency, \%line;
}
-
-$template->param(loop_currency => \@loop_currency);
-
$template->param(
- price => sprintf("%.2f", $$suggestion_ref{'price'}||0),
- total => sprintf("%.2f", $$suggestion_ref{'total'}||0),
+ loop_currency => \@loop_currency,
+ price => sprintf("%.2f", $$suggestion_ref{'price'}||0),
+ 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(
+ %hashlists,
+ borrowernumber => $input->param('borrowernumber'),
+ SuggestionStatuses => GetAuthorisedValues('SUGGEST_STATUS'),
+);
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha_fer / blobdiff