Bug 32021: Don't show 'appear in position' for Pages

[srvgit] / opac / opac-ics.pl

diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl
index c4da67e..ba1f6c6 100755 (executable)
--- a/opac/opac-ics.pl
+++ b/opac/opac-ics.pl
@@ -19,8 +19,7 @@
 
 # This script builds an ICalendar file (rfc 2445) for use in programs such as Ical
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use Data::ICal;
@@ -30,33 +29,31 @@ use DateTime::Format::ICal;
 use DateTime::Event::ICal;
 use URI;
 
-use C4::Auth;
-use C4::Koha;
-use C4::Circulation;
-use C4::Members;
-use Koha::DateUtils;
+use C4::Auth qw( get_template_and_user );
+use Koha::DateUtils qw( dt_from_string );
 
-my $query = new CGI;
+my $query = CGI->new;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-ics.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
 # Create Calendar
 my $calendar = Data::ICal->new();
 
-# get issued items ....
-my $issues = GetPendingIssues($borrowernumber);
+my $patron = Koha::Patrons->find( $borrowernumber );
+my $pending_checkouts = $patron->pending_checkouts;
 
-foreach my $issue ( @$issues ) {
+my $timestamp = dt_from_string(undef,undef,"UTC"); #Get current time in UTC
+
+while ( my $c = $pending_checkouts->next ) {
+    my $issue = $c->unblessed_all_relateds;
     my $vevent = Data::ICal::Entry::Event->new();
-    my $timestamp = DateTime->now(); # Defaults to UTC
     # Send some values to the template to generate summary and description
+    $issue->{overdue} = $c->is_overdue;
     $template->param(
         overdue => $issue->{'overdue'},
         title   => $issue->{'title'},
@@ -64,13 +61,15 @@ foreach my $issue ( @$issues ) {
     );
     # Catch the result of the template and split on newline
     my ($summary,$description) = split /\n/, $template->output;
-    my $datestart;
+    my ( $datestart, $datestart_local );
     if ($issue->{'overdue'} && $issue->{'overdue'} == 1) {
         # Not much use adding an event in the past for a book that is overdue
         # so we set datestart = now
-        $datestart = $timestamp;
+        $datestart = $timestamp->clone();
+        $datestart_local = $datestart->clone();
     } else {
         $datestart = dt_from_string($issue->{'date_due'});
+        $datestart_local = $datestart->clone();
         $datestart->set_time_zone('UTC');
     }
     # Create a UID that includes the issue number and the domain
@@ -84,11 +83,24 @@ foreach my $issue ( @$issues ) {
     }
     my $uid = 'issue-' . $issue->{'issue_id'} . '@' . $domain;
     # Create the event
+
+    my $dtstart;
+    if ($issue->{'overdue'} && $issue->{'overdue'} == 1) {
+        # It's already overdue so make it due as an all day event today
+        $dtstart = [ $datestart->ymd(q{}), { VALUE => 'DATE' } ];
+    } elsif ( $datestart_local->hour eq '23' && $datestart_local->minute eq '59' ) {
+        # Checkouts due at 23:59 are "all day events"
+        $dtstart = [ $datestart->ymd(q{}), { VALUE => 'DATE' } ];
+    }
+    else { # Checkouts due any other time are instantaneous events at the date and time due
+        $dtstart = DateTime::Format::ICal->format_datetime($datestart);
+    }
+
     $vevent->add_properties(
         summary     => $summary,
         description => $description,
         dtstamp     => DateTime::Format::ICal->format_datetime($timestamp),
-        dtstart     => DateTime::Format::ICal->format_datetime($datestart),
+        dtstart     => $dtstart,
         uid         => $uid,
     );
     # Add it to the calendar