X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Frouting-preview.pl;h=bed509145818526f46491e3b29ea9e0c142901a4;hb=eb8666357ce72e910569843f8acce674a332f4b0;hp=9ccc30fe1d5f52bee349304f4db4441471c6f66f;hpb=9046a26d687b50faf9ad1050acb8a8384fabdf76;p=koha.git diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 9ccc30fe1d..bed5091458 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -1,13 +1,28 @@ #!/usr/bin/perl +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY 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, see . + # Routing Preview.pl script used to view a routing list after creation # lets one print out routing slip and create (in this instance) the heirarchy # of reserves for the serial use strict; -use CGI; +use warnings; +use CGI qw ( -utf8 ); use C4::Koha; use C4::Auth; -use C4::Dates; use C4::Output; use C4::Acquisition; use C4::Reserves; @@ -17,6 +32,8 @@ use C4::Members; use C4::Biblio; use C4::Items; use C4::Serials; +use URI::Escape; +use C4::Branch; my $query = new CGI; my $subscriptionid = $query->param('subscriptionid'); @@ -30,92 +47,97 @@ my $dbh = C4::Context->dbh; if($delete){ delroutingmember($routingid,$subscriptionid); my $sth = $dbh->prepare("UPDATE serial SET routingnotes = NULL WHERE subscriptionid = ?"); - $sth->execute($subscriptionid); - print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new"); + $sth->execute($subscriptionid); + print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new"); } if($edit){ print $query->redirect("routing.pl?subscriptionid=$subscriptionid"); } - -my ($routing, @routinglist) = getroutinglist($subscriptionid); + +my @routinglist = getroutinglist($subscriptionid); my $subs = GetSubscription($subscriptionid); -my ($count,@serials) = GetSerials($subscriptionid); +my ($tmp ,@serials) = GetSerials($subscriptionid); my ($template, $loggedinuser, $cookie); if($ok){ # get biblio information.... my $biblio = $subs->{'biblionumber'}; - - # get existing reserves ..... - my ($count,$reserves) = GetReservesFromBiblionumber($biblio); - my $totalcount = $count; - foreach my $res (@$reserves) { - if ($res->{'found'} eq 'W') { - $count--; + my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio); + my @itemresults = GetItemsInfo( $subs->{biblionumber} ); + my $branch = $itemresults[0]->{'holdingbranch'}; + my $branchname = GetBranchName($branch); + + if (C4::Context->preference('RoutingListAddReserves')){ + # get existing reserves ..... + my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblio }); + my $count = scalar( @$reserves ); + my $totalcount = $count; + foreach my $res (@$reserves) { + if ($res->{'found'} eq 'W') { + $count--; + } + } + my $notes; + my $title = $subs->{'bibliotitle'}; + for my $routing ( @routinglist ) { + my $sth = $dbh->prepare('SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1'); + $sth->execute($biblio,$routing->{borrowernumber}); + my $reserve = $sth->fetchrow_hashref; + + if($routing->{borrowernumber} == $reserve->{borrowernumber}){ + ModReserve({ + rank => $routing->{ranking}, + biblionumber => $biblio, + borrowernumber => $routing->{borrowernumber}, + branchcode => $branch + }); + } else { + AddReserve($branch,$routing->{borrowernumber},$biblio,\@bibitems,$routing->{ranking}, undef, undef, $notes,$title); } } - my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio); - my @itemresults = GetItemsInfo($subs->{'biblionumber'}, 'intra'); - my $branch = $itemresults[0]->{'holdingbranch'}; - my $const = 'o'; - my $notes; - my $title = $subs->{'bibliotitle'}; - for(my $i=0;$i<$routing;$i++){ - my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ?"); - $sth->execute($biblio,$routinglist[$i]->{'borrowernumber'}); - my $data = $sth->fetchrow_hashref; - -# warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}"; - if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){ - ModReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch); - } else { - AddReserve($branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},$notes,$title); } - } - - + ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl", += get_template_and_user({template_name => "serials/routing-preview-slip.tt", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); - $template->param("libraryname"=>C4::Context->preference("LibraryName")); + $template->param("libraryname"=>$branchname); } else { ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "serials/routing-preview.tmpl", += get_template_and_user({template_name => "serials/routing-preview.tt", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); -} +} -# my $firstdate = "$serials[0]->{'serialseq'} ($serials[0]->{'planneddate'})"; -my @results; -my $data; -for(my $i=0;$i<$routing;$i++){ - $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber'); - $data->{'location'}=$data->{'branchcode'}; - $data->{'name'}="$data->{'firstname'} $data->{'surname'}"; - $data->{'routingid'}=$routinglist[$i]->{'routingid'}; - $data->{'subscriptionid'}=$subscriptionid; - push(@results, $data); +my $memberloop = []; +for my $routing (@routinglist) { + my $member = GetMember( borrowernumber => $routing->{borrowernumber} ); + $member->{name} = "$member->{firstname} $member->{surname}"; + push @{$memberloop}, $member; } my $routingnotes = $serials[0]->{'routingnotes'}; $routingnotes =~ s/\n/\
/g; - + $template->param( title => $subs->{'bibliotitle'}, issue => $issue, + issue_escaped => URI::Escape::uri_escape_utf8($issue), subscriptionid => $subscriptionid, - memberloop => \@results, + memberloop => $memberloop, routingnotes => $routingnotes, + generalroutingnote => C4::Context->preference('RoutingListNote'), + hasRouting => check_routing($subscriptionid), + (uc(C4::Context->preference("marcflavour"))) => 1 ); - output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output;