Monotone-Parent: b7a1e396102e13dee6268bd787a8ea064068b056
Monotone-Revision: 8a5f1ab2b6e48cb383ec88a048e8b1985640a5ec Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-11-07T16:15:20 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
01198ff17e
commit
b66e0e0115
|
@ -1,5 +1,9 @@
|
||||||
2006-11-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2006-11-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
|
||||||
|
-newStartDate]): new method to determine the start date depending
|
||||||
|
on the URL parameters, the current day and the current time.
|
||||||
|
|
||||||
* UI/Scheduler/UIxTimeDateControl.m ([UIxTimeDateControl
|
* UI/Scheduler/UIxTimeDateControl.m ([UIxTimeDateControl
|
||||||
-setDayStartHour:aStartHour]): adjust the minutes to the next
|
-setDayStartHour:aStartHour]): adjust the minutes to the next
|
||||||
quarter of hour, if not already set to a quarter.
|
quarter of hour, if not already set to a quarter.
|
||||||
|
|
|
@ -92,6 +92,8 @@
|
||||||
- (void) setICalString: (NSString *) _s;
|
- (void) setICalString: (NSString *) _s;
|
||||||
- (NSString *) iCalString;
|
- (NSString *) iCalString;
|
||||||
|
|
||||||
|
- (NSCalendarDate *) newStartDate;
|
||||||
|
|
||||||
- (void) setStartDate: (NSCalendarDate *) _date;
|
- (void) setStartDate: (NSCalendarDate *) _date;
|
||||||
- (NSCalendarDate *) startDate;
|
- (NSCalendarDate *) startDate;
|
||||||
|
|
||||||
|
|
|
@ -556,7 +556,7 @@
|
||||||
iCalPerson *p;
|
iCalPerson *p;
|
||||||
NSString *emailProp;
|
NSString *emailProp;
|
||||||
|
|
||||||
emailProp = [@"mailto:" stringByAppendingString:[self emailForUser]];
|
emailProp = [@"MAILTO:" stringByAppendingString:[self emailForUser]];
|
||||||
p = [[[iCalPerson alloc] init] autorelease];
|
p = [[[iCalPerson alloc] init] autorelease];
|
||||||
[p setEmail:emailProp];
|
[p setEmail:emailProp];
|
||||||
[p setCn:[self cnForUser]];
|
[p setCn:[self cnForUser]];
|
||||||
|
@ -597,6 +597,33 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* subclasses */
|
/* subclasses */
|
||||||
|
- (NSCalendarDate *) newStartDate
|
||||||
|
{
|
||||||
|
NSCalendarDate *newStartDate, *now;
|
||||||
|
BOOL hmSpecified;
|
||||||
|
int hour;
|
||||||
|
|
||||||
|
newStartDate = [self selectedDate];
|
||||||
|
hmSpecified = ([[self queryParameterForKey: @"hm"] length] > 0);
|
||||||
|
if (!hmSpecified)
|
||||||
|
{
|
||||||
|
now = [NSCalendarDate calendarDate];
|
||||||
|
[now setTimeZone: [[self clientObject] userTimeZone]];
|
||||||
|
if (!([[now hour: 8 minute: 0] earlierDate: newStartDate] == newStartDate))
|
||||||
|
{
|
||||||
|
hour = [now hourOfDay];
|
||||||
|
if (hour < 8)
|
||||||
|
newStartDate = [now hour: 8 minute: 0];
|
||||||
|
else if (hour > 18)
|
||||||
|
newStartDate = [[now tomorrow] hour: 8 minute: 0];
|
||||||
|
else
|
||||||
|
newStartDate = now;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return newStartDate;
|
||||||
|
}
|
||||||
|
|
||||||
- (void) loadValuesFromComponent: (iCalRepeatableEntityObject *) component
|
- (void) loadValuesFromComponent: (iCalRepeatableEntityObject *) component
|
||||||
{
|
{
|
||||||
iCalRecurrenceRule *rrule;
|
iCalRecurrenceRule *rrule;
|
||||||
|
@ -609,9 +636,9 @@
|
||||||
startDate = [component startDate];
|
startDate = [component startDate];
|
||||||
// if ((startDate = [component startDate]) == nil)
|
// if ((startDate = [component startDate]) == nil)
|
||||||
// startDate = [[NSCalendarDate date] hour:11 minute:0];
|
// startDate = [[NSCalendarDate date] hour:11 minute:0];
|
||||||
|
uTZ = [co userTimeZone];
|
||||||
if (startDate)
|
if (startDate)
|
||||||
{
|
{
|
||||||
uTZ = [co userTimeZone];
|
|
||||||
[startDate setTimeZone: uTZ];
|
[startDate setTimeZone: uTZ];
|
||||||
[startDate retain];
|
[startDate retain];
|
||||||
}
|
}
|
||||||
|
@ -655,7 +682,7 @@
|
||||||
- (NSString *) iCalParticipantsStringFromQueryParameters
|
- (NSString *) iCalParticipantsStringFromQueryParameters
|
||||||
{
|
{
|
||||||
static NSString *iCalParticipantString = \
|
static NSString *iCalParticipantString = \
|
||||||
@"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;CN=\"%@\":mailto:%@\r\n";
|
@"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;CN=\"%@\":MAILTO:%@\r\n";
|
||||||
|
|
||||||
return [self iCalStringFromQueryParameter: @"ps"
|
return [self iCalStringFromQueryParameter: @"ps"
|
||||||
format: iCalParticipantString];
|
format: iCalParticipantString];
|
||||||
|
@ -664,7 +691,7 @@
|
||||||
- (NSString *) iCalResourcesStringFromQueryParameters
|
- (NSString *) iCalResourcesStringFromQueryParameters
|
||||||
{
|
{
|
||||||
static NSString *iCalResourceString = \
|
static NSString *iCalResourceString = \
|
||||||
@"ATTENDEE;ROLE=NON-PARTICIPANT;CN=\"%@\":mailto:%@\r\n";
|
@"ATTENDEE;ROLE=NON-PARTICIPANT;CN=\"%@\":MAILTO:%@\r\n";
|
||||||
|
|
||||||
return [self iCalStringFromQueryParameter: @"rs"
|
return [self iCalStringFromQueryParameter: @"rs"
|
||||||
format: iCalResourceString];
|
format: iCalResourceString];
|
||||||
|
@ -699,7 +726,7 @@
|
||||||
|
|
||||||
- (NSString *) iCalOrganizerString
|
- (NSString *) iCalOrganizerString
|
||||||
{
|
{
|
||||||
return [NSString stringWithFormat: @"ORGANIZER;CN=\"%@\":mailto:%@\r\n",
|
return [NSString stringWithFormat: @"ORGANIZER;CN=\"%@\":MAILTO:%@\r\n",
|
||||||
[self cnForUser], [self emailForUser]];
|
[self cnForUser], [self emailForUser]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue