use Modern::Perl;
require Exporter;
use CGI qw ( -utf8 );
-use C4::Auth; # get_template_and_user
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
use C4::Suggestions;
-use C4::Koha;
-use C4::Budgets;
-use C4::Search;
+use C4::Koha qw( GetAuthorisedValues );
+use C4::Budgets qw( GetBudget GetBudgets GetBudgetHierarchy CanUserUseBudget );
+use C4::Search qw( FindDuplicate GetDistinctValues );
use C4::Members;
use Koha::DateUtils qw( dt_from_string );
use Koha::AuthorisedValues;
use Koha::Libraries;
use Koha::Patrons;
-use URI::Escape;
+use URI::Escape qw( uri_escape );
sub Init{
my $suggestion= shift @_;
my $tabcode = $input->param('tabcode');
my $save_confirmed = $input->param('save_confirmed') || 0;
my $notify = $input->param('notify');
-my $filter_archived = $input->param('filter_archived');
+my $filter_archived = $input->param('filter_archived') || 0;
my $reasonsloop = GetAuthorisedValues("SUGGEST");
foreach (keys %$suggestion_ref){
delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' ));
}
+delete $suggestion_only->{branchcode} if $suggestion_only->{branchcode} eq '__ANY__';
+delete $suggestion_only->{budgetid} if $suggestion_only->{budgetid} eq '__ANY__';
+while ( my ( $k, $v ) = each %$suggestion_only ) {
+ delete $suggestion_only->{$k} if $v eq '';
+}
+
my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user(
{
template_name => "suggestion/suggestion.tt",
title => $suggestion_only->{title},
author => $suggestion_only->{author},
itemtype => $suggestion_only->{itemtype},
+ isbn => $suggestion_only->{isbn},
});
my $manager = Koha::Patrons->find( $suggestion_only->{managedby} );
else {
for my $date_key ( qw( suggesteddate manageddate accepteddate rejecteddate ) ) {
+ # FIXME Do we need this?
$suggestion_only->{$date_key} = dt_from_string( $suggestion_only->{$date_key} )
if $suggestion_only->{$date_key};
}
$suggestion_only->{lastmodificationdate} = dt_from_string;
$suggestion_only->{lastmodificationby} = C4::Context->userenv->{number};
+ $suggestion_only->{branchcode} = undef
+ if exists $suggestion_only->{branchcode}
+ && $suggestion_only->{branchcode} eq "";
&ModSuggestion($suggestion_only);
}
} else {
###FIXME:Search here if suggestion already exists.
- my $suggestions_loop =
- SearchSuggestion( $suggestion_only );
- if (@$suggestions_loop>=1){
+ my $suggestions= Koha::Suggestions->search_limited( $suggestion_only );
+ if ( $suggestions->count ) {
#some suggestion are answering the request Donot Add
my @messages;
- for my $suggestion ( @$suggestions_loop ) {
- push @messages, { type => 'error', code => 'already_exists', id => $suggestion->{suggestionid} };
+ while ( my $suggestion = $suggestions->next ) {
+ push @messages, { type => 'error', code => 'already_exists', id => $suggestion->suggestionid };
}
$template->param( messages => \@messages );
}
{
@criteria_dv = ( C4::Context->userenv->{'branch'} );
}
+ # Pending tab first
+ if ( $displayby eq 'STATUS' ) {
+ @criteria_dv = grep { $_ ne 'ASKED' } @criteria_dv;
+ unshift @criteria_dv, 'ASKED';
+ }
+
+ unless ( exists $suggestion_ref->{branchcode} ) {
+ $suggestion_ref->{branchcode} = C4::Context->userenv->{'branch'};
+ }
my @allsuggestions;
foreach my $criteriumvalue ( @criteria_dv ) {
+ my $search_params = {%$suggestion_ref};
# By default, display suggestions from current working branch
- unless ( exists $$suggestion_ref{'branchcode'} ) {
- $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
- }
my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ) and ($displayby ne 'branchcode' && $branchfilter ne '__ANY__' );
- $$suggestion_ref{$displayby} = $criteriumvalue;
- my $suggestions = &SearchSuggestion({ %$suggestion_ref, archived => $filter_archived });
- foreach my $suggestion (@$suggestions) {
- if ($suggestion->{budgetid}){
- my $bud = GetBudget( $suggestion->{budgetid} );
- $suggestion->{budget_name} = $bud->{budget_name} if $bud;
+ $search_params->{$displayby} = $criteriumvalue;
+
+ # filter on date fields
+ foreach my $field (qw( suggesteddate manageddate accepteddate )) {
+ my $from = delete $search_params->{"${field}_from"};
+ my $to = delete $search_params->{"${field}_to"};
+
+ my $from_dt = $from && eval { dt_from_string($from) };
+ my $to_dt = $to && eval { dt_from_string($to) };
+
+ if ( $from_dt || $to_dt ) {
+ my $dtf = Koha::Database->new->schema->storage->datetime_parser;
+ if ( $from_dt && $to_dt ) {
+ $search_params->{$field} = { -between => [ $dtf->format_date($from_dt), $dtf->format_date($to_dt) ] };
+ } elsif ( $from_dt ) {
+ $search_params->{$field} = { '>=' => $dtf->format_date($from_dt) };
+ } elsif ( $to_dt ) {
+ $search_params->{$field} = { '<=' => $dtf->format_date($to_dt) };
+ }
}
}
- push @allsuggestions,{
- "suggestiontype"=>$criteriumvalue||"suggest",
- "suggestiontypelabel"=>GetCriteriumDesc($criteriumvalue,$displayby)||"",
- "suggestionscount"=>scalar(@$suggestions),
- 'suggestions_loop'=>$suggestions,
- 'reasonsloop' => $reasonsloop,
- } if @$suggestions;
+ if ( $search_params->{budgetid} && $search_params->{budgetid} eq '__NONE__' ) {
+ $search_params->{budgetid} = [undef, '' ];
+ }
+ for my $f (qw (branchcode budgetid)) {
+ delete $search_params->{$f}
+ if $search_params->{$f} eq '__ANY__'
+ || $search_params->{$f} eq '';
+ }
+
+ my @suggestions =
+ Koha::Suggestions->search_limited(
+ { %$search_params, archived => $filter_archived } )->as_list;
+
+ push @allsuggestions,
+ {
+ "suggestiontype" => $criteriumvalue || "suggest",
+ "suggestiontypelabel" => GetCriteriumDesc( $criteriumvalue, $displayby ) || "",
+ 'suggestions' => \@suggestions,
+ 'reasonsloop' => $reasonsloop,
+ }
+ if scalar @suggestions > 0;
delete $$suggestion_ref{$displayby} unless $definedvalue;
}
);
}
-my @currencies = Koha::Acquisition::Currencies->search;
+my $currencies = Koha::Acquisition::Currencies->search;
$template->param(
- currencies => \@currencies,
+ currencies => $currencies,
suggestion => $suggestion_ref,
price => sprintf("%.2f", $$suggestion_ref{'price'}||0),
total => sprintf("%.2f", $$suggestion_ref{'total'}||0),