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

(web) Fix "last day of the month" repeat rule

Browse Source
This commit is contained in:
Francis Lachapelle
2017-08-29 14:29:11 -04:00
parent 5e5e52e3f1
commit 491e090fb4
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+23 -1
View File
@@ -126,7 +126,29 @@
if ([[rule byDay] length])
[repeat setObject: [[rule byDayMask] asRuleArray] forKey: @"days"];
if ([[rule byMonthDay] count])
[repeat setObject: [rule byMonthDay] forKey: @"monthdays"];
{
NSMutableArray *byMonthDay = [NSMutableArray arrayWithArray: [rule byMonthDay]];
NSMutableArray *byDay = [NSMutableArray array];
NSInteger i, count;
count = [byMonthDay count];
for (i = count - 1; i >= 0; i--)
{
NSString *day = [byMonthDay objectAtIndex: i];
if ([day intValue] < 0)
{
// Relative BYMONTHDAY mask are moved to the "days" array
[byDay addObject: [NSDictionary dictionaryWithObjectsAndKeys:
@"relative", @"day",
day, @"occurrence",
nil]];
[byMonthDay removeObjectAtIndex: i];
}
}
if ([byMonthDay count])
[repeat setObject: byMonthDay forKey: @"monthdays"];
if ([byDay count])
[repeat setObject: byDay forKey: @"days"];
}
if ([[rule byMonth] count])
[repeat setObject: [rule byMonth] forKey: @"months"];
[data setObject: repeat forKey: @"repeat"];