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

Fix yearly recurrences calculator with until date

pull/278/head
Francis Lachapelle 2017-10-12 10:19:01 -04:00
parent 388298493f
commit a2f84f1358
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -7,6 +7,7 @@ Enhancements
Bug fixes
- [core] yearly repeating events are not shown in web calendar (#4237)
- [core] correctly handle "Last day of the month" recurrence rule
- [core] fixed yearly recurrence calculator with until date
- [eas] avoid sync requests for shared folders every second (#4275)
2.3.22 (2017-07-20)

21
SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
View File

@ -91,7 +91,7 @@
if ([lastDate compare: rStart] == NSOrderedAscending)
// Range starts after last occurrence
return nil;
if ([lastDate compare: rEnd] == NSOrderedDescending)
if ([lastDate compare: rEnd] == NSOrderedAscending)
// Range ends after last occurence; adjust end date
rEnd = lastDate;
}
@ -212,14 +212,17 @@
months: 0
days: 0];
[start setTimeZone: [firStart timeZone]];
end = [start addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
if ([_r doesIntersectWithDateRange: r] && (repeatCount == 0 || count < repeatCount))
{
[ranges addObject: r];
count++;
}
if ([start compare: rEnd] == NSOrderedAscending)
{
end = [start addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
if ([_r doesIntersectWithDateRange: r] && (repeatCount == 0 || count < repeatCount))
{
[ranges addObject: r];
count++;
}
}
}
}
else