Bugfixes & improvements (various and minor) :

[koha.git] / opac / opac-readingrecord.pl

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index c2cfa40..9d4f0b1 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -1,56 +1,108 @@
 #!/usr/bin/perl
+
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+# $Id$
+
 use strict;
 require Exporter;
 use CGI;
 
 use C4::Auth;
 use C4::Koha;
-use C4::Circulation::Circ2;
-use C4::Search;
-use HTML::Template;
-use C4::Interface::CGI::Output;
+use C4::Circulation;
+use C4::Date;
+use C4::Members;
+
+use C4::Output;
 
 my $query = new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "opac-readingrecord.tmpl",
-                            query => $query,
-                            type => "opac",
-                            authnotrequired => 0,
-                            flagsrequired => {borrow => 1},
-                            debug => 1,
-                            });
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-readingrecord.tmpl",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+        debug           => 1,
+    }
+);
 
 # get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
+my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
 
 $template->param($borr);
 
 # get the record
-my $order=$query->param('order');
-my $order2=$order;
-if ($order2 eq ''){
-  $order2="date_due desc";
+my $order  = $query->param('order');
+my $order2 = $order;
+if ( $order2 eq '' ) {
+    $order2 = "date_due desc";
+    $template->param( orderbydate => 1 );
 }
-my $limit=$query->param('limit');
-if ($limit eq 'full'){
-  $limit=0;
-} else {
-  $limit=50;
+
+if ( $order2 eq 'title' ) {
+    $template->param( orderbytitle => 1 );
 }
-my ($count,$issues)=allissues($borrowernumber,$order2,$limit);
 
-# add the row parity
-my $num = 0;
-foreach my $row (@$issues) {
-    $row->{'even'} = 1 if $num % 2 == 0;
-    $row->{'odd'} = 1 if $num % 2 == 1;
-    $num++;
+if ( $order2 eq 'author' ) {
+    $template->param( orderbyauthor => 1 );
 }
 
-$template->param(count => $count);
-$template->param(READING_RECORD => $issues);
+my $limit = $query->param('limit');
+if ( $limit eq 'full' ) {
+    $limit = 0;
+}
+else {
+    $limit = 50;
+}
+my ( $count, $issues ) = GetAllIssues( $borrowernumber, $order2, $limit );
+
+# add the row parity
+#my $num = 0;
+#foreach my $row (@$issues) {
+#    $row->{'even'} = 1 if $num % 2 == 0;
+#    $row->{'odd'} = 1 if $num % 2 == 1;
+#    $num++;
+#}
+
+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{date_due}       = format_date( $issues->[$i]->{'date_due'} );
+    $line{returndate}     = format_date( $issues->[$i]->{'returndate'} );
+    $line{volumeddesc}    = $issues->[$i]->{'volumeddesc'};
+    $line{counter}        = $i + 1;
+    push( @loop_reading, \%line );
+}
 
+$template->param(
+    count          => $count,
+    READING_RECORD => \@loop_reading,
+    limit          => $limit,
+    showfulllink   => ( $count > 50 ),
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;