[Koha-cvs] CVS: koha/circ circulation.pl,1.85,1.86

[Owen Leonard]

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

Modified Files:
	circulation.pl 
Log Message:
Synch with rel_2_2: Fixing section that was supposed to allow for alternating table row colors

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** circulation.pl	4 May 2005 08:52:12 -0000	1.85
--- circulation.pl	19 Jul 2005 18:52:37 -0000	1.86
***************
*** 196,199 ****
--- 196,200 ----
      }
  	my $od; # overdues
+ 	my $i = 0;
  	my $togglecolor;
  	# parses today & build Template array
***************
*** 208,226 ****
  			$od=0;
  		}
! 		$book->{'od'}=$od;
! 		$book->{'dd'}=$dd;
! 		$book->{'tcolor'}=$togglecolor;
! 		if ($togglecolor) {
  			$togglecolor=0;
  		} else {
  			$togglecolor=1;
  		}
  		if ($book->{'author'} eq ''){
  			$book->{'author'}=' ';
  		}    
  		push @realtodayissues,$book;
  	}
  
  	# parses previous & build Template array
      foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
  		my $dd = $book->{'date_due'};
--- 209,229 ----
  			$od=0;
  		}
! 		if ($i%2) {
  			$togglecolor=0;
  		} else {
  			$togglecolor=1;
  		}
+ 		$book->{'togglecolor'} = $togglecolor;
+ 		$book->{'od'}=$od;
+ 		$book->{'dd'}=$dd;
  		if ($book->{'author'} eq ''){
  			$book->{'author'}=' ';
  		}    
  		push @realtodayissues,$book;
+ 		$i++;
  	}
  
  	# parses previous & build Template array
+ 	$i = 0;
      foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
  		my $dd = $book->{'date_due'};
***************
*** 235,251 ****
  			$od = 0;
  		}
! 		$book->{'tcolor'}=$togglecolor;
! 		if ($togglecolor) {
  			$togglecolor=0;
  		} else {
  			$togglecolor=1;
  		}
  		$book->{'dd'}=$dd; 
  		$book->{'od'}=$od;
- 		$book->{'tcolor'}=$pcolor;
  		if ($book->{'author'} eq ''){
  			$book->{'author'}=' ';
  		}    
! 		push @realprevissues,$book
  	}
  }
--- 238,254 ----
  			$od = 0;
  		}
! 		if ($i%2) {
  			$togglecolor=0;
  		} else {
  			$togglecolor=1;
  		}
+ 		$book->{'togglecolor'} = $togglecolor;
  		$book->{'dd'}=$dd; 
  		$book->{'od'}=$od;
  		if ($book->{'author'} eq ''){
  			$book->{'author'}=' ';
  		}    
! 		push @realprevissues,$book;
! 		$i++;
  	}
  }