[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.p
|
From: |
Chris Cormack |
|
Subject: |
[Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.pl,NONE,1.3.2.1 branchtransfers.pl,1.3.2.1,1.3.2.2 circulation.pl,1.23.2.3,1.23.2.4 |
|
Date: |
Wed, 14 Aug 2002 17:46:28 -0700 |
Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1318/circ
Modified Files:
Tag: rel-1-2
branchtransfers.pl circulation.pl
Added Files:
Tag: rel-1-2
returns.pl selectbranchprinter.pl
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing.
--- NEW FILE ---
#!/usr/bin/perl
#written 11/3/2002 by Finlay
#script to execute returns of books
# Copyright 2000-2002 Katipo Communications
#
# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
use strict;
use CGI;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
use C4::Print;
use C4::Reserves2;
my %env;
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";
my $query=new CGI;
my $branches = getbranches();
my $printers = getprinters(\%env);
my $branch = $query->param("branch");
my $printer = $query->param("printer");
($branch) || ($branch=$query->cookie('branch')) ;
($printer) || ($printer=$query->cookie('printer')) ;
#
# Some code to handle the error if there is no branch or printer setting.....
#
$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;
# Set up the item stack ....
my $ritext = '';
my %returneditems;
my %riduedate;
my %riborrowernumber;
foreach ($query->param) {
(next) unless (/ri-(\d*)/);
my $counter=$1;
(next) if ($counter>20);
my $barcode=$query->param("ri-$counter");
my $duedate=$query->param("dd-$counter");
my $borrowernumber=$query->param("bn-$counter");
$counter++;
# decode cuecat
$barcode = cuecatbarcodedecode($barcode);
$returneditems{$counter}=$barcode;
$riduedate{$counter}=$duedate;
$riborrowernumber{$counter}=$borrowernumber;
$ritext.="<input type=hidden name=ri-$counter value=$barcode>\n";
$ritext.="<input type=hidden name=dd-$counter value=$duedate>\n";
$ritext.="<input type=hidden name=bn-$counter value=$borrowernumber>\n";
}
# Collect a few messages here...
my $messagetext='';
my $reservetext='';
############
# Deal with the requests....
if ($query->param('resbarcode')) {
my $item = $query->param('itemnumber');
my $borrnum = $query->param('borrowernumber');
my $resbarcode = $query->param('resbarcode');
my $tobranchcd = ReserveWaiting($item, $borrnum);
my $branchname = $branches->{$tobranchcd}->{'branchname'};
my ($borr) = getpatroninformation(\%env, $borrnum, 0);
my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
my $number = "<a
href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'}
onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
my $slip = $query->param('resslip');
printslip(\%env, $slip);
if ($tobranchcd ne $branch) {
my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd,
$resbarcode, 1);
$reservetext .= <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
Item: $iteminfo->{'title'} ($iteminfo->{'author'})<br>
needs to be transfered to <b>$branchname</b> <br>
to be picked up by $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
}
}
my $iteminformation;
my $borrower;
my $returned = 0;
my $messages;
my $barcode = $query->param('barcode');
# actually return book and prepare item table.....
if ($barcode) {
# decode cuecat
$barcode = cuecatbarcodedecode($barcode);
($returned, $messages, $iteminformation, $borrower) = returnbook($barcode,
$branch);
$returneditems{0} = $barcode;
$ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
if ($returned) {
$riborrowernumber{0} = $borrower->{'borrowernumber'};
$riduedate{0} = $iteminformation->{'date_due'};
$ritext.= "<input type=hidden name=dd-0
value=$iteminformation->{'date_due'}>\n";
$ritext.= "<input type=hidden name=bn-0
value=$borrower->{'borrowernumber'}>\n";
} else {
$riborrowernumber{0} = 0;
$riduedate{0} = 0;
$ritext.= "<input type=hidden name=dd-0 value=0>\n";
$ritext.= "<input type=hidden name=bn-0 value=0>\n";
}
}
##################################################################################
# HTML code....
# title....
my $title = <<"EOF";
<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>
<b>Branch:</b> $branches->{$branch}->{'branchname'}  
<b>Printer:</b> $printers->{$printer}->{'printername'}<br>
<a href=selectbranchprinter.pl>Change Settings</a>
<input type=hidden name=branch value=$branch>
<input type=hidden name=printer value=$printer>
<p>
EOF
my $links = <<"EOF";
<table align="right"><tr><td>
<a href=circulation.pl>
<img src="/images/button-issues.gif" width="99" height="42" border="0"
alt="Issues"></a>
 <a href=branchtransfers.pl>
<img src="/images/button-transfers.gif" width="127" height="42" border="0"
alt="Issues"></a>
</td></tr></table>
EOF
my $itemtable;
if ($iteminformation) {
$itemtable = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Item Information</font></th></tr>
<tr><td>
Title: $iteminformation->{'title'}<br>
<!--Hlt decided they dont want these showing, uncoment the html to make it work
Author: $iteminformation->{'author'}<br>
Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
&type=intra onClick="openWindow(this, 'Item', 480,
640)">$iteminformation->{'barcode'}</a><br>
Date Due: $iteminformation->{'date_due'}-->
</td></tr>
</table>
EOF
}
# Barcode entry box, with hidden inputs attached....
my $barcodeentrytext = << "EOF";
<form method=post action=/cgi-bin/koha/circ/returns.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center
background=$backgroundimage>
<font color=black><b>Enter Book Barcode</b></font></td></tr>
<tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
</table>
$ritext
</form>
EOF
if ($messages->{'ResFound'}) {
my $res = $messages->{'ResFound'};
my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
my $number = "<a
href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'}
onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
my ($iteminfo) = getiteminformation(\%env, 0, $barcode);
if ($res->{'ResFound'} eq "Waiting") {
$reservetext = <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
is marked waiting at <b>$branchname</b> for $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
}
if ($res->{'ResFound'} eq "Reserved") {
my @da = localtime(time());
my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d",
($da[4]+1))."/".($da[5]+1900);
my $slip = <<"EOF";
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Date: $todaysdate;
ITEM RESERVED:
$iteminfo->{'title'} ($iteminfo->{'author'})
barcode: $iteminfo->{'barcode'}
itemtype: $iteminfo->{'itemtype'}
COLLECT AT: $branchname
BORROWER:
$borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
card number: $borr->{'cardnumber'}
Phone: $borr->{'phone'}
$borr->{'streetaddress'}
$borr->{'suburb'}
$borr->{'town'}
$borr->{'emailaddress'}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
EOF
$reservetext = <<"EOF";
<font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'}
($iteminfo->{'author'}) <br>
for $name ($number) to be collected at <b>$branchname</b>.
<table cellpadding=5 cellspacing=0>
<tr><td valign="top">Change status to waiting and print
<a href="" onClick='alert(document.forms[0].resslip.value); return
false'>slip</a>?: </td>
<td valign="top">
<form method=post action='returns.pl'>
$ritext
<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
<input type=hidden name=resbarcode value=$barcode>
<input type=hidden name=resslip value="$slip">
<input type=submit value="Print">
</form>
</td></tr>
</table>
EOF
}
}
my $reservefoundtext;
if ($reservetext) {
$reservefoundtext = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor
background=$backgroundimage><font>Reserve Found</font></th></tr>
<tr><td> $reservetext </td></tr></table>
EOF
}
# collect the messages and put into message table....
foreach my $code (keys %$messages) {
warn $code;
if ($code eq 'BadBarcode'){
$messagetext .= "<font color='red' size='+2'> No Item with barcode:
$messages->{'BadBarcode'} </font> <br>";
}
if ($code eq 'NotIssued'){
my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
$messagetext .= "<font color='red' size='+2'> Item not on issue.
</font> <br>";
}
if ($code eq 'WasLost'){
$messagetext .= "<font color='red' size='+2'> Item was lost, now found.
</font> <br>";
}
if ($code eq 'wthdrawm'){
$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font>
<br>";
}
if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
if ($messages->{'IsPermanent'} ne $branch) {
$messagetext .= "<font color='red' size='+2'> Please return to
$branches->{$messages->{'IsPermanent'}}->{'branchname'} </font> <br>";
}
}
}
$messagetext = substr($messagetext, 0, -4);
my $messagetable;
if ($messagetext) {
$messagetable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor
background=$backgroundimage><font>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
EOF
}
# patrontable ....
my $borrowertable;
my $flaginfotable;
if ($borrower) {
$borrowertable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black><b>Borrower Information</b></font></td></tr>
<tr><td colspan=2>
<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'}
onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
$borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
</td></tr>
EOF
my $flags = $borrower->{'flags'};
my $flaginfotext='';
my $color = '';
foreach my $flag (sort keys %$flags) {
($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
if ($flags->{$flag}->{'noissues'}) {
$flag = "<font color=red>$flag</font>";
}
if ($flag eq 'CHARGES') {
$flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color><b>$flags->{$flag}->{'message'}</b>
<a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'}
onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
EOF
} elsif ($flag eq 'WAITING') {
my $itemswaiting='';
my $items = $flags->{$flag}->{'itemlist'};
foreach my $item (@$items) {
my ($iteminformation) = getiteminformation(\%env,
$item->{'itemnumber'}, 0);
$itemswaiting .= <<"EOF";
<a
href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a>
$iteminformation->{'title'}
($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
EOF
}
$flaginfotext.="<tr><td
valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
} elsif ($flag eq 'ODUES') {
my $itemsoverdue = '';
my $items = $flags->{$flag}->{'itemlist'};
foreach my $item (sort {$a->{'date_due'} cmp $b->{'date_due'}}
@$items) {
my ($iteminformation) = getiteminformation(\%env,
$item->{'itemnumber'}, 0);
$itemsoverdue .= <<"EOF";
<font color=red>$item->{'date_due'}</font>
<a
href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a>
$iteminformation->{'title'}
<br>
EOF
}
$flaginfotext .= "<tr><td
valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
} else {
$flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
EOF
}
}
if ($flaginfotext) {
$borrowertable .= << "EOF";
<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
<b>Flags</b></td></tr>
$flaginfotext
EOF
}
$borrowertable .= "</table>";
}
# the returned items.....
my $returneditemstable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Items</font></th></tr>
<tr><th>Due Date</th><th>Bar
Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
EOF
my $color='';
#set up so only the lat 8 returned items display (make for faster loading pages)
my $count=0;
foreach (sort {$a <=> $b} keys %returneditems) {
if ($count < 8) {
($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
my $barcode = $returneditems{$_};
my $duedate = $riduedate{$_};
my $overduetext;
if ($duedate) {
my @tempdate = split ( /-/ , $duedate ) ;
my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
my @datearr = localtime(time());
my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d",
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
$overduetext = "$duedatenz";
($overduetext="<font color=red>$duedate</font>") if ($duedate lt
$todaysdate);
($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
} else {
$overduetext = "Not on loan.";
}
my $borrowernumber = $riborrowernumber{$_};
my $borrowerinfo;
if ($borrowernumber) {
my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
my $borrowerinfo = "<a
href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'}
onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a>
$borrower->{'firstname'} $borrower->{'surname'}";
} else {
$borrowerinfo = "Not on loan.";
}
my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
$returneditemstable .= << "EOF";
<tr><td bgcolor=$color>$overduetext</td>
<td bgcolor=$color align=center>
<a
href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra
onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td>
<td bgcolor=$color>$iteminformation->{'title'}</td>
<td bgcolor=$color>$iteminformation->{'author'}</td>
<td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
<td bgcolor=$color>
$borrowerinfo</td></tr>
EOF
} else {
last;
}
$count++;
}
$returneditemstable .= "</table>\n";
# actually print the page!
print $query->header();
print startpage();
print startmenu('circulation');
print <<"EOF";
$links
$title
<table cellpadding=5 cellspacing=0 width=100%>
EOF
if ($reservefoundtext) {
print <<"EOF";
<tr>
<td colspan=2>$reservefoundtext</td>
</tr>
<tr>
<td colspan=2>$messagetable</td>
</tr>
EOF
} else {
print <<"EOF";
<tr>
<td valign=top align=left>$barcodeentrytext</td>
<td valign=top align=left>$messagetable</td>
</tr>
EOF
}
if ($returned) {
print <<"EOF";
<tr>
<td valign=top align=left>$itemtable</td>
<td valign=top align=left>$borrowertable</td>
<tr>
EOF
}
if (%returneditems) {
print "<tr><td colspan=2>$returneditemstable</td></tr>";
}
print "</table>";
print endmenu('circulation');
print endpage();
sub cuecatbarcodedecode {
my ($barcode) = @_;
chomp($barcode);
my @fields = split(/\./,$barcode);
my @results = map(decode($_), @fields[1..$#fields]);
if ($#results == 2){
return $results[2];
} else {
return $barcode;
}
}
--- NEW FILE ---
#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
#
# 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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
use strict;
use CGI qw/:standard/;
use C4::Circulation::Circ2;
use C4::Output;
use C4::Print;
use DBI;
# this is a reorganisation of circulationold.pl
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....
#general design stuff...
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";
# try to get the branch and printer settings from the http....
my %env;
my $query=new CGI;
my $branches=getbranches(\%env);
my $printers=getprinters(\%env);
my $branch=$query->param('branch');
my $printer=$query->param('printer');
($branch) || ($branch=$query->cookie('branch'));
($printer) || ($printer=$query->cookie('printer'));
# is you force a selection....
my $oldbranch = $branch;
my $oldprinter = $printer;
$branch='';
$printer='';
$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;
# set up select options....
my $branchcount=0;
my $printercount=0;
my $branchoptions;
my $printeroptions;
foreach (keys %$branches) {
(next) unless ($_);
(next) unless ($branches->{$_}->{'IS'});
$branchcount++;
my $selected='';
($selected='selected') if ($_ eq $oldbranch);
$branchoptions.="<option value=$_
$selected>$branches->{$_}->{'branchname'}\n";
}
foreach (keys %$printers) {
(next) unless ($_);
$printercount++;
my $selected='';
($selected='selected') if ($_ eq $oldprinter);
$printeroptions.="<option value=$_
$selected>$printers->{$_}->{'printername'}\n";
}
# if there is only one....
if ($printercount==1) {
($printer)=keys %$printers;
}
if ($branchcount==1) {
($branch)=keys %$branches;
}
# set up printer and branch selection forms....
my ($printerform, $branchform);
if ($printercount>1) {
$printerform=<<"EOF";
<select name=printer> $printeroptions </select>
EOF
} else {
my ($printer) = keys %$printers;
}
if ($branchcount>1) {
$branchform=<<"EOF";
<select name=branch> $branchoptions </select>
EOF
} else {
my ($branch) = keys %$branches;
}
#############################################################################################
# Start writing page....
# set header with cookie....
print $query->header();
print startpage();
print startmenu('circulation');
print << "EOF";
<FONT SIZE=6><em>Circulation: Select Printer and Branch Settings</em></FONT><br>
<center>
<form method=post action=/cgi-bin/koha/circ/circulation.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center
background=$backgroundimage>
<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
<tr><td>
$branchform
</td>
<td>
$printerform
</td></tr>
</table>
<input type="hidden" name="setcookies" value=1>
<input type="submit" value="Submit" type="changesettings">
</form>
</center>
EOF
print endmenu('circulation');
print endpage();
Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** branchtransfers.pl 14 Aug 2002 18:30:51 -0000 1.3.2.1
--- branchtransfers.pl 15 Aug 2002 00:46:26 -0000 1.3.2.2
***************
*** 25,31 ****
use CGI;
use C4::Circulation::Circ2;
- use C4::Search;
use C4::Output;
my %env;
--- 25,33 ----
use CGI;
use C4::Circulation::Circ2;
use C4::Output;
+ use C4::Reserves2;
+ ###############################################
+ # constants
my %env;
***************
*** 37,60 ****
my $backgroundimage="/images/background-mem.gif";
my $query=new CGI;
- my $branches=getbranches(\%env);
- my $tobranchcd=$query->param('tobranchcd');
- my $frbranchcd='';
! $env{'tobranchcd'}=$tobranchcd;
my $tobranchoptions;
! foreach (keys %$branches) {
! (next) unless ($_);
! (next) if (/^TR$/);
! my $selected='';
! ($selected='selected') if ($_ eq $tobranchcd);
! $tobranchoptions.="<option value=$_
$selected>$branches->{$_}->{'branchname'}\n";
}
# collect the stack of books already transfered so they can printed...
- my @messages;
my %transfereditems;
my $ritext = '';
--- 39,75 ----
my $backgroundimage="/images/background-mem.gif";
+ my $branches = getbranches();
+ my $printers = getprinters(\%env);
+
+
+ ###############################################
+ # Getting state
+
my $query=new CGI;
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
+ ($branch) || ($branch=$query->cookie('branch')) ;
+ ($printer) || ($printer=$query->cookie('printer')) ;
+
+ my $request=$query->param('request');
+
+
+ my $tobranchcd=$query->param('tobranchcd');
+ my $frbranchcd='';
+
+ # set up the branchselect options....
my $tobranchoptions;
! foreach my $br (keys %$branches) {
! (next) unless $branches->{$br}->{'CU'};
! my $selected='';
! ($selected='selected') if ($br eq $tobranchcd);
! $tobranchoptions.="<option value=$br
$selected>$branches->{$br}->{'branchname'}\n";
}
# collect the stack of books already transfered so they can printed...
my %transfereditems;
my $ritext = '';
***************
*** 76,112 ****
}
- #if the barcode has been entered action that and write a message and onto the
top of the stack...
- my $iteminformation;
! my $todaysdate;
! if (my $barcode=$query->param('barcode')) {
! my $iteminformation = getiteminformation(\%env,0, $barcode);
! my $fail=0;
! if (not $iteminformation) {
! $fail=1;
! @messages = ("There is no book with barcode: $barcode ", @messages);
! }
! $frbranchcd = $iteminformation->{'holdingbranch'};
! %env->{'frbranchcd'} = $frbranchcd;
! if ($frbranchcd eq $tobranchcd) {
! $fail=1;
! @messages = ("You can't transfer the book to the branch it is already
at!", @messages);
! }
! # should add some more tests ... like is the book already out, maybe it cant
be moved....
! if (not $fail) {
! my ($transfered, $message) = transferbook(\%env, $iteminformation,
$barcode);
! if (not $transfered) address@hidden = ($message, @messages);}
! else {
! $ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! $ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! $ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! $transfereditems{0}=$barcode;
! $frbranchcds{0}=$frbranchcd;
! $tobranchcds{0}=$tobranchcd;
! @messages = ("Book: $barcode has been transfered", @messages);
! }
}
}
my $entrytext= << "EOF";
<form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
--- 91,151 ----
}
! # Collect a few messages here...
! my $messagetext='';
!
! ############
! # Deal with the requests....
! if ($request eq "KillWaiting") {
! my $item = $query->param('itemnumber');
! my $borrnum = $query->param('borrowernumber');
! CancelReserve(0, $item, $borrnum);
! $messagetext .= "Reserve Cancelled<br>";
! }
! my $ignoreRs = 0;
! if ($request eq "SetWaiting") {
! my $item = $query->param('itemnumber');
! my $borrnum = $query->param('borrowernumber');
! $tobranchcd = ReserveWaiting($item, $borrnum);
! $ignoreRs = 1;
! $messagetext .= "Item should now be waiting at branch:
$branches->{$tobranchcd}->{'branchname'}<br>";
! }
! if ($request eq 'KillReserved'){
! my $biblio = $query->param('biblionumber');
! my $borrnum = $query->param('borrowernumber');
! CancelReserve($biblio, 0, $borrnum);
! $messagetext .= "Reserve Cancelled<br>";
! }
!
!
!
!
! # Warnings etc that get displayed at top of next page....
! my $messages;
! # if the barcode has been entered action that and write a message
! # and put onto the top of the stack...
! my $iteminformation;
! my $barcode = $query->param('barcode');
! if ($barcode) {
! my $transfered;
! my $iteminformation;
! ($transfered, $messages, $iteminformation)
! = transferbook($tobranchcd, $barcode, $ignoreRs);
! if ($transfered) {
! my $frbranchcd = $iteminformation->{'holdingbranch'};
! $ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! $ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! $ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! $transfereditems{0}=$barcode;
! $frbranchcds{0}=$frbranchcd;
! $tobranchcds{0}=$tobranchcd;
}
}
+
+
#################################################################################
+ # Html code....
+ # collect together the various elements...
+
my $entrytext= << "EOF";
<form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
***************
*** 129,160 ****
EOF
! my $messagetable;
! if (@messages) {
! my $messagetext='';
! foreach (@messages) {
! $messagetext.="$_<p>\n";
}
$messagetable = << "EOF";
! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font
color=black>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
EOF
}
!
print $query->header;
print startpage;
! print startmenu('circulation');
! print "<FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>";
!
!
! print $messagetable if (@messages);
! print $entrytext;
! if (%transfereditems) {
! print << "EOF";
<p>
<table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
--- 168,336 ----
EOF
!
!
! #####################
!
! my $reservefoundtext;
! if ($messages->{'ResFound'}) {
! my $res = $messages->{'ResFound'};
! my $reservetext;
! my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
! my $name = $borr->{'surname'}." ".$borr->{'title'}."
".$borr->{'firstname'};
! my $number = "<a
href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'}
onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
! if ($res->{'ResFound'} eq "Waiting") {
! $reservetext = <<"EOF";
! <font color='red' size='+2'>Item marked Waiting:</font><br>
! Item is marked waiting at $branchname for $name ($number).<br>
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillWaiting'>
! <input type=submit value="Cancel">
! </form>
! </td></tr>
! <tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
! }
! if ($res->{'ResFound'} eq "Reserved") {
! $reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved:</font> reserve found for $name
($number).
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Set reserve to waiting and transfer book to <b>$branchname </b>: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='SetWaiting'>
! <input type=submit value="Waiting">
! </form>
! </td></tr>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=biblionumber value=$res->{'biblionumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillReserved'>
! <input type=submit value="Cancel">
! </form>
! </td></tr><tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! $ritext
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
}
+ $reservefoundtext = <<"EOF";
+ <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
+ <tr><th bgcolor=$headerbackgroundcolor
background=$backgroundimage><font>Reserve Found</font></th></tr>
+ <tr><td> $reservetext </td></tr></table>
+ EOF
+ }
+
+ #####################
+
+ foreach my $code (keys %$messages) {
+ if ($code eq 'BadBarcode'){
+ $messagetext .= "<font color='red' size='+2'> No Item with barcode:
$messages->{'BadBarcode'} </font> <br>";
+ }
+ if ($code eq 'IsPermanent'){
+ my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
+ $messagetext .= "<font color='red' size='+2'> Please return item to
home branch: $braname </font> <br>";
+ }
+ if ($code eq 'DestinationEqualsHolding'){
+ $messagetext .= "<font color='red' size='+2'> Item is already at
destination branch. </font> <br>";
+ }
+ if ($code eq 'WasReturned') {
+ my ($borrowerinfo) = getpatroninformation(\%env,
$messages->{'WasReturned'}, 0);
+
+ my $binfo = <<"EOF";
+ <a href=/cgi-bin/koha/moremember.pl?bornum=$borrowerinfo->{'borrowernumber'}
+ onClick="openWindow(this,'Member', 480,
640)">$borrowerinfo->{'cardnumber'}</a>
+ $borrowerinfo->{'surname'}, $borrowerinfo->{'title'}
$borrowerinfo->{'firstname'}
+ EOF
+ $messagetext .= "Item was on loan to $binfo and has been returned.
<br>";
+ }
+ if ($code eq 'WasTransfered'){
+ # Put code here if you want to notify the user that item was transfered...
+ }
+ }
+ $messagetext = substr($messagetext, 0, -4);
+
+ my $messagetable;
+ if ($messagetext) {
$messagetable = << "EOF";
! <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor
background=$backgroundimage><font>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
+ <img src="/images/holder.gif" width=24 height=24>
EOF
}
!
#######################################################################################
! # Make the page .....
print $query->header;
print startpage;
! #print startmenu('circulation');
! my @inp=startmenu('circulation');
! my address@hidden;
! for (my $i=0;$i<$count;$i++){
! $inp[$i]=~
s/document.forms\[0\].elements\[0\]/document\.forms\[0\]\.elements\[1\]/;
! }
! print @inp;
+ #foreach my $key (%$messages) {
+ # print $key." : ".$messages->{$key}."<br>";
+ #}
+
+ print <<"EOF";
+ <table align=right><tr><td>
+ <a href=circulation.pl>
+ <img src="/images/button-issues.gif" width="99" height="42" border="0"
alt="Next Borrower"></a>  
+ <a href=returns.pl>
+ <img src="/images/button-returns.gif" width="110" height="42" border="0"
alt="Returns"></a>
+ </td></tr></table>
+
+ <FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
+ <b>Branch:</b> $branches->{$branch}->{'branchname'}  
+ <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
+ <a href=selectbranchprinter.pl>Change Settings</a>
+ <input type=hidden name=branch value=$branch>
+ <input type=hidden name=printer value=$printer>
+ <p>
+ EOF
! if ($reservefoundtext) {
! print $reservefoundtext;
! } else {
! print $messagetable;
! print $entrytext;
! if (%transfereditems) {
! print << "EOF";
<p>
<table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
***************
*** 162,173 ****
<tr><th>Bar
Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
EOF
! my $color='';
! foreach (keys %transfereditems) {
! ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! my $barcode=$transfereditems{$_};
! my $frbcd=$frbranchcds{$_};
! my $tobcd=$tobranchcds{$_};
! my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! print << "EOF";
<tr><td bgcolor=$color align=center>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
--- 338,349 ----
<tr><th>Bar
Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
EOF
! my $color='';
! foreach (sort keys %transfereditems) {
! ($color eq $linecolor1) ? ($color=$linecolor2) :
($color=$linecolor1);
! my $barcode=$transfereditems{$_};
! my $frbcd=$frbranchcds{$_};
! my $tobcd=$tobranchcds{$_};
! my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! print << "EOF";
<tr><td bgcolor=$color align=center>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
***************
*** 180,188 ****
</tr>\n
EOF
! }
! print "</table>\n";
}
print endmenu('circulation');
print endpage;
--- 356,366 ----
</tr>\n
EOF
! }
! print "</table>\n";
! }
}
print endmenu('circulation');
print endpage;
+
Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -r1.23.2.3 -r1.23.2.4
*** circulation.pl 14 Aug 2002 18:30:51 -0000 1.23.2.3
--- circulation.pl 15 Aug 2002 00:46:26 -0000 1.23.2.4
***************
*** 1,4 ****
--- 1,7 ----
#!/usr/bin/perl
+ #written 8/5/2002 by Finlay
+ #script to execute issuing of books
+
# Copyright 2000-2002 Katipo Communications
***************
*** 19,24 ****
[...1514 lines suppressed...]
+ foreach (sort keys %$borrowerissues) {
+ $issues[$i]=$borrowerissues->{$_};
+ my $dd=$issues[$i]->{'date_due'};
+ #convert to nz style dates
+ #this should be set with some kinda config variable
+ my @tempdate=split(/-/,$dd);
+ $issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ $i++;
+ }
+ foreach (sort keys %$borroweriss2) {
+ $issues[$i]=$borroweriss2->{$_};
+ my $dd=$issues[$i]->{'date_due'};
+ #convert to nz style dates
+ #this should be set with some kinda config variable
+ my @tempdate=split(/-/,$dd);
+ $issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ $i++;
+ }
+ remoteprint($env,address@hidden,$borrower);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.pl,NONE,1.3.2.1 branchtransfers.pl,1.3.2.1,1.3.2.2 circulation.pl,1.23.2.3,1.23.2.4,
Chris Cormack <=