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

Monotone-Parent: 52de90085e2d18ded0d0c315e7148e1c72feb785

Browse Source 
Monotone-Revision: 99d14630f5294d40da6680a39d69b6f1b7853938

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-17T21:12:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2008-07-17 21:12:43 +00:00
1 parent e1beed1ba0
commit bdc02c26ab
46 files changed
+1595 -521
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/Scheduler/UIxCalListingActions.m
+13 -9
View File
@@ -65,7 +65,8 @@ static NSArray *tasksFields = nil;
@"c_status", @"c_title", @"c_startdate",
@"c_enddate", @"c_location", @"c_isallday",
@"c_classification", @"c_partmails",
@"c_partstates", @"c_owner", @"c_iscycle", nil];
@"c_partstates", @"c_owner", @"c_iscycle",
@"c_recurrence_id", nil];
[eventsFields retain];
}
if (!tasksFields)
@@ -404,7 +405,7 @@ _feedBlockWithMonthBasedData(NSMutableDictionary *block, unsigned int start,
end: (unsigned int) end
cname: (NSString *) cName
onDay: (unsigned int) dayStart
recurrence: (BOOL) recurrence
recurrenceTime: (unsigned int) recurrenceTime
userState: (iCalPersonPartStat) userState
{
NSMutableDictionary *block;
@@ -416,8 +417,9 @@ _feedBlockWithMonthBasedData(NSMutableDictionary *block, unsigned int start,
else
_feedBlockWithMonthBasedData (block, start, userTimeZone, dateFormatter);
[block setObject: cName forKey: @"cname"];
if (recurrence)
[block setObject: @"1" forKey: @"recurrence"];
if (recurrenceTime)
[block setObject: [NSNumber numberWithInt: recurrenceTime]
forKey: @"recurrenceTime"];
if (userState != iCalPersonPartStatOther)
[block setObject: [NSNumber numberWithInt: userState]
forKey: @"userState"];
@@ -463,11 +465,10 @@ _userStateInEvent (NSArray *event)
withEvent: (NSArray *) event
{
unsigned int currentDayStart, startSecs, endsSecs, currentStart, eventStart,
eventEnd, offset;
eventEnd, offset, recurrenceTime;
NSMutableArray *currentDay;
NSMutableDictionary *eventBlock;
NSString *eventCName;
BOOL recurrence;
iCalPersonPartStat userState;
startSecs = (unsigned int) [startDate timeIntervalSince1970];
@@ -475,7 +476,10 @@ _userStateInEvent (NSArray *event)
eventStart = [[event objectAtIndex: 4] unsignedIntValue];
eventEnd = [[event objectAtIndex: 5] unsignedIntValue];
recurrence = [[event objectAtIndex: 12] boolValue];
if ([[event objectAtIndex: 12] boolValue])
recurrenceTime = [[event objectAtIndex: 13] unsignedIntValue];
else
recurrenceTime = 0;
currentStart = eventStart;
if (currentStart < startSecs)
@@ -500,7 +504,7 @@ _userStateInEvent (NSArray *event)
end: currentDayStart + dayLength - 1
cname: eventCName
onDay: currentDayStart
recurrence: recurrence
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
currentDayStart += dayLength;
@@ -512,7 +516,7 @@ _userStateInEvent (NSArray *event)
end: eventEnd
cname: eventCName
onDay: currentDayStart
recurrence: recurrence
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
}