amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-30 10:32:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix yearly recurrences calculator with until date

Browse Source
This commit is contained in:
Francis Lachapelle
2017-10-12 10:19:01 -04:00
parent e5f9f3383a
commit 8b02db7b8c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -16,6 +16,7 @@ Enhancements
Bug fixes
- [core] yearly repeating events are not shown in web calendar (#4237)
- [core] increased column size of settings/defaults for MySQL (#4260)
- [core] fixed yearly recurrence calculator with until date
- [web] fixed display of error when the mail editor is in a popup
- [web] attachments are not displayed on IOS (#4150)
- [web] fixed parsing of pasted email addresses from Spreadsheet (#4258)

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