From f1a0e2d733b5c73b3918cbb70df51c9ce1471c61 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 12 Jun 2007 15:29:51 +0000 Subject: [PATCH 1/8] Monotone-Parent: 13615e3a056f85c87049c664f725060e540006e1 Monotone-Revision: 0f2093b2c842909ea51a7e5865f904c20f7fda27 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-12T15:29:51 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/generic.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index c902c078a..b4ae403a9 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1191,7 +1191,10 @@ function configureSortableTableHeaders() { var headers = document.getElementsByClassName("sortableTableHeader"); for (var i = 0; i < headers.length; i++) { var header = headers[i]; - Event.observe(header, "click", onHeaderClick.bindAsEventListener(header)); + var anchor = $(header).childNodesWithTag("a")[0]; + if (anchor) + Event.observe(anchor, "click", + onHeaderClick.bindAsEventListener(anchor)); } } From abcaa9477016bdd97839916dca5b721ca871e0a0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 12 Jun 2007 15:29:58 +0000 Subject: [PATCH 2/8] Monotone-Parent: 0f2093b2c842909ea51a7e5865f904c20f7fda27 Monotone-Revision: ec26e4feb9dc5cfb50ec5b138bec4a05141934c6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-12T15:29:58 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.css | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 45af96731..1f7cb80f9 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -4,7 +4,7 @@ DIV#leftPanel position: absolute; top: 5.5em; left: 0px; - width: 18.5em; + width: 19.25em; bottom: 0px; overflow: hidden; } @@ -15,13 +15,13 @@ DIV#schedulerTabs top: 0.5em; left: .2em; right: .2em; - height: 17em; + height: 14em; } DIV#tasksListView { position: absolute; - top: 20em; + top: 17em; bottom: 0px; left: .2em; right: .7em; @@ -84,7 +84,7 @@ UL#calendarList LI UL#tasksList { position: absolute; width: 100%; - top: 3em; + top: 2em; left: .25em; right: .25em; bottom: .25em; } @@ -126,7 +126,7 @@ UL#tasksList LI[class~="_selected"].duelater DIV#rightPanel { position: absolute; top: 5.5em; - left: 18.5em; + left: 19.25em; right: 0px; bottom: 0px; margin: 0px; @@ -143,7 +143,8 @@ DIV#eventsListView left: 0px; right: 0px; height: 15.5em; - overflow: auto; } + overflow: hidden; + overflow-y: auto; } DIV#calendarView { position: absolute; @@ -163,7 +164,7 @@ DIV#calendarView A #verticalDragHandle { cursor: e-resize; top: 7.5em; - left: 18.5em; + left: 19.25em; width: 5px; bottom: 0px; } From c8cea8fa210169613779838a49da8d9c4b266228 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 12 Jun 2007 15:33:08 +0000 Subject: [PATCH 3/8] Monotone-Parent: ec26e4feb9dc5cfb50ec5b138bec4a05141934c6 Monotone-Revision: 3a3e7e985adac6637eacd797235cdf6c4eae70cb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-12T15:33:08 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 + OGoContentStore/OCSiCalFieldExtractor.m | 289 +++++++++++++----------- 2 files changed, 160 insertions(+), 136 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bb1765b7..a867b5d12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-12 Wolfgang Sourdeau + + * OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor + -extractQuickFieldsFromEvent:_event]): reduce the seconds/70 of + the end date of all day events of 1 so that they stay on their + real last day. + 2007-06-11 Wolfgang Sourdeau * UI/Scheduler/UIxCalMonthView.m: no longer retrieve appointments. diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m index 264893c74..9b8678f78 100644 --- a/OGoContentStore/OCSiCalFieldExtractor.m +++ b/OGoContentStore/OCSiCalFieldExtractor.m @@ -14,7 +14,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the + License along with SOGo; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -27,25 +27,24 @@ @implementation OCSiCalFieldExtractor -static OCSiCalFieldExtractor *extractor = nil; -static NSCalendarDate *distantFuture = nil; -static NSNumber *distantFutureNumber = nil; +static NSCalendarDate *distantFuture = nil; +static NSNumber *distantFutureNumber = nil; + (void) initialize { - static BOOL didInit = NO; - - if (didInit) return; - didInit = YES; - - distantFuture = [[NSCalendarDate distantFuture] retain]; - /* INT_MAX due to Postgres constraint */ - distantFutureNumber = [[NSNumber numberWithUnsignedInt:INT_MAX] retain]; + if (!distantFuture) + { + distantFuture = [[NSCalendarDate distantFuture] retain]; + /* INT_MAX due to Postgres constraint */ + distantFutureNumber = [[NSNumber numberWithUnsignedInt: INT_MAX] retain]; + } } + (id) sharedICalFieldExtractor { - if (extractor == nil) + static OCSiCalFieldExtractor *extractor = nil; + + if (!extractor) extractor = [self new]; return extractor; @@ -55,99 +54,117 @@ static NSNumber *distantFutureNumber = nil; - (NSNumber *) numberForDate: (NSCalendarDate *) _date { - if (_date == distantFuture) - return distantFutureNumber; - - return [NSNumber numberWithUnsignedInt:[_date timeIntervalSince1970]]; + return ((_date == distantFuture) + ? distantFutureNumber + : [NSNumber numberWithUnsignedInt: [_date timeIntervalSince1970]]); } - (NSMutableDictionary *) extractQuickFieldsFromEvent: (iCalEvent *) _event { NSMutableDictionary *row; - NSCalendarDate *startDate, *endDate; - NSArray *attendees; - NSString *uid, *title, *location, *status; - NSNumber *sequence; - id organizer; - id participants, partmails; - NSMutableString *partstates; - unsigned i, count; + NSCalendarDate *startDate, *endDate; + NSArray *attendees; + NSString *uid, *title, *location, *status; + NSNumber *sequence, *dateNumber; + id organizer; + id participants, partmails; + NSMutableString *partstates; + unsigned int i, count; + BOOL isAllDay; iCalAccessClass accessClass; if (_event == nil) return nil; /* extract values */ - - startDate = [_event startDate]; - endDate = [_event endDate]; - uid = [_event uid]; - title = [_event summary]; - location = [_event location]; - sequence = [_event sequence]; - accessClass = [_event symbolicAccessClass]; - status = [[_event status] uppercaseString]; + + startDate = [_event startDate]; + endDate = [_event endDate]; + uid = [_event uid]; + title = [_event summary]; + location = [_event location]; + sequence = [_event sequence]; + accessClass = [_event symbolicAccessClass]; + isAllDay = [_event isAllDay]; + status = [[_event status] uppercaseString]; - attendees = [_event attendees]; - partmails = [attendees valueForKey:@"rfc822Email"]; - partmails = [partmails componentsJoinedByString:@"\n"]; - participants = [attendees valueForKey:@"cn"]; - participants = [participants componentsJoinedByString:@"\n"]; + attendees = [_event attendees]; + partmails = [attendees valueForKey: @"rfc822Email"]; + partmails = [partmails componentsJoinedByString: @"\n"]; + participants = [attendees valueForKey: @"cn"]; + participants = [participants componentsJoinedByString: @"\n"]; /* build row */ row = [NSMutableDictionary dictionaryWithCapacity:8]; [row setObject: @"vevent" forKey: @"component"]; - + if ([uid isNotNull]) - [row setObject:uid forKey:@"uid"]; + [row setObject:uid forKey: @"uid"]; else - [self logWithFormat:@"WARNING: could not extract a uid from event!"]; + [self logWithFormat: @"WARNING: could not extract a uid from event!"]; - [row setObject:[NSNumber numberWithBool: [_event isAllDay]] + + [row setObject: [NSNumber numberWithBool: isAllDay] forKey: @"isallday"]; - [row setObject:[NSNumber numberWithBool: [_event isRecurrent]] + [row setObject: [NSNumber numberWithBool: [_event isRecurrent]] forKey: @"iscycle"]; - [row setObject:[NSNumber numberWithBool: [_event isOpaque]] + [row setObject: [NSNumber numberWithBool: [_event isOpaque]] forKey: @"isopaque"]; - [row setObject:[NSNumber numberWithInt: [_event priorityNumber]] + [row setObject: [NSNumber numberWithInt: [_event priorityNumber]] forKey: @"priority"]; - if ([title isNotNull]) [row setObject: title forKey:@"title"]; - if ([location isNotNull]) [row setObject: location forKey:@"location"]; - if ([sequence isNotNull]) [row setObject: sequence forKey:@"sequence"]; + if ([title isNotNull]) [row setObject: title forKey: @"title"]; + if ([location isNotNull]) [row setObject: location forKey: @"location"]; + if ([sequence isNotNull]) [row setObject: sequence forKey: @"sequence"]; if ([startDate isNotNull]) - [row setObject: [self numberForDate: startDate] forKey:@"startdate"]; + [row setObject: [self numberForDate: startDate] + forKey: @"startdate"]; if ([endDate isNotNull]) - [row setObject: [self numberForDate: endDate] forKey:@"enddate"]; + { + if (endDate == distantFuture) + dateNumber = distantFutureNumber; + else + { + if (isAllDay) + i = 1; + else + i = 0; + dateNumber + = [NSNumber numberWithUnsignedInt: + [endDate timeIntervalSince1970] - i]; + } + [row setObject: dateNumber forKey: @"enddate"]; + } + if ([_event isRecurrent]) { NSCalendarDate *date; - + date = [_event lastPossibleRecurrenceStartDate]; if (!date) { /* this could also be *nil*, but in the end it makes the fetchspecs - more complex - thus we set it to a "reasonable" distant future */ + more complex - thus we set it to a "reasonable" distant future */ date = distantFuture; } - [row setObject:[self numberForDate:date] forKey:@"cycleenddate"]; - [row setObject:[_event cycleInfo] forKey:@"cycleinfo"]; + [row setObject:[self numberForDate:date] forKey: @"cycleenddate"]; + [row setObject:[_event cycleInfo] forKey: @"cycleinfo"]; } if ([participants length] > 0) - [row setObject: participants forKey:@"participants"]; + [row setObject: participants forKey: @"participants"]; if ([partmails length] > 0) - [row setObject: partmails forKey:@"partmails"]; + [row setObject: partmails forKey: @"partmails"]; if ([status isNotNull]) { int code = 1; - - if ([status isEqualToString:@"TENTATIVE"]) + + if ([status isEqualToString: @"TENTATIVE"]) code = 2; - else if ([status isEqualToString:@"CANCELLED"]) + else if ([status isEqualToString: @"CANCELLED"]) code = 0; - [row setObject:[NSNumber numberWithInt:code] forKey:@"status"]; + [row setObject:[NSNumber numberWithInt:code] forKey: @"status"]; } else { /* confirmed by default */ @@ -160,26 +177,26 @@ static NSNumber *distantFutureNumber = nil; organizer = [_event organizer]; if (organizer) { NSString *email; - - email = [organizer valueForKey:@"rfc822Email"]; + + email = [organizer valueForKey: @"rfc822Email"]; if (email) - [row setObject:email forKey:@"orgmail"]; + [row setObject:email forKey: @"orgmail"]; } - + /* construct partstates */ - count = [attendees count]; - partstates = [[NSMutableString alloc] initWithCapacity:count * 2]; + count = [attendees count]; + partstates = [[NSMutableString alloc] initWithCapacity:count * 2]; for ( i = 0; i < count; i++) { - iCalPerson *p; + iCalPerson *p; iCalPersonPartStat stat; - - p = [attendees objectAtIndex:i]; + + p = [attendees objectAtIndex:i]; stat = [p participationStatus]; if(i != 0) - [partstates appendString:@"\n"]; - [partstates appendFormat:@"%d", stat]; + [partstates appendString: @"\n"]; + [partstates appendFormat: @"%d", stat]; } - [row setObject:partstates forKey:@"partstates"]; + [row setObject:partstates forKey: @"partstates"]; [partstates release]; return row; } @@ -187,35 +204,35 @@ static NSNumber *distantFutureNumber = nil; - (NSMutableDictionary *) extractQuickFieldsFromTodo: (iCalToDo *) _task { NSMutableDictionary *row; - NSCalendarDate *startDate, *dueDate; - NSArray *attendees; - NSString *uid, *title, *location, *status; - NSNumber *sequence; - id organizer, date; - id participants, partmails; - NSMutableString *partstates; - unsigned i, count, code; + NSCalendarDate *startDate, *dueDate; + NSArray *attendees; + NSString *uid, *title, *location, *status; + NSNumber *sequence; + id organizer, date; + id participants, partmails; + NSMutableString *partstates; + unsigned i, count, code; iCalAccessClass accessClass; if (_task == nil) return nil; /* extract values */ - - startDate = [_task startDate]; - dueDate = [_task due]; - uid = [_task uid]; - title = [_task summary]; - location = [_task location]; - sequence = [_task sequence]; - accessClass = [_task symbolicAccessClass]; - status = [[_task status] uppercaseString]; + + startDate = [_task startDate]; + dueDate = [_task due]; + uid = [_task uid]; + title = [_task summary]; + location = [_task location]; + sequence = [_task sequence]; + accessClass = [_task symbolicAccessClass]; + status = [[_task status] uppercaseString]; - attendees = [_task attendees]; - partmails = [attendees valueForKey:@"rfc822Email"]; - partmails = [partmails componentsJoinedByString:@"\n"]; - participants = [attendees valueForKey:@"cn"]; - participants = [participants componentsJoinedByString:@"\n"]; + attendees = [_task attendees]; + partmails = [attendees valueForKey: @"rfc822Email"]; + partmails = [partmails componentsJoinedByString: @"\n"]; + participants = [attendees valueForKey: @"cn"]; + participants = [participants componentsJoinedByString: @"\n"]; /* build row */ @@ -224,19 +241,19 @@ static NSNumber *distantFutureNumber = nil; [row setObject: @"vtodo" forKey: @"component"]; if ([uid isNotNull]) - [row setObject:uid forKey:@"uid"]; + [row setObject:uid forKey: @"uid"]; else - [self logWithFormat:@"WARNING: could not extract a uid from event!"]; + [self logWithFormat: @"WARNING: could not extract a uid from event!"]; [row setObject:[NSNumber numberWithBool:[_task isRecurrent]] - forKey:@"iscycle"]; + forKey: @"iscycle"]; [row setObject:[NSNumber numberWithInt:[_task priorityNumber]] - forKey:@"priority"]; + forKey: @"priority"]; - if ([title isNotNull]) [row setObject: title forKey:@"title"]; - if ([location isNotNull]) [row setObject: location forKey:@"location"]; - if ([sequence isNotNull]) [row setObject: sequence forKey:@"sequence"]; - + if ([title isNotNull]) [row setObject: title forKey: @"title"]; + if ([location isNotNull]) [row setObject: location forKey: @"location"]; + if ([sequence isNotNull]) [row setObject: sequence forKey: @"sequence"]; + if ([startDate isNotNull]) date = [self numberForDate: startDate]; else @@ -250,23 +267,23 @@ static NSNumber *distantFutureNumber = nil; [row setObject: date forKey: @"enddate"]; if ([participants length] > 0) - [row setObject:participants forKey:@"participants"]; + [row setObject:participants forKey: @"participants"]; if ([partmails length] > 0) - [row setObject:partmails forKey:@"partmails"]; + [row setObject:partmails forKey: @"partmails"]; if ([status isNotNull]) { code = 0; /* NEEDS-ACTION */ - if ([status isEqualToString:@"COMPLETED"]) + if ([status isEqualToString: @"COMPLETED"]) code = 1; - else if ([status isEqualToString:@"IN-PROCESS"]) + else if ([status isEqualToString: @"IN-PROCESS"]) code = 2; - else if ([status isEqualToString:@"CANCELLED"]) + else if ([status isEqualToString: @"CANCELLED"]) code = 3; - [row setObject: [NSNumber numberWithInt: code] forKey:@"status"]; + [row setObject: [NSNumber numberWithInt: code] forKey: @"status"]; } else { /* confirmed by default */ - [row setObject:[NSNumber numberWithInt:1] forKey:@"status"]; + [row setObject:[NSNumber numberWithInt:1] forKey: @"status"]; } [row setObject: [NSNumber numberWithUnsignedInt: accessClass] @@ -275,26 +292,26 @@ static NSNumber *distantFutureNumber = nil; organizer = [_task organizer]; if (organizer) { NSString *email; - - email = [organizer valueForKey:@"rfc822Email"]; + + email = [organizer valueForKey: @"rfc822Email"]; if (email) - [row setObject:email forKey:@"orgmail"]; + [row setObject:email forKey: @"orgmail"]; } - + /* construct partstates */ - count = [attendees count]; - partstates = [[NSMutableString alloc] initWithCapacity:count * 2]; + count = [attendees count]; + partstates = [[NSMutableString alloc] initWithCapacity:count * 2]; for ( i = 0; i < count; i++) { - iCalPerson *p; + iCalPerson *p; iCalPersonPartStat stat; - - p = [attendees objectAtIndex:i]; + + p = [attendees objectAtIndex:i]; stat = [p participationStatus]; if(i != 0) - [partstates appendString:@"\n"]; - [partstates appendFormat:@"%d", stat]; + [partstates appendString: @"\n"]; + [partstates appendFormat: @"%d", stat]; } - [row setObject:partstates forKey:@"partstates"]; + [row setObject:partstates forKey: @"partstates"]; [partstates release]; return row; } @@ -304,20 +321,20 @@ static NSNumber *distantFutureNumber = nil; NSArray *elements; CardGroup *element; unsigned int count; - + elements = [ical allObjects]; count = [elements count]; if (count) { if (count > 1) - [self logWithFormat: - @"WARNING: given calendar contains more than one event: %@", - ical]; + [self logWithFormat: + @"WARNING: given calendar contains more than one event: %@", + ical]; element = [elements objectAtIndex: 0]; } else { - [self logWithFormat:@"ERROR: given calendar contains no elements: %@", ical]; + [self logWithFormat: @"ERROR: given calendar contains no elements: %@", ical]; element = nil; } @@ -328,33 +345,33 @@ static NSNumber *distantFutureNumber = nil; NSAutoreleasePool *pool; NSDictionary *fields; id cal; - + if ([_content length] == 0) return nil; pool = [[NSAutoreleasePool alloc] init]; cal = [iCalCalendar parseSingleFromSource: _content]; - + fields = nil; if (cal) { if ([cal isKindOfClass:[iCalCalendar class]]) - cal = [self firstElementFromCalendar: cal]; + cal = [self firstElementFromCalendar: cal]; if ([cal isKindOfClass:[iCalEvent class]]) - fields = [[self extractQuickFieldsFromEvent:cal] retain]; + fields = [[self extractQuickFieldsFromEvent:cal] retain]; else if ([cal isKindOfClass:[iCalToDo class]]) - fields = [[self extractQuickFieldsFromTodo:cal] retain]; + fields = [[self extractQuickFieldsFromTodo:cal] retain]; else if ([cal isNotNull]) { - [self logWithFormat:@"ERROR: unexpected iCalendar parse result: %@", - cal]; + [self logWithFormat: @"ERROR: unexpected iCalendar parse result: %@", + cal]; } } else - [self logWithFormat:@"ERROR: parsing source didn't return anything"]; + [self logWithFormat: @"ERROR: parsing source didn't return anything"]; [pool release]; - + return [fields autorelease]; } From 5afdcba3976f1340f487ce030ed589bccbc7e75e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 12 Jun 2007 15:36:10 +0000 Subject: [PATCH 4/8] Monotone-Parent: 3a3e7e985adac6637eacd797235cdf6c4eae70cb Monotone-Revision: c0313f0b5f2d308876016aebbaf81c198b684173 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-12T15:36:10 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalMulticolumnDayView.h | 8 +- UI/Scheduler/UIxCalMulticolumnDayView.m | 123 ++++++++++++------------ 2 files changed, 64 insertions(+), 67 deletions(-) diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.h b/UI/Scheduler/UIxCalMulticolumnDayView.h index 2b915a56e..656ff4234 100644 --- a/UI/Scheduler/UIxCalMulticolumnDayView.h +++ b/UI/Scheduler/UIxCalMulticolumnDayView.h @@ -31,10 +31,10 @@ NSString *currentTableHour; NSMutableArray *subscriptionUsers; NSMutableArray *hoursToDisplay; - NSArray *allAppointments; +// NSArray *allAppointments; NSString *currentTableUser; - NSDictionary *currentAppointment; +// NSDictionary *currentAppointment; NSString *cssClass; NSString *cssId; @@ -50,8 +50,8 @@ - (void) setCurrentTableUser: (NSString *) aTableDay; - (NSString *) currentTableUser; -- (void) setCurrentAppointment: (NSDictionary *) newCurrentAppointment; -- (NSDictionary *) currentAppointment; +// - (void) setCurrentAppointment: (NSDictionary *) newCurrentAppointment; +// - (NSDictionary *) currentAppointment; @end diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.m b/UI/Scheduler/UIxCalMulticolumnDayView.m index 975d1c2d0..cabe13f87 100644 --- a/UI/Scheduler/UIxCalMulticolumnDayView.m +++ b/UI/Scheduler/UIxCalMulticolumnDayView.m @@ -38,13 +38,13 @@ { if ((self = [super init])) { - allAppointments = nil; +// allAppointments = nil; subscriptionUsers = nil; hoursToDisplay = nil; currentTableUser = nil; currentTableHour = nil; - dateFormatter = [[SOGoDateFormatter alloc] - initWithLocale: [self locale]]; +// dateFormatter = [[SOGoDateFormatter alloc] +// initWithLocale: [self locale]]; } return self; @@ -52,13 +52,10 @@ - (void) dealloc { - if (allAppointments) - [allAppointments release]; - if (subscriptionUsers) - [subscriptionUsers release]; - if (hoursToDisplay) - [hoursToDisplay release]; - [dateFormatter release]; +// [allAppointments release]; + [subscriptionUsers release]; + [hoursToDisplay release]; +// [dateFormatter release]; [super dealloc]; } @@ -189,69 +186,69 @@ /* fetching */ -- (NSCalendarDate *) startDate -{ - return [[self selectedDate] beginOfDay]; -} +// - (NSCalendarDate *) startDate +// { +// return [[self selectedDate] beginOfDay]; +// } -- (NSCalendarDate *) endDate -{ - return [[self selectedDate] endOfDay]; -} +// - (NSCalendarDate *) endDate +// { +// return [[self selectedDate] endOfDay]; +// } -- (NSArray *) appointmentsForCurrentUser -{ - NSMutableArray *filteredAppointments; - NSEnumerator *aptsEnumerator; - NSDictionary *userAppointment; - NSCalendarDate *start, *end; - int endHour; +// - (NSArray *) appointmentsForCurrentUser +// { +// NSMutableArray *filteredAppointments; +// NSEnumerator *aptsEnumerator; +// NSDictionary *userAppointment; +// NSCalendarDate *start, *end; +// int endHour; - if (!allAppointments) - { - allAppointments = [self fetchCoreAppointmentsInfos]; - [allAppointments retain]; - } +// if (!allAppointments) +// { +// allAppointments = [self fetchCoreAppointmentsInfos]; +// [allAppointments retain]; +// } - start = [[self selectedDate] hour: [self dayStartHour] minute: 0]; - endHour = [self dayEndHour]; - if (endHour < 24) - end = [[self selectedDate] hour: [self dayEndHour] minute: 59]; - else - end = [[[self selectedDate] tomorrow] hour: 0 minute: 0]; +// start = [[self selectedDate] hour: [self dayStartHour] minute: 0]; +// endHour = [self dayEndHour]; +// if (endHour < 24) +// end = [[self selectedDate] hour: [self dayEndHour] minute: 59]; +// else +// end = [[[self selectedDate] tomorrow] hour: 0 minute: 0]; - filteredAppointments = [NSMutableArray new]; - [filteredAppointments autorelease]; +// filteredAppointments = [NSMutableArray new]; +// [filteredAppointments autorelease]; - aptsEnumerator = [allAppointments objectEnumerator]; - userAppointment = [aptsEnumerator nextObject]; - while (userAppointment) - { - if ([[userAppointment objectForKey: @"owner"] - isEqualToString: currentTableUser]) - [filteredAppointments - addObject: [self _adjustedAppointment: userAppointment - forStart: start andEnd: end]]; - userAppointment = [aptsEnumerator nextObject]; - } +// aptsEnumerator = [allAppointments objectEnumerator]; +// userAppointment = [aptsEnumerator nextObject]; +// while (userAppointment) +// { +// if ([[userAppointment objectForKey: @"owner"] +// isEqualToString: currentTableUser]) +// [filteredAppointments +// addObject: [self _adjustedAppointment: userAppointment +// forStart: start andEnd: end]]; +// userAppointment = [aptsEnumerator nextObject]; +// } - return filteredAppointments; -} +// return filteredAppointments; +// } -- (void) setCurrentAppointment: (NSDictionary *) newCurrentAppointment -{ - currentAppointment = newCurrentAppointment; -} +// - (void) setCurrentAppointment: (NSDictionary *) newCurrentAppointment +// { +// currentAppointment = newCurrentAppointment; +// } -- (NSDictionary *) currentAppointment -{ - return currentAppointment; -} +// - (NSDictionary *) currentAppointment +// { +// return currentAppointment; +// } -- (NSString *) appointmentsClasses -{ - return @"appointments appointmentsFor1Days"; -} +// - (NSString *) appointmentsClasses +// { +// return @"appointments appointmentsFor1Days"; +// } - (NSString *) currentUserClasses { From 444a28376dcf74f967aec5f3d9052506ef1f4907 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 12 Jun 2007 15:36:43 +0000 Subject: [PATCH 5/8] Monotone-Parent: c0313f0b5f2d308876016aebbaf81c198b684173 Monotone-Revision: 7821d954a61c74202db6dc567f80fc43d2004466 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-12T15:36:43 Monotone-Branch: ca.inverse.sogo --- UI/Templates/SchedulerUI/UIxCalMonthView.wox | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox index 4ef911bc5..bbed4037a 100644 --- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox @@ -55,7 +55,7 @@