ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-serial-issues.pl

diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index 8993d7f..b94935f 100755 (executable)
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -4,33 +4,30 @@
 #
 # 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., 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, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
-use C4::Dates;
 use C4::Serials;
 use C4::Letters;
 use C4::Output;
 use C4::Context;
 
-
 my $query      = new CGI;
 my $op         = $query->param('op');
 my $dbh        = C4::Context->dbh;
@@ -45,7 +42,7 @@ my $biblionumber = $query->param('biblionumber');
 if ( $selectview eq "full" ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-full-serial-issues.tmpl",
+            template_name   => "opac-full-serial-issues.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
@@ -54,23 +51,31 @@ if ( $selectview eq "full" ) {
     );
     my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
     my $subscriptioninformation=PrepareSerialsData($subscriptions);
+    # PrepareSerialsData does some bogus stuff that the template could handle
+    # But at least it sorts the array by the year field so we dont have to
+    # find 'manage' if its there
+    if ($subscriptioninformation->[0]->{year} eq 'manage') {
+        shift @{$subscriptioninformation};
+    }
+
     # now, check is there is an alert subscription for one of the subscriptions
-    foreach (@$subscriptions) {
-        if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
-            $_->{hasalert} = 1;
+    if ($loggedinuser) {
+        foreach (@$subscriptions) {
+            my $subscription = Koha::Subscriptions->find( $_->{subscriptionid} );
+            my $subscriber = $subscription->subscribers->find( $loggedinuser );
+            $_->{hasalert} = 1 if $subscriber;
         }
     }
 
-    my $title   = $subscriptions->[0]{bibliotitle};
-    my $yearmin = $subscriptions->[0]{year};
-    my $yearmax = $subscriptions->[ scalar(@$subscriptions) - 1 ]{year};
-
+    my $title   = $subscriptions->[0]->{bibliotitle};
+    my $yearmin = $subscriptions->[0]->{year};
+    my $yearmax = $subscriptions->[ -1 ]->{year};
 
     # replace CR by <br> in librarian note
     # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
 
     $template->param(
-        biblionumber   => $query->param('biblionumber'),
+        biblionumber   => scalar $query->param('biblionumber'),
         years          => $subscriptioninformation,
         yearmin        => $yearmin,
         yearmax        => $yearmax,
@@ -83,7 +88,7 @@ if ( $selectview eq "full" ) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-serial-issues.tmpl",
+            template_name   => "opac-serial-issues.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
@@ -93,19 +98,23 @@ else {
 
     my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
     # now, check is there is an alert subscription for one of the subscriptions
-    foreach (@$subscriptions) {
-        my $subscription = getalert($loggedinuser,'issue',$_->{subscriptionid});
-        if (@$subscription[0]) {
-            $_->{hasalert} = 1;
+    if ($loggedinuser) {
+        foreach (@$subscriptions) {
+            my $subscription = Koha::Subscriptions->find( $_->{subscriptionid} );
+            my $subscriber = $subscription->subscribers->find( $loggedinuser );
+            $_->{hasalert} = 1 if $subscriber;
         }
     }
 
     # replace CR by <br> in librarian note
     # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
 
+    my $title   = $subscriptions->[0]->{bibliotitle};
+
     $template->param(
-        biblionumber      => $query->param('biblionumber'),
+        biblionumber      => scalar $query->param('biblionumber'),
         subscription_LOOP => $subscriptions,
+        bibliotitle        => $title,
     );
 }
 output_html_with_http_headers $query, $cookie, $template->output;