LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of weekly recurrence rule with count 

This fixes some corner cases when computing the freebusy and therefore
when verifying for resource conflicts.
pull/230/head
Francis Lachapelle 2016-11-04 16:44:14 -04:00
parent 892db449e5
commit e948b45899
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SOPE/NGCards/iCalRecurrenceRule.h
View File

@ -96,6 +96,7 @@ extern NSString *iCalWeekDayString[];
/* count and untilDate are mutually exclusive */
- (BOOL) hasRepeatCount;
- (void) setRepeatCount: (int) _repeatCount;
- (int) repeatCount;

5
SOPE/NGCards/iCalRecurrenceRule.m
View File

@ -409,6 +409,11 @@ NSString *iCalWeekDayString[] = { @"SU", @"MO", @"TU", @"WE", @"TH", @"FR",
return [[self flattenedValuesForKey: @"count"] intValue];
}
- (BOOL) hasRepeatCount
{
return [[self flattenedValuesForKey: @"count"] length] > 0;
}
- (void) setCount: (NSString *) _count
{
[self setSingleValue: _count forKey: @"count"];

16
SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
View File

@ -69,6 +69,7 @@
long i, repeatCount, count;
unsigned interval;
iCalByDayMask *dayMask;
BOOL hasRepeatCount;
[self logWithFormat: @"Weekly %@", rrule];
@ -77,6 +78,7 @@
endDate = [_r endDate];
dayMask = nil;
repeatCount = 0;
hasRepeatCount = [rrule hasRepeatCount];
if ([endDate compare: firStart] == NSOrderedAscending)
// Range ends before first occurrence
@ -114,7 +116,7 @@
return nil;
if ([lastDate compare: endDate] == NSOrderedAscending)
// Range ends after last occurence; adjust end date
endDate = lastDate;
endDate = [lastDate addTimeInterval: [firstRange duration]];
}
}
@ -130,9 +132,7 @@
[currentStartDate compare: endDate] == NSOrderedSame)
{
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
if ([startDate compare: currentStartDate] == NSOrderedAscending ||
[startDate compare: currentStartDate] == NSOrderedSame ||
[startDate compare: currentEndDate] == NSOrderedAscending)
if ([startDate compare: currentEndDate] == NSOrderedAscending)
{
NGCalendarDateRange *r;
@ -157,9 +157,9 @@
BOOL isRecurrence = NO;
NSInteger week;
if (repeatCount > 0 ||
[startDate compare: currentStartDate] == NSOrderedAscending ||
[startDate compare: currentStartDate] == NSOrderedSame)
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
if (hasRepeatCount ||
[startDate compare: currentEndDate] == NSOrderedAscending)
{
// If the rule count is defined, stop once the count is reached.
if ([currentStartDate compare: firStart] == NSOrderedSame)
@ -182,10 +182,8 @@
count++;
if (repeatCount > 0 && count > repeatCount)
break;
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate
endDate: currentEndDate];
if ([_r doesIntersectWithDateRange: r])
{
[ranges addObject: r];

16
SoObjects/Appointments/iCalEvent+SOGo.m
View File

@ -174,15 +174,15 @@
NSCalendarDate *date;
date = [self lastPossibleRecurrenceStartDate];
if (!date)
{
/* this could also be *nil*, but in the end it makes the fetchspecs
more complex - thus we set it to a "reasonable" distant future */
date = iCalDistantFuture;
}
if (date)
date = [date addTimeInterval: [self durationAsTimeInterval]];
else
/* this could also be *nil*, but in the end it makes the fetchspecs
more complex - thus we set it to a "reasonable" distant future */
date = iCalDistantFuture;
[row setObject: [self quickRecordDateAsNumber: date
withOffset: 0 forAllDay: NO]
forKey: @"c_cycleenddate"];
withOffset: 0 forAllDay: NO]
forKey: @"c_cycleenddate"];
[row setObject: [self cycleInfo] forKey: @"c_cycleinfo"];
}