amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-06 04:20:33 +00:00
Code Issues Projects Releases Wiki Activity

See Changelog.

Browse Source 
Monotone-Parent: 8f58a8aa696d8fbbb82f1cd571800676a04b96af
Monotone-Revision: b593ce96638476fad98d678453ca6af6112169fb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-01-14T02:54:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-01-14 02:54:33 +00:00
parent b6bc06b163
commit 64081b8fa7
13 changed files with 259 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+30 -13
View File
@@ -1,6 +1,6 @@
/* iCalRepeatableEntityObject+SOGo.m - this file is part of SOGo
/*
Copyright (C) 2008-2011 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2008 Inverse inc.
This file is part of OpenGroupware.org.
@@ -26,8 +26,11 @@
#import <Foundation/NSString.h>
#import <Foundation/NSTimeZone.h>
#import <NGCards/iCalDateTime.h>
#import <NGCards/iCalRecurrenceRule.h>
#import <NGCards/iCalRecurrenceCalculator.h>
#import <NGCards/iCalTimeZone.h>
#import <NGCards/NSString+NGCards.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import "iCalRepeatableEntityObject+SOGo.h"
@@ -104,25 +107,39 @@
return 0;
}
- (BOOL) doesOccurOnDate: (NSCalendarDate *) occurenceDate
/**
* Checks if a date is part of the recurring entity.
* @param theOccurrenceDate the date to verify.
* @return true if the occurence date is part of the recurring entity.
*/
- (BOOL) doesOccurOnDate: (NSCalendarDate *) theOccurenceDate
{
NSArray *ranges;
NGCalendarDateRange *checkRange;
NSCalendarDate *endDate;
NGCalendarDateRange *checkRange, *firstRange;
NSCalendarDate *startDate, *endDate;
iCalDateTime *firstStartDate;
BOOL doesOccur;
doesOccur = [self isRecurrent];
if (doesOccur)
{
endDate = [occurenceDate addTimeInterval: [self occurenceInterval]];
checkRange = [NGCalendarDateRange calendarDateRangeWithStartDate: occurenceDate
endDate: endDate];
// Retrieve the range of the first event
firstRange = [self firstOccurenceRange];
// 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];
endDate = [startDate addTimeInterval: [self occurenceInterval]];
checkRange = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate
endDate: endDate];
// Calculate the occurrences for the given date
ranges = [iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: checkRange
firstInstanceCalendarDateRange: [self firstOccurenceRange]
recurrenceRules: [self recurrenceRules]
exceptionRules: [self exceptionRules]
exceptionDates: [self exceptionDates]];
doesOccur = [ranges dateRangeArrayContainsDate: occurenceDate];
firstInstanceCalendarDateRange: firstRange
recurrenceRules: [self recurrenceRules]
exceptionRules: [self exceptionRules]
exceptionDates: [self exceptionDates]];
doesOccur = [ranges dateRangeArrayContainsDate: startDate];
}
return doesOccur;