[Koha-cvs] CVS: koha/circ circulation.pl,1.64.2.3,1.64.2.4

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_0
        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.64.2.3
retrieving revision 1.64.2.4
diff -C2 -r1.64.2.3 -r1.64.2.4
*** circulation.pl      28 Jan 2004 21:50:17 -0000      1.64.2.3
--- circulation.pl      25 Feb 2004 17:51:09 -0000      1.64.2.4
***************
*** 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 ''){