LSWAppointmentProposal.m (opengroupware-5.5rc2) | : | LSWAppointmentProposal.m (opengroupware-5.5rc3) | ||
---|---|---|---|---|
skipping to change at line 156 | skipping to change at line 156 | |||
/* notifications */ | /* notifications */ | |||
- (void)syncAwake { | - (void)syncAwake { | |||
[super syncAwake]; | [super syncAwake]; | |||
if (self->timeZone == nil) { | if (self->timeZone == nil) { | |||
NSTimeZone *tz; | NSTimeZone *tz; | |||
NSString *tzA; | NSString *tzA; | |||
if ((tz = [[self context] valueForKey:@"SkySchedulerTimeZone"]) == nil) | if ((tz = [[self context] objectForKey:@"SkySchedulerTimeZone"]) == nil) | |||
tz = [[self session] timeZone]; | tz = [[self session] timeZone]; | |||
self->timeZone = [tz retain]; | self->timeZone = [tz retain]; | |||
tzA = [self->timeZone abbreviation]; | tzA = [self->timeZone abbreviation]; | |||
self->startDate = [_getDate( 9, 0, 0, tzA) retain]; | self->startDate = [_getDate( 9, 0, 0, tzA) retain]; | |||
self->endDate = [_getDate(18, 59, 59, tzA) retain]; | self->endDate = [_getDate(18, 59, 59, tzA) retain]; | |||
[self runCommand:@"person::enterprises", | [self runCommand:@"person::enterprises", | |||
@"persons", self->participants, | @"persons", self->participants, | |||
skipping to change at line 238 | skipping to change at line 238 | |||
NSMutableArray *dates = nil; | NSMutableArray *dates = nil; | |||
dict = [[NSMutableDictionary alloc] initWithCapacity:64]; | dict = [[NSMutableDictionary alloc] initWithCapacity:64]; | |||
enumerator = [self->searchList objectEnumerator]; | enumerator = [self->searchList objectEnumerator]; | |||
while ((obj = [enumerator nextObject]) != nil) { | while ((obj = [enumerator nextObject]) != nil) { | |||
NSCalendarDate *sD; | NSCalendarDate *sD; | |||
NSString *str; | NSString *str; | |||
sD = [(NSDictionary *)obj objectForKey:@"startDate"]; | sD = [(NSDictionary *)obj objectForKey:@"startDate"]; | |||
str = [[NSString alloc] initWithFormat:@"%04d-%02d-%02d", | str = [[NSString alloc] initWithFormat:@"%04"PRIiPTR"-%02"PRIiPTR"-%02"PRI iPTR, | |||
[sD yearOfCommonEra], | [sD yearOfCommonEra], | |||
[sD monthOfYear], | [sD monthOfYear], | |||
[sD dayOfMonth]]; | [sD dayOfMonth]]; | |||
if (date == nil) { | if (date == nil) { | |||
date = str; | date = str; | |||
dates = [NSMutableArray arrayWithCapacity:64]; | dates = [NSMutableArray arrayWithCapacity:64]; | |||
[dict setObject:dates forKey:date]; | [dict setObject:dates forKey:date]; | |||
} | } | |||
else { | else { | |||
if (![str isEqualToString:date]) { | if (![str isEqualToString:date]) { | |||
skipping to change at line 749 | skipping to change at line 749 | |||
[self->resources addObjectsFromArray:_res]; | [self->resources addObjectsFromArray:_res]; | |||
} | } | |||
- (void)setResources:(id)_res { | - (void)setResources:(id)_res { | |||
ASSIGN(self->resources, _res); | ASSIGN(self->resources, _res); | |||
} | } | |||
- (NSArray *)resources { | - (NSArray *)resources { | |||
return self->resources; | return self->resources; | |||
} | } | |||
- (void)setSelectedParticipants:(NSArray *)_array { | - (void)setSelectedParticipants:(NSArray *)_array { | |||
ASSIGN(self->selectedParticipants, _array); | ASSIGN(self->selectedParticipants, [NSMutableArray arrayWithArray: _array]); | |||
} | } | |||
- (id)selectedParticipants { | - (id)selectedParticipants { | |||
return self->selectedParticipants; | return self->selectedParticipants; | |||
} | } | |||
- (void)setParticipantsFromGids:(NSArray *)_gids { | - (void)setParticipantsFromGids:(NSArray *)_gids { | |||
NSMutableArray *pgids = nil; | NSMutableArray *pgids = nil; | |||
NSMutableArray *tgids = nil; | NSMutableArray *tgids = nil; | |||
NSEnumerator *enumerator = nil; | NSEnumerator *enumerator = nil; | |||
id gid = nil; | id gid = nil; | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |