From 01198ff17eb773fc1757e2c5417ffb9b0c290fe8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 7 Nov 2006 16:14:19 +0000 Subject: [PATCH] Monotone-Parent: f0e01017c45580ffb00a3ec0ea376689e815bd26 Monotone-Revision: b7a1e396102e13dee6268bd787a8ea064068b056 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-11-07T16:14:19 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Scheduler/UIxTimeDateControl.m | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e10cd791c..a5dc22f30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-11-07 Wolfgang Sourdeau + * UI/Scheduler/UIxTimeDateControl.m ([UIxTimeDateControl + -setDayStartHour:aStartHour]): adjust the minutes to the next + quarter of hour, if not already set to a quarter. + * UI/WebServerResources/UIxAppointmentEditor.js, UI/WebServerResources/UIxTaskEditor.js: added code to manage start date change. diff --git a/UI/Scheduler/UIxTimeDateControl.m b/UI/Scheduler/UIxTimeDateControl.m index 469e63301..9c5e315b4 100644 --- a/UI/Scheduler/UIxTimeDateControl.m +++ b/UI/Scheduler/UIxTimeDateControl.m @@ -70,13 +70,17 @@ } - (void)setDate:(NSCalendarDate *)_date { + int minuteValue; if (!_date) _date = [NSCalendarDate date]; [_date setTimeZone: [[self clientObject] userTimeZone]]; [self _setDate: _date]; + minuteValue = [_date minuteOfHour]; + if (minuteValue % 15) + minuteValue += 15 - (minuteValue % 15); [self setHour: [NSNumber numberWithInt: [_date hourOfDay]]]; - [self setMinute: [NSNumber numberWithInt: [_date minuteOfHour]]]; + [self setMinute: [NSNumber numberWithInt: minuteValue]]; [self setYear: [NSNumber numberWithInt: [_date yearOfCommonEra]]]; [self setMonth: [NSNumber numberWithInt: [_date monthOfYear]]]; [self setDay: [NSNumber numberWithInt: [_date dayOfMonth]]];