X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=6107ef4a9017036cc087e0e1c7aacd8ff77402ed;hb=603ab05edf8172ff3de2d9b11117261e2e56c42d;hp=677d985b6a2828d054313a35b169881c457304ff;hpb=58d425cf7bee9fbb834b6d658600e92b7fe99a0e;p=koha.git

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 677d985b6a..6107ef4a90 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -25,6 +25,7 @@ use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Members;
+use C4::Branch;
 
 use C4::Dates qw/format_date/;
 my $input=new CGI;
@@ -42,7 +43,7 @@ my $limit=$input->param('limit');
 
 if ($limit){
     if ($limit eq 'full'){
-	$limit=0;
+		$limit=0;
     }
 } 
 else {
@@ -63,24 +64,35 @@ my @loop_reading;
 
 for (my $i=0;$i<$count;$i++){
  	my %line;
-	if($i%2){
-		$line{'toggle'} = 1;
-	}
 	$line{biblionumber}=$issues->[$i]->{'biblionumber'};
 	$line{title}=$issues->[$i]->{'title'};
 	$line{author}=$issues->[$i]->{'author'};
-	$line{classification} = $issues->[$i]->{'classification'};
+	$line{classification} = $issues->[$i]->{'classification'} || $issues->[$i]->{'itemcallnumber'};
 	$line{date_due}=format_date($issues->[$i]->{'date_due'});
 	$line{returndate}=format_date($issues->[$i]->{'returndate'});
+	$line{renewals}=$issues->[$i]->{'renewals'};
+	$line{barcode}=$issues->[$i]->{'barcode'};
 	$line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
 	push(@loop_reading,\%line);
 }
 
-	my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
-	my $category_type = $borrowercategory->{'category_type'};
-	( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+if ( $data->{'category_type'} eq 'C') {
+    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+    my $cnt = scalar(@$catcodes);
+    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+if (! $limit){ 
+	$limit = 'full'; 
+}
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
 
 $template->param(
+						readingrecordview => 1,
 						biblionumber => $data->{'biblionumber'},
 						title => $data->{'title'},
 						initials => $data->{'initials'},
@@ -91,7 +103,8 @@ $template->param(
 						cardnumber => $data->{'cardnumber'},
 					    categorycode => $data->{'categorycode'},
 					    category_type => $data->{'category_type'},
-					    category_description => $data->{'description'},
+					   # category_description => $data->{'description'},
+					    categoryname	=> $data->{'description'},
 					    address => $data->{'address'},
 						address2 => $data->{'address2'},
 					    city => $data->{'city'},
@@ -99,6 +112,8 @@ $template->param(
 						phone => $data->{'phone'},
 						email => $data->{'email'},
 			   			branchcode => $data->{'branchcode'},
+			   			is_child        => ($data->{'category_type'} eq 'C'),
+			   			branchname => GetBranchName($data->{'branchcode'}),
 						showfulllink => ($count > 50),					
 						loop_reading => \@loop_reading);
 output_html_with_http_headers $input, $cookie, $template->output;