X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=suggestion%2Fsuggestion.pl;h=949cca30ffe13ba34d6ff650b777717b61a1aae2;hb=2b8b5ae225af6119e41e2112f9a8573b4170b927;hp=272ca6ff2e6ac446b34e0e5de0963d24921b3372;hpb=aef1dd15fbe37a8a9c30ba4b38f7ecd6c1fea54d;p=koha_fer

diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 272ca6ff2e..949cca30ff 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -31,28 +31,37 @@ use C4::Search;
 use C4::Dates qw(format_date);
 use C4::Members;
 use C4::Debug;
+use URI::Escape;
 
 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'});
 }
 
 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/);
@@ -69,16 +78,16 @@ sub GetCriteriumDesc{
 }
 
 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 $branchfilter   = $input->param('branchcode');
-my $suggestedby    = $input->param('suggestedby');
-my $returnsuggested = $input->param('returnsuggested');
+my $suggestedby     = $input->param('suggestedby');
 my $returnsuggestedby = $input->param('returnsuggestedby');
-my $managedby    = $input->param('managedby');
-my $displayby    = $input->param('displayby');
-my $tabcode    = $input->param('tabcode');
+my $returnsuggested = $input->param('returnsuggested');
+my $managedby       = $input->param('managedby');
+my $displayby       = $input->param('displayby') || '';
+my $tabcode         = $input->param('tabcode');
 
 # filter informations which are not suggestion related.
 my $suggestion_ref  = $input->Vars;
@@ -87,7 +96,7 @@ delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode edit_
 foreach (keys %$suggestion_ref){
     delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' || $op eq 'change'));
 }
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user(
         {
             template_name   => "suggestion/suggestion.tmpl",
             query           => $input,
@@ -96,11 +105,14 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         }
     );
 
+$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};
@@ -115,7 +127,7 @@ if ( $op =~ /save/i ) {
         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
@@ -125,6 +137,11 @@ if ( $op =~ /save/i ) {
     }  
     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  
@@ -147,59 +164,95 @@ elsif ($op eq "change" ) {
         $$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' );
     }
     $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';
     
     $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
+        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);
-        $$suggestion_ref{$displayby}=$criteriumvalue;
-#        warn $$suggestion_ref{$displayby}."=$criteriumvalue; $displayby";
-    
+
+        next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue );
+        $$suggestion_ref{$displayby} = $criteriumvalue;
+
         my $suggestions = &SearchSuggestion($suggestion_ref);
-        foreach my $suggestion (@$suggestions){
-            if($suggestion->{budgetid}) {
-                my $budget = GetBudget($suggestion->{budgetid});
-                $suggestion->{budget_name}=$budget->{budget_name} if $budget;
+        foreach my $suggestion (@$suggestions) {
+            if ($suggestion->{budgetid}){
+                my $bud = GetBudget( $suggestion->{budgetid} );
+                $suggestion->{budget_name} = $bud->{budget_name} if $bud;
             }
-            foreach my $date qw(suggesteddate manageddate accepteddate){
-                if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
-                $suggestion->{$date}=format_date($suggestion->{$date}) ;
+            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}="" ;
-                }             
-            }    
+                    $suggestion->{$date} = "";
+                }
+            }
         }
         push @allsuggestions,{
                             "suggestiontype"=>$criteriumvalue||"suggest",
@@ -219,7 +272,7 @@ if ($op=~/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});
@@ -236,23 +289,24 @@ foreach my $element qw(managedby suggestedby acceptedby) {
 $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;
 
@@ -260,8 +314,7 @@ foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$
     my %row = (
         value      => $thisbranch,
         branchname => $branches->{$thisbranch}->{'branchname'},
-        selected   => ($branches->{$thisbranch}->{'branchcode'} eq $branchfilter)
-                    ||($branches->{$thisbranch}->{'branchcode'} eq $$suggestion_ref{'branchcode'})    
+        selected   => ($branchfilter and $branches->{$thisbranch}->{'branchcode'} eq $branchfilter ) || ( $$suggestion_ref{'branchcode'} and $branches->{$thisbranch}->{'branchcode'} eq $$suggestion_ref{'branchcode'} )
     );
     push @branchloop, \%row;
 }
@@ -271,14 +324,16 @@ $template->param( branchloop => \@branchloop,
                 branchfilter => $branchfilter);
 
 # the index parameter is different for item-level itemtypes
-my $supportlist=GetSupportList();				
-foreach my $support(@$supportlist){
-    $$support{'selected'}= $$support{'itemtype'} eq $$suggestion_ref{'itemtype'};
-    if ($$support{'imageurl'}){
-        $$support{'imageurl'}= getitemtypeimagelocation( 'intranet', $$support{'imageurl'} );
-    }
-    else {
-    delete $$support{'imageurl'}
+my $supportlist = GetSupportList();
+
+foreach my $support (@$supportlist) {
+    $$support{'selected'} = (defined $$suggestion_ref{'itemtype'})
+        ? $$support{'itemtype'} eq $$suggestion_ref{'itemtype'}
+        : 0;
+    if ( $$support{'imageurl'} ) {
+        $$support{'imageurl'} = getitemtypeimagelocation( 'intranet', $$support{'imageurl'} );
+    } else {
+        delete $$support{'imageurl'};
     }
 }
 $template->param(itemtypeloop=>$supportlist);
@@ -296,13 +351,20 @@ if ($branchfilter) {
     $budgets = GetBudgets(undef);
 }
 
+my @budgets_loop;
 foreach my $budget ( @{$budgets} ) {
-## Please see file perltidy.ERR
-    $budget->{'selected'}=1 if ($$suggestion_ref{'budgetid'} && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'})
-};
+    next unless (CanUserUseBudget($borrowernumber, $budget, $userflags));
+
+    ## Please see file perltidy.ERR
+    $budget->{'selected'} = 1
+        if ($$suggestion_ref{'budgetid'}
+        && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'});
 
-$template->param( budgetsloop => $budgets);
-$template->param( "statusselected_$$suggestion_ref{'STATUS'}" =>1);
+    push @budgets_loop, $budget;
+}
+
+$template->param( budgetsloop => \@budgets_loop);
+$template->param( "statusselected_$$suggestion_ref{'STATUS'}" =>1) if ($$suggestion_ref{'STATUS'});
 
 # get currencies and rates
 my @rates = GetCurrencies();
@@ -321,29 +383,34 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     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) {
+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),
-                        'selected'=> $$_{'value'} eq $$suggestion_ref{$field}
-                        }
-                    } @$values_list;
-    $hashlists{lc($field)."_loop"}=\@codes_list;
+    $values_list = GetDistinctValues( "suggestions." . $field );
+    my @codes_list = map {
+        {   'code' => $$_{'value'},
+            '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;