Bug 5549 : GetPendingIssues now returns DateTime objects

[koha.git] / members / readingrec.pl

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 04414e3..05ade6a 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -29,7 +29,8 @@ use C4::Auth;
 use C4::Output;
 use C4::Members;
 use C4::Branch;
-use List::MoreUtils qw/any/;
+use List::MoreUtils qw/any uniq/;
+use Koha::DateUtils;
 
 use C4::Dates qw/format_date/;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
@@ -64,6 +65,9 @@ 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;
@@ -72,7 +76,8 @@ foreach my $issue (@{$issues}){
        $line{title}           = $issue->{'title'};
        $line{author}          = $issue->{'author'};
        $line{classification}  = $issue->{'classification'} || $issue->{'itemcallnumber'};
-       $line{date_due}        = format_date($issue->{'date_due'});
+    my $dt = dt_from_string($issue->{date_due}, 'sql');
+       $line{date_due}        = output_pref($dt);
        $line{returndate}      = format_date($issue->{'returndate'});
        $line{issuedate}       = format_date($issue->{'issuedate'});
        $line{issuingbranch}   = GetBranchName($issue->{'branchcode'});
@@ -80,6 +85,23 @@ foreach my $issue (@{$issues}){
        $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'} );
+    }
+}
+
+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;
 }
 
 if ( $data->{'category_type'} eq 'C') {
@@ -96,7 +118,14 @@ if (! $limit){
 
 my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
 $template->param( picture => 1 ) if $picture;
-my $attributes = GetBorrowerAttributes($borrowernumber);
+
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
 
 $template->param(
                                                readingrecordview => 1,
@@ -104,6 +133,7 @@ $template->param(
                                                title => $data->{'title'},
                                                initials => $data->{'initials'},
                                                surname => $data->{'surname'},
+                                               othernames => $data->{'othernames'},
                                                borrowernumber => $borrowernumber,
                                                limit => $limit,
                                                firstname => $data->{'firstname'},
@@ -125,7 +155,7 @@ $template->param(
                                                branchname => GetBranchName($data->{'branchcode'}),
                                                showfulllink => (scalar @loop_reading > 50),                                    
                                                loop_reading => \@loop_reading,
-                                           extendedattributes => $attributes,
+                                               activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
 );
 output_html_with_http_headers $input, $cookie, $template->output;