[Koha-cvs] CVS: koha/circ circulation.pl,1.53,1.54

[Chris Cormack]

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

Modified Files:
	circulation.pl 
Log Message:
Shifted the todays issues and previous issues html out into the template
And fixed a bug that was causing the enter a borrowers card or surname box
to show. Even if you were currently issuing to a borrower


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** circulation.pl	8 May 2003 13:04:15 -0000	1.53
--- circulation.pl	30 May 2003 20:37:09 -0000	1.54
***************
*** 202,205 ****
--- 202,207 ----
  my $todaysissues='';
  my $previssues='';
+ my @realtodayissues;
+ my @realprevissues;
  if ($borrower) {
      my @todaysissues;
***************
*** 226,237 ****
  	}
  	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$todaysissues .=<< "EOF";
! <tr><td bgcolor=$tcolor align=center>$dd</td>
! <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$book->{'title'}</td>
! <td bgcolor=$tcolor>$book->{'author'}</td>
! <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
! EOF
      }
      # FIXME - For small and private libraries, it'd be nice if this
--- 228,234 ----
  	}
  	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$book->{'dd'}=$dd;
! 	$book->{'tcolor'}=$tcolor;
! 	push @realtodayissues,$book
      }
      # FIXME - For small and private libraries, it'd be nice if this
***************
*** 239,242 ****
--- 236,243 ----
      # don't have to remember the book's bar code and type it in on the
      # "Returns" page.
+     
+     # This is in the template now, so its possible for a small library to make that link in their
+     # template
+     
      foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
  	my $dd = $book->{'date_due'};
***************
*** 248,259 ****
  	}
  	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	$previssues .= << "EOF";
! <tr><td bgcolor=$pcolor align=center>$dd</td>
! <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$book->{'title'}</td>
! <td bgcolor=$pcolor>$book->{'author'}</td>
! <td bgcolor=$pcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
! EOF
      }
  }
--- 249,255 ----
  	}
  	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	$book->{'dd'}=$dd;
! 	$book->{'tcolor'}=$pcolor;
! 	push @realprevissues,$book
      }
  }
***************
*** 324,329 ****
  		CHARGES => $flags->{'CHARGES'},
  		amountold => $amountold,
! 		todayissues => $todaysissues,
! 		previssues => $previssues,
  	);
  
--- 320,325 ----
  		CHARGES => $flags->{'CHARGES'},
  		amountold => $amountold,
! 		todayissues => \@realtodayissues,
! 		previssues => \@realprevissues,
  	);