From finlayt@users.sourceforge.net Wed Mar 13 17:04:05 2002
From: Finlay Thompson <finlayt@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject:
 [Koha-devel] CVS: koha/circ circulation2.pl,NONE,1.1 circulation.pl,1.21,1.22
Date: Wed, 13 Mar 2002 17:05:02 +0000
Message-ID: <E16lJf0-0002k0-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6320465059662434530=="

--===============6320465059662434530==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv10323

Modified Files:
	circulation.pl=20
Added Files:
	circulation2.pl=20
Log Message:
This is the begining of a process of dividing up circulation.pl

This script deals with the branch and printer selection stuff



--- NEW FILE ---
#!/usr/bin/perl

use strict;
use CGI qw/:standard/;
use C4::Circulation::Circ2;
use C4::Output;
use C4::Print;
use DBI;


# this is a reorganisation of circulation.pl=20
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....

my %env;
my $headerbackgroundcolor=3D'#99cc33';
my $circbackgroundcolor=3D'#ffffcc';
my $circbackgroundcolor=3D'white';
my $linecolor1=3D'#ffffcc';
my $linecolor2=3D'white';
my $backgroundimage=3D"/images/background-mem.gif";

my $query=3Dnew CGI;
my $branches=3Dgetbranches(\%env);
my $printers=3Dgetprinters(\%env);
my $branch=3D$query->param('branch');
my $printer=3D$query->param('printer');

($branch) || ($branch=3D$query->cookie('branch'));
($printer) || ($printer=3D$query->cookie('printer'));

my $oldbranch;
my $oldprinter;
if ($query->param('selectnewbranchprinter')) {
    $oldbranch=3D$branch;
    $oldprinter=3D$printer;
    $branch=3D'';
    $printer=3D'';
}

$env{'branchcode'}=3D$branch;
$env{'printer'}=3D$printer;
$env{'queue'}=3D$printer;

# set up select options....
my $branchcount=3D0;
my $printercount=3D0;
my $branchoptions;
my $printeroptions;
foreach (keys %$branches) {
    (next) unless ($_);
    (next) if (/^TR$/);
    $branchcount++;
    my $selected=3D'';
    ($selected=3D'selected') if ($_ eq $oldbranch);
    $branchoptions.=3D"<option value=3D$_ $selected>$branches->{$_}->{'branch=
name'}\n";
}
foreach (keys %$printers) {
    (next) unless ($_);
    $printercount++;
    my $selected=3D'';
    ($selected=3D'selected') if ($_ eq $oldprinter);
    $printeroptions.=3D"<option value=3D$_ $selected>$printers->{$_}->{'print=
ername'}\n";
}

# if there is only one....

if ($printercount=3D=3D1) {
    ($printer)=3Dkeys %$printers;
}
if ($branchcount=3D=3D1) {
    ($branch)=3Dkeys %$branches;
}

my $branchcookie=3D$query->cookie(-name=3D>'branch', -value=3D>"$branch", -ex=
pires=3D>'+1y');
my $printercookie=3D$query->cookie(-name=3D>'printer', -value=3D>"$printer", =
-expires=3D>'+1y');


my ($printerform, $branchform);
if ($printercount>1) {
    $printerform=3D<<"EOF";
<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D'#dddddd' >
<tr><td><select name=3Dprinter> $printeroptions </select></td></tr>
</table>
<input type=3Dhidden name=3Dbranch value=3D$printer>
EOF
} else {
    my ($printer) =3D keys %$printers;
    $printerform=3D<<"EOF";
<input type=3Dhidden name=3Dprinter value=3D$printer>
EOF
}=20

if ($branchcount>1) {
    $branchform=3D<<"EOF";
<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D'#dddddd' >
<tr><td> <select name=3Dbranch> $branchoptions </select> </td></tr>
</table>
<input type=3Dhidden name=3Dbranch value=3D$branch>
EOF
} else {
    my ($branch) =3D keys %$branches;
    $branchform=3D<<"EOF";
<input type=3Dhidden name=3Dprinter value=3D$printer>
EOF
}=20


# set header with cookie....
print $query->header(-type=3D>'text/html',-expires=3D>'now', -cookie=3D>[$bra=
nchcookie,$printercookie]);


print startpage();
print startmenu('circulation');

if ($branch and $printer) {
    print << "EOF";
<p align=3Dright>
<FONT SIZE=3D2  face=3D"arial, helvetica">
<a href=3Dcirculation.pl?module=3Dissues&branch=3D$branch&printer=3D$printer&=
print>Next Borrower</a> ||
<a href=3Dcirculation.pl?module=3Dreturns&branch=3D$branch&printer=3D$printer=
>Returns</a> ||
<a href=3Dbranchtransfers.pl>Transfer Book</a></font>
<input type=3Dhidden name=3Dmodule value=3Dissues>
<input type=3Dhidden name=3Dbranch value=3D$branch>
<input type=3Dhidden name=3Dprinter value=3D$printer>
<input type=3Dhidden name=3Dbarcode value=3D" ">
</p>

<table align=3Dleft border=3D0 cellpadding=3D5 cellspacing=3D0 >
<tr><td colspan=3D2 bgcolor=3D$headerbackgroundcolor align=3Dcenter backgroun=
d=3D$backgroundimage>
<font color=3Dblack><b>Branch and Printer Settings<b></font>
</td></tr>
<tr><td>
<b>Branch:</b> $branches->{$branch}->{'branchname'} </td><td><b>Printer:</b>$=
printers->{$printer}->{'printername'}=20
</td></tr>
<tr><td colspace=3D2>
<a href=3Dcirculation2.pl?selectnewbranchprinter=3D1>Select new branch and pr=
inter</a>
</td></tr>
</table>

<img src=3D"/images/holder.gif" width=3D24 height=3D50 align=3Dleft>

<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D'#dddddd' align=
=3Dright>
<form method=3Dget>
<tr><th bgcolor=3D$headerbackgroundcolor background=3D$backgroundimage><font =
color=3Dblack>
<b>Enter borrower card number<br> or partial last name</b></font>
</td></tr>
<tr><td><input name=3Dfindborrower></td></tr>
</form>
</table>



EOF
} else {
    print << "EOF";
<form method=3Dpost action=3D/cgi-bin/koha/circ/circulation2.pl>
<table border=3D0 cellpadding=3D5 cellspacing=3D0>
<tr><td colspan=3D2 bgcolor=3D$headerbackgroundcolor align=3Dcenter backgroun=
d=3D$backgroundimage>
<font color=3Dblack><b>Please Set Branch and Printer</b></font></td></tr>
<tr><td>
$branchform
</td>
<td>
$printerform
</td></tr>
</table>
<input type=3D"submit" value=3D"Change Settings" type=3D"changesettings">
</form>


EOF
}

print endmenu('circulation');
print endpage();


Index: circulation.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** circulation.pl	12 Mar 2002 21:04:32 -0000	1.21
--- circulation.pl	14 Mar 2002 01:04:00 -0000	1.22
***************
*** 154,157 ****
--- 154,158 ----
  print endmenu('circulation');
  print endpage();
+=20
  sub default {
  print << "EOF";



--===============6320465059662434530==--