amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-14 01:38:51 +00:00
Code Issues Projects Releases Wiki Activity

See SOPE/NGCards/ChangeLog.

Browse Source 
Monotone-Parent: 99dc7d9dce88b8a323b1e7aab60de99ed2bfda60
Monotone-Revision: d29498142c4a9f1d780373bd5f0d80b17f6e2c33

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-30T11:34:24
This commit is contained in:
Francis Lachapelle
2012-05-30 11:34:24 +00:00
parent d6f0203351
commit d98db782b3
5 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
View File

@@ -125,9 +125,7 @@
NSArray *ranges;
NGCalendarDateRange *checkRange, *firstRange;
NSCalendarDate *startDate, *endDate;
NSTimeZone *timeZone;
id firstStartDate, firstEndDate;
iCalTimeZone *eventTimeZone;
id firstStartDate, firstEndDate, timeZone;
BOOL doesOccur;
int offset;
@@ -139,9 +137,11 @@
// Set the range to check with respect to the event timezone (extracted from the start date)
firstStartDate = (iCalDateTime *)[self uniqueChildWithTag: @"dtstart"];
eventTimeZone = [(iCalDateTime *)firstStartDate timeZone];
if (eventTimeZone)
startDate = [eventTimeZone computedDateForDate: theOccurenceDate];
timeZone = [(iCalDateTime *)firstStartDate timeZone];
if (timeZone)
{
startDate = [(iCalTimeZone *)timeZone computedDateForDate: theOccurenceDate];
}
else
{
startDate = theOccurenceDate;
@@ -150,13 +150,14 @@
// The event lasts all-day and has no timezone (floating); we convert the range of the first event
// to the occurence's timezone.
timeZone = [theOccurenceDate timeZone];
offset = [timeZone secondsFromGMTForDate: [firstRange startDate]];
offset = [(NSTimeZone *)timeZone secondsFromGMTForDate: [firstRange startDate]];
firstStartDate = (NSCalendarDate *)[[firstRange startDate] dateByAddingYears:0 months:0 days:0 hours:0 minutes:0
seconds:-offset];
firstEndDate = (NSCalendarDate *)[[firstRange endDate] dateByAddingYears:0 months:0 days:0 hours:0 minutes:0
seconds:-offset];
[(NSCalendarDate *)firstStartDate setTimeZone: timeZone];
[(NSCalendarDate *)firstEndDate setTimeZone: timeZone];
firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: firstStartDate
endDate: firstEndDate];
}
@@ -168,9 +169,9 @@
// Calculate the occurrences for the given date
ranges = [iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: checkRange
firstInstanceCalendarDateRange: firstRange
recurrenceRules: [self recurrenceRulesWithTimeZone: eventTimeZone]
exceptionRules: [self exceptionRulesWithTimeZone: eventTimeZone]
exceptionDates: [self exceptionDatesWithTimeZone: eventTimeZone]];
recurrenceRules: [self recurrenceRulesWithTimeZone: timeZone]
exceptionRules: [self exceptionRulesWithTimeZone: timeZone]
exceptionDates: [self exceptionDatesWithTimeZone: timeZone]];
doesOccur = [ranges dateRangeArrayContainsDate: startDate];
}