Merge lp:~kjtehprogrammer/maya/bug-1441262 into lp:~elementary-apps/maya/trunk

[KJ Lawrence]

Fixes recurring events

Updated my original commit of this bug for the recent changes to Maya.

Not quite sure what all I originally did. I believe I fixed the loops that were done to calculate the days recurring events would appear on.

[Corentin Noël (tintou)]

It's indeed a better way to calculate the repeating events

[Corentin Noël (tintou)]

review: Approve

=== modified file 'core/DateRange.vala'
--- core/DateRange.vala	2014-12-27 19:24:57 +0000
+++ core/DateRange.vala	2016-04-24 03:55:32 +0000
@@ -84,7 +84,6 @@
         }
 
         public DateRange (DateTime first, DateTime last) {
-            assert (first.compare(last)<=0);
             this.first = first;
             this.last = last;
         }

=== modified file 'core/Utils.vala'
--- core/Utils.vala	2016-01-18 23:25:24 +0000
+++ core/Utils.vala	2016-04-24 03:55:32 +0000
@@ -123,7 +123,7 @@
         if (end == null) end = start;
 
         // All days events are stored in UTC time and should only being shown at one day.
-        bool allday = is_the_all_day (start, end);
+        bool allday = is_all_day (start, end);
         if (allday) {
             end = end.add_days (-1);
             var interval = (new DateTime.now_local ()).get_utc_offset ();
@@ -131,8 +131,8 @@
             end = end.add (-interval);
         }
 
-        start = strip_time (start.to_timezone (new TimeZone.local ()));
-        end = strip_time (end.to_timezone (new TimeZone.local ()));
+        start = strip_time (start);
+        end = strip_time (end);
         dateranges.add (new Util.DateRange (start, end));
 
         // Search for recursive events.
@@ -255,10 +255,14 @@
                     }
                 } else {
                     int i = 1;
-                    int n = i*rrule.interval;
                     bool is_null_time = rrule.until.is_null_time () == 1;
-                    var start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]);
-                    int week_of_month = (int)GLib.Math.ceil ((double)start.get_day_of_month () / 7);
+                    bool is_last = (rrule.by_day[k] < 0);
+                    var start_ical_day = start;
+                    var end_ical_day = end;
+                    var days = end.get_day_of_month () - start.get_day_of_month ();
+                    int start_week = (int)GLib.Math.ceil ((double)start.get_day_of_month () / 7);
+
+                    // Loop through each individual month from the start and test to see if our event is in the month or not
                     while (view_range.last.compare (start_ical_day) > 0) {
                         if (is_null_time == false) {
                             if (start_ical_day.get_year () > rrule.until.year)
@@ -267,24 +271,37 @@
                                 break;
                             else if (start_ical_day.get_year () == rrule.until.year && start_ical_day.get_month () == rrule.until.month && start_ical_day.get_day_of_month () > rrule.until.day)
                                 break;
+                        }
+
+                        var start_ical_day_new = get_date_from_ical_day (start.add_months (i), rrule.by_day[k]);
+                        int month = start.add_months (i).get_month ();
+                        int week = start_week;
+                    
+                        // If event repeats on a last day of the month, take us back a week if we move into a new month
+                        if (is_last && start_ical_day_new.get_month () != month) {
+                            start_ical_day_new = start_ical_day_new.add_weeks (-1);
+                        }
                         
-                        }
-
-                        // Set it at the right weekday
-                        int interval = start_ical_day.get_day_of_month () - start.get_day_of_month ();
-                        var start_daterange_date = start_ical_day;
-                        var end_daterange_date = end.add_months (n).add_days (interval);
-                        var new_week_of_month = (int)GLib.Math.ceil ((double)start_daterange_date.get_day_of_month () / 7);
-                        // Set it at the right week
-                        if (week_of_month != new_week_of_month) {
-                            start_daterange_date = start_daterange_date.add_weeks (week_of_month - new_week_of_month);
-                            end_daterange_date = end_daterange_date.add_weeks (week_of_month - new_week_of_month);
-                        }
-
-                        dateranges.add (new Util.DateRange (start_daterange_date, end_daterange_date));
+                        else if (!is_last) {
+                            if (start_ical_day_new.get_day_of_month () <= 7 && start_ical_day_new.add_weeks (-1).get_month () == month) {
+                                week = 2;
+                            }
+                            else {
+                                week =  (int)GLib.Math.ceil ((double)start_ical_day_new.get_day_of_month () / 7);
+                            }
+                        }
+                       
+                        start_ical_day_new = start_ical_day_new.add_weeks (start_week - week);
+                        if (start_ical_day_new.get_month () != month) {
+                            start_ical_day = start.add_months (i);
+                        }
+                        else {
+                            start_ical_day = start_ical_day_new;
+                            end_ical_day = start_ical_day.add_days (days);
+                            dateranges.add (new Util.DateRange (start_ical_day, end_ical_day));
+                        }
+
                         i++;
