Fix support for recurrent tasks

UI/Scheduler/NSArray+Scheduler.h

@@ -68,6 +68,7 @@
 #define taskRecurrenceIdIndex      16
 #define taskIsExceptionIndex       17
 #define taskDescriptionIndex       18
+#define taskStatusFlagIndex        19
 
 @interface NSArray (SOGoEventComparison)
 

UI/Scheduler/UIxCalListingActions.m

@@ -1562,7 +1562,6 @@ _computeBlocksPosition (NSArray *blocks)
   BOOL showCompleted;
   int statusCode;
   int startSecs;
-  int endsSecs;
 
   filteredTasks = [NSMutableArray array];
   
@@ -1571,7 +1570,6 @@ _computeBlocksPosition (NSArray *blocks)
   [self saveSortValue: @"TasksSortingState"];
   
   startSecs = (unsigned int) [startDate timeIntervalSince1970];
-  endsSecs = (unsigned int) [endDate timeIntervalSince1970];
   tasksView = [request formValueForKey: @"filterpopup"];
   
   showCompleted = [[request formValueForKey: @"show_completed"] intValue];
@@ -1602,15 +1600,19 @@ _computeBlocksPosition (NSArray *blocks)
            [tasksView isEqualToString:@"view_next7"]  ||
            [tasksView isEqualToString:@"view_next14"] ||
            [tasksView isEqualToString:@"view_next31"] ||
-           [tasksView isEqualToString:@"view_thismonth"]) && ((endDateStamp <= endsSecs) && (endDateStamp >= startSecs)))
+           [tasksView isEqualToString:@"view_thismonth"]) &&
+          (endDateStamp == 0 || endDateStamp >= startSecs))
         [filteredTasks addObject: filteredTask];
       else if ([tasksView isEqualToString:@"view_all"])
         [filteredTasks addObject: filteredTask];
-      else if (([tasksView isEqualToString:@"view_overdue"]) && ([[filteredTask objectAtIndex:18] isEqualToString:@"overdue"]))
+      else if (([tasksView isEqualToString:@"view_overdue"]) &&
+               ([[filteredTask objectAtIndex:taskStatusFlagIndex] isEqualToString:@"overdue"]))
         [filteredTasks addObject: filteredTask];
-      else if ([tasksView isEqualToString:@"view_incomplete"] && (![[filteredTask objectAtIndex:18] isEqualToString:@"completed"]))
+      else if ([tasksView isEqualToString:@"view_incomplete"] &&
+               (![[filteredTask objectAtIndex:taskStatusFlagIndex] isEqualToString:@"completed"]))
         [filteredTasks addObject: filteredTask];
-      else if ([tasksView isEqualToString:@"view_not_started"] && ([[[filteredTask objectAtIndex:taskStatusIndex] stringValue] isEqualToString:@"0"]))
+      else if ([tasksView isEqualToString:@"view_not_started"] &&
+               ([[[filteredTask objectAtIndex:taskStatusIndex] stringValue] isEqualToString:@"0"]))
         [filteredTasks addObject: filteredTask];
     }
   }

UI/Scheduler/UIxTaskEditor.m

@@ -1,6 +1,6 @@
 /* UIxTaskEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2015 Inverse inc.
+ * Copyright (C) 2007-2016 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoTaskObject.h>
+#import <Appointments/SOGoTaskOccurence.h>
 
 #import "UIxComponentEditor.h"
 #import "UIxTaskEditor.h"
@@ -325,6 +326,8 @@
 
   todo = [self todo];
   co = [self clientObject];
+  if ([co isKindOfClass: [SOGoTaskOccurence class]])
+    co = [co container];
   previousCalendar = [co container];
   sm = [SoSecurityManager sharedSecurityManager];
 
@@ -493,7 +496,6 @@
   NSCalendarDate *startDate, *dueDate, *completedDate;
   NSTimeZone *timeZone;
   SOGoCalendarComponent *co;
-  SOGoAppointmentFolder *thisFolder;
   SOGoUserDefaults *ud;
   iCalAlarm *anAlarm;
   iCalToDo *todo;
@@ -503,7 +505,6 @@
   todo = [self todo];
 
   co = [self clientObject];
-  thisFolder = [co container];
 
   ud = [[context activeUser] userDefaults];
   timeZone = [ud timeZone];
@@ -533,7 +534,7 @@
       iCalToDo *master;
 
       master = todo;
-      [thisFolder findEntityForClosestAlarm: &todo
+      [componentCalendar findEntityForClosestAlarm: &todo
                                    timezone: timeZone
                                   startDate: &startDate
                                     endDate: &dueDate];
@@ -556,13 +557,22 @@
     }
   
   data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                         [co nameInContainer], @"id",
-                       [thisFolder nameInContainer], @"pid",
-                       [thisFolder displayName], @"calendar",
+                       [componentCalendar nameInContainer], @"pid",
+                       [componentCalendar displayName], @"calendar",
                        [NSNumber numberWithBool: [self isReadOnly]], @"isReadOnly",
                        [self alarm], @"alarm",
 		       nil];
 
+  if ([self isChildOccurrence])
+    {
+      [data setObject: [[co container] nameInContainer] forKey: @"id"];
+      [data setObject: [co nameInContainer] forKey: @"occurrenceId"];
+    }
+  else
+    {
+      [data setObject: [co nameInContainer] forKey: @"id"];
+    }
+
   if (startDate)
     {
       [data setObject: [dateFormatter formattedDate: startDate] forKey: @"localizedStartDate"];