[followup] (bug #4051) fix default values

[koha.git] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 3df24b8..6107ef4 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -23,17 +23,17 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
-use HTML::Template;
-use C4::Date;
+use C4::Branch;
+
+use C4::Dates qw/format_date/;
 my $input=new CGI;
 
 
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
 #get borrower details
-my $data=borrdata('',$bornum);
+my $data=GetMember($borrowernumber,'borrowernumber');
 my $order=$input->param('order');
 my $order2=$order;
 if ($order2 eq ''){
@@ -43,13 +43,13 @@ my $limit=$input->param('limit');
 
 if ($limit){
     if ($limit eq 'full'){
-       $limit=0;
+               $limit=0;
     }
 } 
 else {
   $limit=50;
 }
-my ($count,$issues)=allissues($bornum,$order2,$limit);
+my ($count,$issues)=GetAllIssues($borrowernumber,$order2,$limit);
 
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "members/readingrec.tmpl",
@@ -64,28 +64,56 @@ 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);
 }
 
+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'},
                                                surname => $data->{'surname'},
-                                               bornum => $bornum,
+                                               borrowernumber => $borrowernumber,
                                                limit => $limit,
                                                firstname => $data->{'firstname'},
                                                cardnumber => $data->{'cardnumber'},
+                                           categorycode => $data->{'categorycode'},
+                                           category_type => $data->{'category_type'},
+                                          # category_description => $data->{'description'},
+                                           categoryname        => $data->{'description'},
+                                           address => $data->{'address'},
+                                               address2 => $data->{'address2'},
+                                           city => $data->{'city'},
+                                               zipcode => $data->{'zipcode'},
+                                               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;