From rangi@users.sourceforge.net Tue Mar 27 18:23:07 2001 From: Chris Cormack To: koha-devel@lists.koha-community.org Subject: [Koha-devel] CVS: koha/circ circulation.pl,1.15,1.16 Date: Tue, 27 Mar 2001 18:23:06 -0800 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8482393725741137973==" --===============8482393725741137973== 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-serv3526/circ Modified Files: circulation.pl=20 Log Message: Reworked layout of issues section.=20 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.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.pl 2001/03/22 22:20:29 1.15 --- circulation.pl 2001/03/28 02:23:03 1.16 *************** *** 12,18 **** my $circbackgroundcolor=3D'#ffffcc'; my $circbackgroundcolor=3D'white'; ! my $linecolor1=3D'#bbbbbb'; ! my $linecolor2=3D'#dddddd'; ! my $backgroundimage=3D"/koha/images/background-mem.gif"; my $query=3Dnew CGI; my $branches=3Dgetbranches(\%env); --- 12,18 ---- 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); *************** *** 76,104 **** =20 =20 - print << "EOF"; -
-

- - - - - - - - - - -
$branchname - - - Branch/Printer - - - $printername
-=20 =20 -
- EOF -=20 =20 if ($printer && $branch) { --- 76,80 ---- *************** *** 113,116 **** --- 89,93 ---- if ($printercount>1) { $printerform=3D<<"EOF"; +=20 *************** *** 142,145 **** --- 119,123 ---- } print << "EOF"; +
Select a branch and a printer
*************** *** 444,450 **** } unless ($noheader) { ! print << "EOF"; !
Choose a Printer
Circulation - Issues =20 !
EOF } --- 422,433 ---- } unless ($noheader) { ! print < ! ! Next Borrower || ! Returns

! =20 ! =20 !

EOF } *************** *** 676,687 **** my ($patrontable, $flaginfotable) =3D patrontable($borrower); print << "EOF"; ! ! !
! !
Enter Book Barcode
!
Item Barcode:
--- 659,675 ---- my ($patrontable, $flaginfotable) =3D patrontable($borrower); print << "EOF"; + $patrontable + $flaginfotable + Issues    
Branch: $branch, + Printer: $= printer

+

! !
! !
Enter Book Barcode
!
Item Barcode:
*************** *** 695,705 ****
-
Sticky Due Date
!
! --- 683,690 ----

Sticky Due Date
! *************** *** 707,721 **** 		! $patrontable !
! Next borrower<= /a> !
! $flaginfotable !
! Class --- 692,706 ---- !=20 !=20 !
Issues Today
Due DateBar CodeTitleAuthor
!
! =20 !

