X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=ed58f1c448e0f5f56d78ef5a9983b21f647819de;hb=217d0df5175b4fbd907b747d3f29bf0a1d6d2c2b;hp=d4ecf659f7db75a36842080d78b0d6f5c6a104a1;hpb=b1102502aa51ab3384cdfa94faf1237ce8208299;p=koha.git diff --git a/members/readingrec.pl b/members/readingrec.pl index d4ecf659f7..ed58f1c448 100755 --- a/members/readingrec.pl +++ b/members/readingrec.pl @@ -7,32 +7,33 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Output; use C4::Members; -use C4::Branch; use List::MoreUtils qw/any uniq/; - -use C4::Dates qw/format_date/; +use Koha::DateUtils; use C4::Members::Attributes qw(GetBorrowerAttributes); +use Koha::Patron::Images; + +use Koha::Patron::Categories; my $input = CGI->new; @@ -41,7 +42,7 @@ 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.tt", query => $input, type => "intranet", authnotrequired => 0, @@ -49,6 +50,7 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => debug => 1, }); +my $op = $input->param('op') || ''; if ($input->param('cardnumber')) { $cardnumber = $input->param('cardnumber'); $data = GetMember(cardnumber => $cardnumber); @@ -61,52 +63,42 @@ if ($input->param('borrowernumber')) { my $order = 'date_due desc'; my $limit = 0; -my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit); - -my @loop_reading; -my @barcodes; -my $today = C4::Dates->new(); -$today = $today->output("iso"); - -foreach my $issue (@{$issues}){ - my %line; - $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); - if (($input->param('op') eq 'export_barcodes') and ($today eq $issue->{'returndate'})) { - push( @barcodes, $issue->{'barcode'} ); - } +my $issues = (); +# Do not request the old issues of anonymous patron +if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){ + # use of 'eq' in the above comparison is intentional -- the + # system preference value could be blank + $template->param( is_anonymous => 1 ); +} else { + $issues = GetAllIssues($borrowernumber,$order,$limit); } -if ($input->param('op') eq 'export_barcodes') { - my $borrowercardnumber = GetMember( borrowernumber => $borrowernumber )->{'cardnumber'} ; - my $delimiter = "\n"; - binmode( STDOUT, ":encoding(UTF-8)"); - print $input->header( - -type => 'application/octet-stream', - -charset => 'utf-8', - -attachment => "$today-$borrowercardnumber-checkinexport.txt" - ); - my $content = join($delimiter, uniq(@barcodes)); - print $content; - exit; +# barcode export +if ( $op eq 'export_barcodes' ) { + if ( $data->{'privacy'} < 2) { + my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); + my @barcodes = + map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues}; + my $borrowercardnumber = + GetMember( borrowernumber => $borrowernumber )->{'cardnumber'}; + my $delimiter = "\n"; + binmode( STDOUT, ":encoding(UTF-8)" ); + print $input->header( + -type => 'application/octet-stream', + -charset => 'utf-8', + -attachment => "$today-$borrowercardnumber-checkinexport.txt" + ); + + my $content = join $delimiter, uniq(@barcodes); + print $content; + exit; + } } 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; + my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']}); + $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1; + $template->param( 'catcode' => $patron_categories->next ) if $patron_categories->count == 1; } $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); @@ -114,8 +106,8 @@ if (! $limit){ $limit = 'full'; } -my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); -$template->param( picture => 1 ) if $picture; +my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); +$template->param( picture => 1 ) if $patron_image; if (C4::Context->preference('ExtendedPatronAttributes')) { my $attributes = GetBorrowerAttributes($borrowernumber); @@ -125,37 +117,18 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } +$template->param(%$data); + $template->param( - readingrecordview => 1, - biblionumber => $data->{'biblionumber'}, - title => $data->{'title'}, - initials => $data->{'initials'}, - surname => $data->{'surname'}, - othernames => $data->{'othernames'}, - 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'}, - state => $data->{'state'}, - zipcode => $data->{'zipcode'}, - country => $data->{'country'}, - phone => $data->{'phone'}, - email => $data->{'email'}, - branchcode => $data->{'branchcode'}, - is_child => ($data->{'category_type'} eq 'C'), - branchname => GetBranchName($data->{'branchcode'}), - showfulllink => (scalar @loop_reading > 50), - loop_reading => \@loop_reading, - activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), + readingrecordview => 1, + borrowernumber => $borrowernumber, + privacy => $data->{'privacy'}, + categoryname => $data->{description}, + is_child => ( $data->{category_type} eq 'C' ), + loop_reading => $issues, + activeBorrowerRelationship => + ( C4::Context->preference('borrowerRelationship') ne '' ), + RoutingSerials => C4::Context->preference('RoutingSerials'), ); output_html_with_http_headers $input, $cookie, $template->output; - -