[Koha-cvs] CVS: koha/circ circulation.pl,1.67,1.68

[Owen Leonard]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17014/circ

Modified Files:
	circulation.pl 
Log Message:
Small changes to help fix Bug 436

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** circulation.pl	11 Feb 2004 08:42:02 -0000	1.67
--- circulation.pl	25 Feb 2004 18:09:29 -0000	1.68
***************
*** 88,92 ****
  	if ($#borrowers == -1) {
  		$query->param('findborrower', '');
! 		$message =  "No borrower matched '$findborrower'";
  	} elsif ($#borrowers == 0) {
  		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
--- 88,92 ----
  	if ($#borrowers == -1) {
  		$query->param('findborrower', '');
! 		$message =  "'$findborrower'";
  	} elsif ($#borrowers == 0) {
  		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
***************
*** 230,233 ****
--- 230,234 ----
  	my $tcolor = '';
  	my $pcolor = '';
+ 	my $od = '';
  	foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
  		my $dd = $book->{'date_due'};
***************
*** 235,245 ****
  		$dd=format_date($dd);
  		$datedue=~s/-//g;
- # FIXME - Instead of declaring the font color here, can we set a variable 
- # that says 'overdue'?  Then the template can check for it: <TMPL_IF
- # NAME="overdue"><font color="red"></TMPL_IF>
  		if ($datedue < $todaysdate) {
! 			$dd="<font color=red>$dd</font>\n";
  		}
  		($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
  		$book->{'dd'}=$dd;
  		$book->{'tcolor'}=$tcolor;
--- 236,245 ----
  		$dd=format_date($dd);
  		$datedue=~s/-//g;
  		if ($datedue < $todaysdate) {
! 			$od = 'true';
! 			$dd="$dd\n";
  		}
  		($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
+ 		$book->{'od'}=$od;
  		$book->{'dd'}=$dd;
  		$book->{'tcolor'}=$tcolor;
***************
*** 264,274 ****
  	$dd=format_date($dd);
  	my $pcolor = '';
  	$datedue=~s/-//g;
  	if ($datedue < $todaysdate) {
! # FIXME - See line 233 above regarding overdues
! 	    $dd="<font color=red>$dd</font>\n";
  	}
  	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); 
  	$book->{'dd'}=$dd; 
  	$book->{'tcolor'}=$pcolor;
  	if ($book->{'author'} eq ''){
--- 264,276 ----
  	$dd=format_date($dd);
  	my $pcolor = '';
+ 	my $od = '';
  	$datedue=~s/-//g;
  	if ($datedue < $todaysdate) {
! 		$od = 'true';
! 	    $dd="$dd\n";
  	}
  	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); 
  	$book->{'dd'}=$dd; 
+ 	$book->{'od'}=$od;
  	$book->{'tcolor'}=$pcolor;
  	if ($book->{'author'} eq ''){