(core) Handle multidays events in freebusy data
parent
0d78d3814c
commit
9a245f18fa
1
NEWS
1
NEWS
|
@ -6,6 +6,7 @@ Bug fixes
|
||||||
- [web] fixed wrong colors assigned to default calendar categories
|
- [web] fixed wrong colors assigned to default calendar categories
|
||||||
- [core] allow super users to modify any event (#4216)
|
- [core] allow super users to modify any event (#4216)
|
||||||
- [core] correctly handle the full cert chain in S/MIME
|
- [core] correctly handle the full cert chain in S/MIME
|
||||||
|
- [core] handle multidays events in freebusy data
|
||||||
|
|
||||||
4.0.7 (2019-02-27)
|
4.0.7 (2019-02-27)
|
||||||
------------------
|
------------------
|
||||||
|
|
|
@ -246,6 +246,17 @@
|
||||||
while ([currentDate compare: currentEndDate] == NSOrderedAscending &&
|
while ([currentDate compare: currentEndDate] == NSOrderedAscending &&
|
||||||
[currentEndDate timeIntervalSinceDate: currentDate] >= 3600) // 1 hour
|
[currentEndDate timeIntervalSinceDate: currentDate] >= 3600) // 1 hour
|
||||||
{
|
{
|
||||||
|
if ([currentDate hourOfDay] == 0)
|
||||||
|
{
|
||||||
|
// New day
|
||||||
|
dayKey = [currentDate shortDateString];
|
||||||
|
dayData = [freeBusy objectForKey: dayKey];
|
||||||
|
if (!dayData)
|
||||||
|
{
|
||||||
|
dayData = [NSMutableDictionary dictionary];
|
||||||
|
[freeBusy setObject: dayData forKey: dayKey];
|
||||||
|
}
|
||||||
|
}
|
||||||
hourKey = [NSString stringWithFormat: @"%u", (unsigned int)[currentDate hourOfDay]];
|
hourKey = [NSString stringWithFormat: @"%u", (unsigned int)[currentDate hourOfDay]];
|
||||||
hourData = [dayData objectForKey: hourKey];
|
hourData = [dayData objectForKey: hourKey];
|
||||||
if (!hourData)
|
if (!hourData)
|
||||||
|
|
Loading…
Reference in New Issue