fix(calendar): Update c_startdate field when updating event. Fixes #4376

Alinto · Oct 26, 2022 · 549d6a8 · 549d6a8
1 parent 9b023f4
commit 549d6a8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
@@ -987,7 +987,7 @@ - (NSException *) writeContent: (NSString *) _content
   NSDictionary	      *currentRow;
   NSNumber            *storedVersion;
   BOOL                isNewRecord, hasInsertDelegate, hasUpdateDelegate;
-  NSCalendarDate      *nowDate;
+  NSCalendarDate      *nowDate, *startDate;
   NSNumber            *now;
   EOEntity *quickTableEntity, *storeTableEntity;
   NSArray *rows;
@@ -1002,6 +1002,7 @@ - (NSException *) writeContent: (NSString *) _content
 	  error   = nil;
 	  nowDate = [NSCalendarDate date];
 	  now     = [NSNumber numberWithUnsignedInt:[nowDate timeIntervalSince1970]];
+    startDate = nil;
 
 	  if (doLogStore)
 	    [self logWithFormat:@"should store content: '%@'\n%@", _name, _content];
@@ -1071,6 +1072,7 @@ - (NSException *) writeContent: (NSString *) _content
 
 		  [contentRow setObject:_name forKey:@"c_name"];
 		  [contentRow setObject:now forKey:@"c_lastmodified"];
+
 		  if (isNewRecord)
 		    {
 		      [contentRow setObject:now forKey:@"c_creationdate"];
@@ -1141,6 +1143,14 @@ - (NSException *) writeContent: (NSString *) _content
 			}
 		      else
 			{
+        // Update c_startdate for appointments
+        if ([theComponent respondsToSelector:@selector(startDate)]) {
+          startDate = [theComponent startDate];
+          if (startDate) {
+            [quickRow setObject:[NSNumber numberWithUnsignedInt:[startDate timeIntervalSince1970]] forKey:@"c_startdate"];
+          }
+        }
+
 			  if (!ofFlags.sameTableForQuick)
 			    error = (hasUpdateDelegate
 				     ? [quickChannel updateRowX: quickRow

diff --git a/SOPE/NGCards/iCalCalendar.h b/SOPE/NGCards/iCalCalendar.h
@@ -56,6 +56,9 @@
 - (void) setMethod: (NSString *) _method;
 - (NSString *) method;
 
+// - (void) setStartDate: (NSCalendarDate *) newStartDate;
+- (NSCalendarDate *) startDate;
+
 - (NSArray *) events;
 - (NSArray *) todos;
 - (NSArray *) journals;

diff --git a/SOPE/NGCards/iCalCalendar.m b/SOPE/NGCards/iCalCalendar.m
@@ -133,8 +133,27 @@ - (void) setMethod: (NSString *) _value
 - (NSString *) method
 {
   return [[self uniqueChildWithTag: @"method"] flattenedValuesForKey: @""];
+} 
+
+- (NSCalendarDate *) startDate
+{
+  // Parse all dtstart to find the earlier
+  NSCalendarDate *calendarDate, *tmpCalendarDate;
+  NSUInteger i;
+
+  calendarDate = nil;
+  if ([[self allObjects] count] > 0) {
+    calendarDate = [[[[self allObjects] objectAtIndex: 0] uniqueChildWithTag: @"dtstart"] dateTime];
+    for (i = 0U ; i < [[self allObjects] count] ; i++) {
+      tmpCalendarDate = [[[[self allObjects] objectAtIndex: i] uniqueChildWithTag: @"dtstart"] dateTime];
+      if ([tmpCalendarDate timeIntervalSince1970] < [calendarDate timeIntervalSince1970]) calendarDate = tmpCalendarDate;
+    }
+  }
+
+  return calendarDate;
 }
 
+
 - (void) addToEvents: (iCalEvent *) _event
 {
   [self addChild: _event];

diff --git a/UI/WebServerResources/js/Common.js b/UI/WebServerResources/js/Common.js
diff --git a/UI/WebServerResources/js/Common.js.map b/UI/WebServerResources/js/Common.js.map