From 3b95557c6f0c1dfd468799bba815572cc46fcb26 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 7 Sep 2012 12:12:03 -0400 Subject: [PATCH] Bug 8598 - No patron image or home library on Files & Statistics tabs Adding the necessary code for patron image, patron home library, patron category description, and patron extended attributes to show in the left-hand sidebar. Signed-off-by: Melia Meggs Signed-off-by: Paul Poulain --- members/files.pl | 18 ++++++++++++++++++ members/statistics.pl | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/members/files.pl b/members/files.pl index f011c77899..84bc41edd4 100755 --- a/members/files.pl +++ b/members/files.pl @@ -23,8 +23,10 @@ use warnings; use CGI; use C4::Auth; +use C4::Branch; use C4::Output; use C4::Members; +use C4::Members::Attributes qw(GetBorrowerAttributes); use C4::Debug; use Koha::DateUtils; @@ -99,6 +101,22 @@ else { $bf->DelFile( id => $cgi->param('file_id') ); } + $template->param( + categoryname => $data->{'description'}, + branchname => GetBranchName($data->{'branchcode'}), + ); + + if (C4::Context->preference('ExtendedPatronAttributes')) { + my $attributes = GetBorrowerAttributes($borrowernumber); + $template->param( + ExtendedPatronAttributes => 1, + extendedattributes => $attributes + ); + } + + my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); + $template->param( picture => 1 ) if $picture; + $template->param( files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(), diff --git a/members/statistics.pl b/members/statistics.pl index 7125560f0e..d48cdde4cc 100755 --- a/members/statistics.pl +++ b/members/statistics.pl @@ -29,6 +29,7 @@ use C4::Branch; use C4::Context; use C4::Members; use C4::Members::Statistics; +use C4::Members::Attributes qw(GetBorrowerAttributes); use C4::Output; my $input = new CGI; @@ -56,7 +57,10 @@ if ( not defined $borrower ) { foreach my $key ( keys %$borrower ) { $template->param( $key => $borrower->{$key} ); } - +$template->param( + categoryname => $borrower->{'description'}, + branchname => GetBranchName($borrower->{'branchcode'}), +); # Construct column names my $fields = C4::Members::Statistics::get_fields(); our @statistic_column_names = split '\|', $fields; @@ -80,6 +84,17 @@ my $count_total_issues = $total->{count_total_issues_today} || 0; my $count_total_issues_returned = $total->{count_total_issues_returned_today} || 0; my $count_total_actual_state = ($count_total_precedent_state - $count_total_issues_returned + $count_total_issues); +if (C4::Context->preference('ExtendedPatronAttributes')) { + my $attributes = GetBorrowerAttributes($borrowernumber); + $template->param( + ExtendedPatronAttributes => 1, + extendedattributes => $attributes + ); +} + +my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; + $template->param( statisticsview => 1, datas => $datas, -- 2.39.5