From 02196feed91af4dad35808c88d770e096c36d3e6 Mon Sep 17 00:00:00 2001
From: rangi <rangi>
Date: Fri, 30 May 2003 20:37:09 +0000
Subject: [PATCH] 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

---
 circ/circulation.pl                           | 32 ++++++++-----------
 .../default/en/circ/circulation.tmpl          | 24 ++++++++++++--
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 65240f51a4..e04728743f 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -201,6 +201,8 @@ my $selected='';
 # make the issued books table.....
 my $todaysissues='';
 my $previssues='';
+my @realtodayissues;
+my @realprevissues;
 if ($borrower) {
     my @todaysissues;
     my @previousissues;
@@ -225,19 +227,18 @@ if ($borrower) {
 	    $dd="<font color=red>$dd</font>\n";
 	}
 	($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
+	$book->{'dd'}=$dd;
+	$book->{'tcolor'}=$tcolor;
+	push @realtodayissues,$book
     }
     # FIXME - For small and private libraries, it'd be nice if this
     # table included a "Return" link next to each book, so that you
     # 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'};
 	my $datedue = $book->{'date_due'};
@@ -247,14 +248,9 @@ EOF
 	    $dd="<font color=red>$dd</font>\n";
 	}
 	($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
+	$book->{'dd'}=$dd;
+	$book->{'tcolor'}=$pcolor;
+	push @realprevissues,$book
     }
 }
 
@@ -323,8 +319,8 @@ $template->param(
 		flaginfotable => $flaginfotable,
 		CHARGES => $flags->{'CHARGES'},
 		amountold => $amountold,
-		todayissues => $todaysissues,
-		previssues => $previssues,
+		todayissues => \@realtodayissues,
+		previssues => \@realprevissues,
 	);
 
 if ($branchcookie) {
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
index 6d5c2be230..7b67371184 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
@@ -141,6 +141,9 @@
 		</tr>
 	</table>
 <TMPL_ELSE>
+    <TMPL_IF NAME="borrowernumber">
+    
+    <TMPL_ELSE>
 	<form method=post action=/cgi-bin/koha/circ/circulation.pl>
 	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
 		<tr>
@@ -157,8 +160,10 @@
 		</tr>
 	</table>
 	</form>
+     </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF name="borrowernumber">
+        
 	<TMPL_VAR name="patrontable">
 	<TMPL_VAR name="flaginfotable">
 </TMPL_IF>
@@ -229,7 +234,14 @@
 	<tr>
 		<th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th>
 	</tr>
-	<TMPL_VAR name="todayissues">
+	<TMPL_LOOP name="todayissues">
+	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
+	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640)"><TMPL_VAR NAME="barcode"></a></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dewey"> <TMPL_VAR NAME="subclass"></td></tr>
+	</TMPL_LOOP>
 </table>
 </TMPL_IF>
 
@@ -244,7 +256,15 @@
 		<tr>
 			<th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th>
 		</tr>
-		<TMPL_VAR name="previssues">
+	<TMPL_LOOP name="previssues">
+	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
+	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640)"><TMPL_VAR NAME="barcode"></a></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
+	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dewey"> <TMPL_VAR NAME="subclass"></td></tr>
+	</TMPL_LOOP>
+
 	</table>
 </TMPL_IF>
 
-- 
2.39.5