! ! \n"; } else { ! $flaginfotext.=3D"\n";=20 } } else { ! $flaginfotext.=3D"\n"; } } } ! ($flaginfotext) && ($flaginfotext=3D"$flagi= nfotext
! =20 Class *************** *** 724,730 **** \n"; } } $itemswaiting.=3D"
Issues Today
Due DateBar CodeTitleAuthor
! Class --- 709,716 ---- +=20 $flags->{$flag}->{'message'}
Overdue items can be seen i= n the Previous Issues table below\n"; } else { ! $flaginfotext.=3D"$flags->{$flag}->{'message'}\n"; } } else { ! $flaginfotext.=3D"\n"; } } } ! ($flaginfotext) && ($flaginfotext=3D"
Previous Issues
Due DateBar CodeTitleAuthor
! Class *************** *** 806,816 **** if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.=3D"\n"; } else { ! $flaginfotext.=3D"= \n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.=3D"\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=3D''; --- 792,802 ---- if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.=3D"\n"; } else { ! $flaginfotext.=3D"\n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.=3D"\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=3D''; *************** *** 820,824 **** $itemswaiting.=3D"{'biblionumber'}&type=3Dintra onClick=3D\"openWindow(this, 'Item', 480= , 640)\">$iteminformation->{'barcode'} $iteminformation->{'title'} ($bran= ches->{$iteminformation->{'holdingbranch'}}->{'branchname'})
\n"; } ! $flaginfotext.=3D"\n"; } elsif ($flag eq 'ODUES') { my $items=3D$flags->{$flag}->{'itemlist'}; --- 806,810 ---- $itemswaiting.=3D"{'biblionumber'}&type=3Dintra onClick=3D\"openWindow(this, 'Item', 480= , 640)\">$iteminformation->{'barcode'} $iteminformation->{'title'} ($bran= ches->{$iteminformation->{'holdingbranch'}}->{'branchname'})
\n"; } ! $flaginfotext.=3D"\n"; } elsif ($flag eq 'ODUES') { my $items=3D$flags->{$flag}->{'itemlist'}; *************** *** 830,862 **** ($color eq $linecolor1) ? ($color=3D$linecolor2) : ($color=3D$linecolor1= ); my ($iteminformation) =3D getiteminformation($env, $item->{'itemnumber'}= , 0); ! $itemswaiting.=3D"\n"; } } $itemswaiting.=3D"
Previous Issues
Due DateBar CodeTitleAuthor
$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick= =3D\"openWindow(this, 'Payment', 480,640)\">Payment
$flag$flags->{$flag}->{'message'}
$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick=3D\"openWindow(this, 'Payment', 4= 80,640)\">Payment
$flag$flags->{$flag}->{'message'} {'borrowernumber'} onClick=3D\"openWindow(thi= s, 'Payment', 480,640)\">Payment
$flag$flags->{$flag}->{'message'}
$flag{$flag}->{'m= essage'} {'borrowernumber'= } onClick=3D\"openWindow(this, 'Payment', 480,640)\">Payment
$flag$flags->{$flag}->{'message'}
$itemswaiting
$flag$itemswaiting
$iteminform= ation->{'date_due'}{'biblionumber'}&type=3Dintra onClick=3D\"op= enWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}$iteminformation->{'title'}
\n"; if ($query->param('module') ne 'returns'){ ! $flaginfotext.=3D"
$flag
$flag
$flag$flags->{$flag}->{'message'}
$flaginfotext
Patron Flags
\n"); my $patrontable=3D << "EOF"; ! ! ! !
= Patron Information
{'borrowernum= ber'} onClick=3D"openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber= '} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<= br> EOF if ($query->param('module') ne 'returns'){=20 ! $patrontable.=3D"$borrower->{'streetaddress'} $borrower->{'city'}
$borrower->{'categorycode'} "; } $patrontable.=3D<< "EOF"; ! $flagtext
EOF return($patrontable, $flaginfotext); --- 816,849 ---- ($color eq $linecolor1) ? ($color=3D$linecolor2) : ($color=3D$linecolor1= ); my ($iteminformation) =3D getiteminformation($env, $item->{'itemnumber'}= , 0); ! $itemswaiting.=3D"
$iteminformation->{'date_due= '}{'biblionumber'}&type=3Dintra onClick=3D\"openWindow(this, 'I= tem', 480, 640)\">$iteminformation->{'barcode'}$iteminformation-= >{'title'}
\n"; if ($query->param('module') ne 'returns'){ ! $flaginfotext.=3D"
$flag$flags->{$flag}-= >{'message'}, See below
$flag$flags->{$flag}-= >{'message'}
$flag$flags->{$flag}->{'m= essage'}
Flags
\n"); my $patrontable=3D << "EOF"; ! ! ! !=20 EOF return($patrontable, $flaginfotext); --===============8482393725741137973==--
Patron Information
{'borrowernum= ber'} onClick=3D"openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber= '} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<= br> EOF if ($query->param('module') ne 'returns'){=20 ! $patrontable.=3D"$borrower->{'streetaddress'} $borrower->{'city'} Ca= t: $borrower->{'categorycode'} "; } $patrontable.=3D<< "EOF"; ! =20