X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=e7586a0debe4b020eb530538f064f046e1d59574;hb=306dc79217783ebd7896be64deee12491febc4d3;hp=3eac89c2770b5ef33bdac4b8d1fd8a8c7cef0212;hpb=7d758613cf2844d3c8658226302b34b24df3a5d8;p=koha_gimpoz

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 3eac89c277..e7586a0deb 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -16,42 +16,31 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+use warnings;
+
+use CGI;
+
 use C4::Auth;
 use C4::Output;
-use CGI;
 use C4::Members;
+use C4::Branch;
+use List::MoreUtils qw/any/;
 
 use C4::Dates qw/format_date/;
-my $input=new CGI;
 
+my $input = CGI->new;
 
-my $borrowernumber=$input->param('borrowernumber');
 #get borrower details
-my $data=GetMember($borrowernumber,'borrowernumber');
-my $order=$input->param('order');
-my $order2=$order;
-if ($order2 eq ''){
-  $order2="date_due desc";
-}
-my $limit=$input->param('limit');
-
-if ($limit){
-    if ($limit eq 'full'){
-		$limit=0;
-    }
-} 
-else {
-  $limit=50;
-}
-my ($count,$issues)=GetAllIssues($borrowernumber,$order2,$limit);
+my $data = undef;
+my $borrowernumber = undef;
+my $cardnumber = undef;
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/readingrec.tmpl",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
@@ -59,29 +48,54 @@ my ($template, $loggedinuser, $cookie)
 				debug => 1,
 				});
 
+if ($input->param('cardnumber')) {
+    $cardnumber = $input->param('cardnumber');
+    $data = GetMember(cardnumber => $cardnumber);
+    $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron
+}
+if ($input->param('borrowernumber')) {
+    $borrowernumber = $input->param('borrowernumber');
+    $data = GetMember(borrowernumber => $borrowernumber);
+}
+
+my $order = 'date_due desc';
+my $limit = 0;
+my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
+
 my @loop_reading;
 
-for (my $i=0;$i<$count;$i++){
+foreach my $issue (@{$issues}){
  	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{date_due}=format_date($issues->[$i]->{'date_due'});
-	$line{returndate}=format_date($issues->[$i]->{'returndate'});
-	$line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
+ 	$line{issuestimestamp} = format_date($issue->{'issuestimestamp'});
+	$line{biblionumber}    = $issue->{'biblionumber'};
+	$line{title}           = $issue->{'title'};
+	$line{author}          = $issue->{'author'};
+	$line{classification}  = $issue->{'classification'} || $issue->{'itemcallnumber'};
+	$line{date_due}        = format_date($issue->{'date_due'});
+	$line{returndate}      = format_date($issue->{'returndate'});
+	$line{issuedate}       = format_date($issue->{'issuedate'});
+	$line{issuingbranch}   = GetBranchName($issue->{'branchcode'});
+	$line{renewals}        = $issue->{'renewals'};
+	$line{barcode}         = $issue->{'barcode'};
+	$line{volumeddesc}     = $issue->{'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 (! $limit){ 
-	$limit = 'full'; 
+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'},
@@ -94,15 +108,20 @@ $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'},
+					    state => $data->{'state'},
 						zipcode => $data->{'zipcode'},
+						country => $data->{'country'},
 						phone => $data->{'phone'},
 						email => $data->{'email'},
 			   			branchcode => $data->{'branchcode'},
-						showfulllink => ($count > 50),					
+			   			is_child        => ($data->{'category_type'} eq 'C'),
+			   			branchname => GetBranchName($data->{'branchcode'}),
+						showfulllink => (scalar @loop_reading > 50),					
 						loop_reading => \@loop_reading);
 output_html_with_http_headers $input, $cookie, $template->output;