amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-14 21:04:53 +00:00
Code Issues Projects Releases Wiki Activity

Style events depending on user participation state

Browse Source 
Also use one-time binding for non-ghost events.
This commit is contained in:
Francis Lachapelle
2016-04-22 10:55:26 -04:00
parent 0bc7e5f5bd
commit 1a30df03c8
7 changed files with 125 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxCalListingActions.m
+9 -9
View File
@@ -868,7 +868,7 @@ static inline void _feedBlockWithMonthBasedData (NSMutableDictionary *block, uns
number: (NSNumber *) number
onDay: (unsigned int) dayStart
recurrenceTime: (unsigned int) recurrenceTime
userState: (iCalPersonPartStat) userState
userState: (NSString *) userState
{
NSMutableDictionary *block;
@@ -882,22 +882,22 @@ static inline void _feedBlockWithMonthBasedData (NSMutableDictionary *block, uns
if (recurrenceTime)
[block setObject: [NSNumber numberWithInt: recurrenceTime]
forKey: @"recurrenceTime"];
if (userState != iCalPersonPartStatOther)
[block setObject: [NSNumber numberWithInt: userState]
if (userState != nil)
[block setObject: userState
forKey: @"userState"];
return block;
}
static inline iCalPersonPartStat _userStateInEvent (NSArray *event)
static inline NSString* _userStateInEvent (NSArray *event)
{
unsigned int count, max;
iCalPersonPartStat state;
NSString *state;
NSArray *participants, *states;
SOGoUser *user;
participants = nil;
state = iCalPersonPartStatOther;
state = nil;
participants = [event objectAtIndex: eventPartMailsIndex];
@@ -909,10 +909,10 @@ static inline iCalPersonPartStat _userStateInEvent (NSArray *event)
max = [participants count];
user = [SOGoUser userWithLogin: [event objectAtIndex: eventOwnerIndex]
roles: nil];
while (state == iCalPersonPartStatOther && count < max)
while (state == nil && count < max)
{
if ([user hasEmail: [participants objectAtIndex: count]])
state = [[states objectAtIndex: count] intValue];
state = [states objectAtIndex: count];
else
count++;
}
@@ -929,7 +929,7 @@ static inline iCalPersonPartStat _userStateInEvent (NSArray *event)
eventEnd, computedEventEnd, offset, recurrenceTime, swap;
NSMutableArray *currentDay;
NSMutableDictionary *eventBlock;
iCalPersonPartStat userState;
NSString *userState;
eventStart = [[event objectAtIndex: eventStartDateIndex] intValue];
if (eventStart < 0)