amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-11 14:57:12 +00:00
Code Issues Projects Releases Wiki Activity

See Changelog.

Browse Source 
Monotone-Parent: f632b73418c67ba2778ff41a75a2842d90da9883
Monotone-Revision: 8ae1b0b4d89d23b2996f0b95677ca5599649f47b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-01-14T15:33:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2011-01-14 15:33:20 +00:00
1 parent 32dc764c41
commit 2c8744dcb0
8 files changed
+110 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/Appointments/SOGoAppointmentFolder.m
+1 -1
View File
@@ -899,7 +899,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
// Calculate the occurrences for the given range
rules = [cycleinfo objectForKey: @"rules"];
exRules = [cycleinfo objectForKey: @"exRules"];
exDates = [cycleinfo objectForKey: @"exDates"];
exDates = [eventTimeZone computedDatesForStrings: [cycleinfo objectForKey: @"exDates"]];
ranges = [iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: theRange
firstInstanceCalendarDateRange: firstRange
recurrenceRules: rules
SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+4 -2
View File
@@ -118,6 +118,7 @@
NGCalendarDateRange *checkRange, *firstRange;
NSCalendarDate *startDate, *endDate;
iCalDateTime *firstStartDate;
iCalTimeZone *eventTimeZone;
BOOL doesOccur;
doesOccur = [self isRecurrent];
@@ -128,7 +129,8 @@
// Set the range to check with respect to the event timezone (extracted from the start date)
firstStartDate = (iCalDateTime *)[self uniqueChildWithTag: @"dtstart"];
startDate = [[firstStartDate timeZone] computedDateForDate: theOccurenceDate];
eventTimeZone = [firstStartDate timeZone];
startDate = [eventTimeZone computedDateForDate: theOccurenceDate];
endDate = [startDate addTimeInterval: [self occurenceInterval]];
checkRange = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate
endDate: endDate];
@@ -138,7 +140,7 @@
firstInstanceCalendarDateRange: firstRange
recurrenceRules: [self recurrenceRules]
exceptionRules: [self exceptionRules]
exceptionDates: [self exceptionDates]];
exceptionDates: [self exceptionDatesWithEventTimeZone: eventTimeZone]];
doesOccur = [ranges dateRangeArrayContainsDate: startDate];
}