Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster

[koha.git] / serials / routing.pl

diff --git a/serials/routing.pl b/serials/routing.pl
index e739a2d..2bd7d69 100755 (executable)
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -11,9 +11,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 =head1 Routing.pl
@@ -26,6 +26,7 @@ printed out
 =cut
 
 use strict;
+use warnings;
 use CGI;
 use C4::Koha;
 use C4::Auth;
@@ -38,14 +39,17 @@ use C4::Context;
 use C4::Members;
 use C4::Serials;
 
+use URI::Escape;
+
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');
 my $serialseq = $query->param('serialseq');
 my $routingid = $query->param('routingid');
 my $borrowernumber = $query->param('borrowernumber');
 my $notes = $query->param('notes');
-my $op = $query->param('op');
+my $op = $query->param('op') || q{};
 my $date_selected = $query->param('date_selected');
+$date_selected ||= q{};
 my $dbh = C4::Context->dbh;
 
 if($op eq 'delete'){
@@ -58,26 +62,27 @@ if($op eq 'add'){
 if($op eq 'save'){
     my $sth = $dbh->prepare("UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?");
     $sth->execute($notes,$subscriptionid);
-    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$date_selected");
+    my $urldate = URI::Escape::uri_escape($date_selected);
+    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
 }
-    
+
 my ($routing, @routinglist) = getroutinglist($subscriptionid);
 my $subs = GetSubscription($subscriptionid);
 my ($count,@serials) = GetSerials($subscriptionid);
-my ($serialdates) = GetLatestSerials($subscriptionid,$count);
-
-my @dates;
-my $i=0;
-foreach my $dateseq (@$serialdates) {
-        $dates[$i]->{'planneddate'} = $dateseq->{'planneddate'};
-        $dates[$i]->{'serialseq'} = $dateseq->{'serialseq'};
-        $dates[$i]->{'serialid'} = $dateseq->{'serialid'};
-        if($date_selected eq $dateseq->{'serialid'}){
-            $dates[$i]->{'selected'} = ' selected';
-        } else {
-            $dates[$i]->{'selected'} = '';
-        }
-        $i++;
+my $serialdates = GetLatestSerials($subscriptionid,$count);
+
+my $dates = [];
+foreach my $dateseq (@{$serialdates}) {
+    my $d = {};
+    $d->{planneddate} = $dateseq->{planneddate};
+    $d->{serialseq} = $dateseq->{serialseq};
+    $d->{serialid} = $dateseq->{serialid};
+    if($date_selected eq $dateseq->{serialid}){
+        $d->{selected} = ' selected';
+    } else {
+        $d->{selected} = q{};
+    }
+    push @{$dates}, $d;
 }
 
 my ($template, $loggedinuser, $cookie)
@@ -85,42 +90,41 @@ my ($template, $loggedinuser, $cookie)
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => 'routing'},
                                debug => 1,
                                });
-# my $date;
-# if($serialseq){
-#    for(my $i = 0;$i<@serials; $i++){
-#      if($serials[$i]->{'serialseq'} eq $serialseq){
-#          $date = $serials[$i]->{'planneddate'}
-#      }
-#    }
-# } else {
-#    $serialseq = $serials[0]->{'serialseq'};
-#    $date = $serials[0]->{'planneddate'};
-# }
-
-# my $issue = "$serialseq ($date)";
-  
+
 my @results;
 my $data;
 for(my $i=0;$i<$routing;$i++){
-    $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
-    $data->{'location'}=$data->{'streetaddress'};
-    $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
+    $data=GetMember('borrowernumber' => $routinglist[$i]->{'borrowernumber'});
+    $data->{'location'}=$data->{'branchcode'};
+    if ($data->{firstname} ) {
+        $data->{name} = $data->{firstname} . q| |;
+    }
+    else {
+        $data->{name} = q{};
+    }
+    if ($data->{surname} ) {
+        $data->{name} .= $data->{surname};
+    }
     $data->{'routingid'}=$routinglist[$i]->{'routingid'};
     $data->{'subscriptionid'}=$subscriptionid;
-    my $rankingbox = '<select name="itemrank" onchange="reorder_item('.$subscriptionid.','.$routinglist[$i]->{'routingid'}.',this.options[this.selectedIndex].value)">';
+    if (! $routinglist[$i]->{routingid} ) {
+        $routinglist[$i]->{routingid} = q||;
+    }
+    my $rankingbox = '<select name="itemrank" onchange="reorder_item('
+    . $subscriptionid . ',' .$routinglist[$i]->{'routingid'} . ',this.options[this.selectedIndex].value)">';
     for(my $j=1; $j <= $routing; $j++) {
        $rankingbox .= "<option ";
-       if($routinglist[$i]->{'ranking'} == $j){
+       if($routinglist[$i]->{ranking} && $routinglist[$i]->{ranking} == $j){
            $rankingbox .= " selected=\"selected\"";
        }
        $rankingbox .= " value=\"$j\">$j</option>";
     }
     $rankingbox .= "</select>";
     $data->{'routingbox'} = $rankingbox;
-    
+
     push(@results, $data);
 }
 
@@ -130,16 +134,17 @@ if ($op eq 'new') {
     $new = 1;
 } else {
 # for modify routing list default
-    $new => 0;
+    $new = 0;
 }
 
 $template->param(
     title => $subs->{'bibliotitle'},
     subscriptionid => $subscriptionid,
-    memberloop => \@results,    
+    memberloop => \@results,
     op => $new,
-    dates => \@dates,
+    dates => $dates,
     routingnotes => $serials[0]->{'routingnotes'},
+    hasRouting => check_routing($subscriptionid),
     );
 
         output_html_with_http_headers $query, $cookie, $template->output;