-                        n = i*rrule.interval;
-                        start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]);
                     }
                 }
             } else {
@@ -401,7 +418,7 @@
         start= start.to_timezone (new TimeZone.utc ());
         end = end.to_timezone (new TimeZone.utc ());
 
-        bool allday = is_the_all_day (start, end);
+        bool allday = is_all_day (start, end);
         if (allday)
             end = end.add_days (-1);
 
@@ -414,7 +431,7 @@
     /**
      * Say if an event lasts all day.
      */
-    public bool is_the_all_day (DateTime dtstart, DateTime dtend) {
+    public bool is_all_day (DateTime dtstart, DateTime dtend) {
         var UTC_start = dtstart.to_timezone (new TimeZone.utc ());
         var timespan = dtend.difference (dtstart);
         if (timespan % GLib.TimeSpan.DAY == 0 && UTC_start.get_hour() == 0) {
@@ -449,29 +466,8 @@
                 day_to_add = 6 - date.get_day_of_week ();
                 break;
         }
-        if (date.add_days (day_to_add).get_month () < date.get_month ())
-            day_to_add = day_to_add + 7;
-
-        if (date.add_days (day_to_add).get_month () > date.get_month ())
-            day_to_add = day_to_add - 7;
-
-        switch (iCal.RecurrenceType.day_position (day)) {
-            case 1:
-                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add) / 7);
-                return date.add_days (day_to_add - n * 7);
-            case 2:
-                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 7) / 7);
-                return date.add_days (day_to_add - n * 7);
-            case 3:
-                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 14) / 7);
-                return date.add_days (day_to_add - n * 7);
-            case 4:
-                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 21) / 7);
-                return date.add_days (day_to_add - n * 7);
-            default:
-                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 28) / 7);
-                return date.add_days (day_to_add - n * 7);
-        }
+
+        return date.add_days (day_to_add);
     }
 
     public DateTime get_start_of_month (owned DateTime? date = null) {

=== modified file 'src/AgendaView.vala'
--- src/AgendaView.vala	2015-01-17 00:43:05 +0000
+++ src/AgendaView.vala	2016-04-24 03:55:32 +0000
@@ -113,9 +113,10 @@
                 return false;
 
             unowned iCal.Component comp = event_row.calevent.get_icalcomponent ();
-            var stripped_time = Util.strip_time (selected_date);
-            foreach (var dt_range in Util.event_date_ranges (comp, new Util.DateRange (stripped_time, stripped_time.add_days (1)))) {
-                if (dt_range.contains (selected_date))
+            var stripped_time = Util.strip_time (selected_date.to_timezone (new TimeZone.utc ()));
+            var range = new Util.DateRange (stripped_time, stripped_time.add_days (1));
+            foreach (var dt_range in Util.event_date_ranges (comp, range)) {
+                if (dt_range.contains (stripped_time))
                     return true;
             }
 
@@ -359,7 +360,7 @@
 
             DateTime start_date, end_date;
             Util.get_local_datetimes_from_icalcomponent (ical_event, out start_date, out end_date);
-            if (Util.is_the_all_day (start_date, end_date) == true) {
+            if (Util.is_all_day (start_date, end_date) == true) {
                 is_allday = true;
                 hour_label.hide ();
                 hour_label.no_show_all = true;

=== modified file 'src/EventEdition/InfoPanel.vala'
--- src/EventEdition/InfoPanel.vala	2015-11-29 22:36:14 +0000
+++ src/EventEdition/InfoPanel.vala	2016-04-24 03:55:32 +0000
@@ -237,7 +237,7 @@
             }
 
             // Is this all day
-            bool allday = Util.is_the_all_day(from_date, to_date);
+            bool allday = Util.is_all_day(from_date, to_date);
 
             if (dt_end.year != 0) {
                 // If it's an all day event, subtract 1 from the end date