Monotone-Parent: 46e2b0eb136b0ff20576ecbaa9428e3c5bcd2ce7
Monotone-Revision: af7a7cd27a47902f3807ddbe5a9716197f08eeab Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-13T21:23:56 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
42817f45bf
commit
030c5cde99
|
@ -27,6 +27,7 @@
|
|||
#import "iCalEvent.h"
|
||||
#import "iCalRecurrenceRule.h"
|
||||
#import "iCalTrigger.h"
|
||||
#import "iCalToDo.h"
|
||||
#import "NSString+NGCards.h"
|
||||
|
||||
#import "iCalAlarm.h"
|
||||
|
@ -114,14 +115,13 @@
|
|||
NSCalendarDate *relationDate, *nextAlarmDate;
|
||||
NSString *relation;
|
||||
NSTimeInterval anInterval;
|
||||
iCalEvent *parentEvent;
|
||||
|
||||
nextAlarmDate = nil;
|
||||
|
||||
parentClass = [parent class];
|
||||
if ([parentClass isKindOfClass: [iCalEvent class]])
|
||||
if ([parentClass isKindOfClass: [iCalEvent class]]
|
||||
|| [parentClass isKindOfClass: [iCalToDo class]])
|
||||
{
|
||||
parentEvent = (iCalEvent *) parent;
|
||||
aTrigger = [self trigger];
|
||||
|
||||
if ([[aTrigger valueType] caseInsensitiveCompare: @"DURATION"])
|
||||
|
@ -129,9 +129,14 @@
|
|||
relation = [aTrigger relationType];
|
||||
anInterval = [[aTrigger value] durationAsTimeInterval];
|
||||
if ([relation caseInsensitiveCompare: @"END"] == NSOrderedSame)
|
||||
relationDate = [parentEvent endDate];
|
||||
{
|
||||
if ([parentClass isKindOfClass: [iCalEvent class]])
|
||||
relationDate = [(iCalEvent *) parent endDate];
|
||||
else
|
||||
relationDate = [(iCalToDo *) parent due];
|
||||
}
|
||||
else
|
||||
relationDate = [parentEvent startDate];
|
||||
relationDate = [(iCalEntityObject *) parent startDate];
|
||||
|
||||
// Compute the next alarm date with respect to the reference date
|
||||
if ([relationDate isNotNull])
|
||||
|
|
Loading…
Reference in New Issue