[Koha-cvs] CVS: koha/circ circulation.pl,1.57,1.58

[Paul POULAIN]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1:/tmp/cvs-serv5830/circ

Modified Files:
	circulation.pl 
Log Message:


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** circulation.pl	1 Jul 2003 11:22:48 -0000	1.57
--- circulation.pl	7 Jul 2003 14:46:55 -0000	1.58
***************
*** 219,232 ****
  	    push @previousissues, $issueslist->{$it};
  	}
!     }
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
! 	$dd=format_date($dd);
! 	$datedue=~s/-//g;
! 	if ($datedue < $todaysdate) {
! 	    $dd="<font color=red>$dd</font>\n";
  	}
  	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
--- 219,236 ----
  	    push @previousissues, $issueslist->{$it};
  	}
! 	my $tcolor = '';
! 	my $pcolor = '';
! 	foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
! 		my $dd = $book->{'date_due'};
! 		my $datedue = $book->{'date_due'};
! 		$dd=format_date($dd);
! 		$datedue=~s/-//g;
! 		if ($datedue < $todaysdate) {
! 			$dd="<font color=red>$dd</font>\n";
! 		}
! 		($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 		$book->{'dd'}=$dd;
! 		$book->{'tcolor'}=$tcolor;
! 		push @realtodayissues,$book;
  	}
  	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
***************
*** 251,259 ****
  	    $dd="<font color=red>$dd</font>\n";
  	}
- 	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
- 	$book->{'dd'}=$dd;
- 	$book->{'tcolor'}=$pcolor;
- 	push @realprevissues,$book
-     }
  }
  
--- 255,258 ----
***************
*** 324,329 ****
  		CHARGES => $flags->{'CHARGES'},
  		amountold => $amountold,
- 		todayissues => \@realtodayissues,
- 		previssues => \@realprevissues,
  	);
  
--- 323,326 ----