From e0d4eee48f2af2d12194a9363abd38672805b499 Mon Sep 17 00:00:00 2001 From: oleonard Date: Wed, 25 Feb 2004 18:09:29 +0000 Subject: [PATCH] Small changes to help fix Bug 436 --- circ/circulation.pl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index b67a318a10..bfaa343e06 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -87,7 +87,7 @@ if ($findborrower) { my @borrowers=@$borrowers; if ($#borrowers == -1) { $query->param('findborrower', ''); - $message = "No borrower matched '$findborrower'"; + $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); $query->param('barcode',''); @@ -229,18 +229,18 @@ if ($borrower) { } my $tcolor = ''; my $pcolor = ''; + my $od = ''; 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; -# FIXME - Instead of declaring the font color here, can we set a variable -# that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { - $dd="$dd\n"; + $od = 'true'; + $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; if ($book->{'author'} eq ''){ @@ -263,13 +263,15 @@ if ($borrower) { my $datedue = $book->{'date_due'}; $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { -# FIXME - See line 233 above regarding overdues - $dd="$dd\n"; + $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 ''){ $book->{'author'}=' '; -- 2.39.5