amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: c33c456b52c6e6d4ee1f29bfd9ca57096b8d13be

Browse Source 
Monotone-Revision: 5539e3c473023281dd04f7cb8a8fee051ac0735d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-11T19:08:58
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-04-11 19:08:58 +00:00
parent 828d3b2818
commit e09ac2e383
32 changed files with 350 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxTaskProposal.m
+53 -30
View File
@@ -170,30 +170,44 @@
[self setStartDateMonth:[NSNumber numberWithInt:[_date monthOfYear]]];
[self setStartDateYear:[NSNumber numberWithInt:[_date yearOfCommonEra]]];
}
- (NSCalendarDate *)startDate {
- (NSCalendarDate *) startDate
{
NSTimeZone *timeZone;
timeZone = [[context activeUser] timeZone];
return [NSCalendarDate dateWithYear:[[self startDateYear] intValue]
month:[[self startDateMonth] intValue]
day:[[self startDateDay] intValue]
hour:[[self startDateHour] intValue]
minute:[[self startDateMinute] intValue]
second:0
timeZone:[[self clientObject] userTimeZone]];
timeZone: timeZone];
}
- (void)setEndDate:(NSCalendarDate *)_date {
- (void) setEndDate: (NSCalendarDate *) _date
{
[self setEndDateHour:[NSNumber numberWithInt:[_date hourOfDay]]];
[self setEndDateMinute:[NSNumber numberWithInt:[_date minuteOfHour]]];
[self setEndDateDay:[NSNumber numberWithInt:[_date dayOfMonth]]];
[self setEndDateMonth:[NSNumber numberWithInt:[_date monthOfYear]]];
[self setEndDateYear:[NSNumber numberWithInt:[_date yearOfCommonEra]]];
}
- (NSCalendarDate *)endDate {
- (NSCalendarDate *) endDate
{
NSTimeZone *timeZone;
timeZone = [[context activeUser] timeZone];
return [NSCalendarDate dateWithYear:[[self endDateYear] intValue]
month:[[self endDateMonth] intValue]
day:[[self endDateDay] intValue]
hour:[[self endDateHour] intValue]
minute:[[self endDateMinute] intValue]
second:59
timeZone:[[self clientObject] userTimeZone]];
timeZone: timeZone];
}
- (void)setDuration:(id)_duration {
@@ -269,32 +283,36 @@
return ma;
}
- (NSArray *)days {
- (NSArray *) days
{
// TODO: from startdate to enddate
NSMutableArray *ma;
NSCalendarDate *base, *stop, *current;
base = [NSCalendarDate dateWithYear:[[self startDateYear] intValue]
month:[[self startDateMonth] intValue]
day:[[self startDateDay] intValue]
hour:12 minute:0 second:0
timeZone:[[self clientObject] userTimeZone]];
stop = [NSCalendarDate dateWithYear:[[self endDateYear] intValue]
month:[[self endDateMonth] intValue]
day:[[self endDateDay] intValue]
hour:12 minute:0 second:0
timeZone:[[self clientObject] userTimeZone]];
NSCalendarDate *base, *stop, *current;
NSTimeZone *timeZone;
timeZone = [[context activeUser] timeZone];
base = [NSCalendarDate dateWithYear: [[self startDateYear] intValue]
month: [[self startDateMonth] intValue]
day: [[self startDateDay] intValue]
hour: 12 minute: 0 second: 0
timeZone: timeZone];
stop = [NSCalendarDate dateWithYear: [[self endDateYear] intValue]
month: [[self endDateMonth] intValue]
day: [[self endDateDay] intValue]
hour: 12 minute: 0 second: 0
timeZone: timeZone];
ma = [NSMutableArray arrayWithCapacity:16];
current = base;
while ([current compare:stop] != NSOrderedDescending) {
[current setTimeZone:[[self clientObject] userTimeZone]];
[current setTimeZone: timeZone];
[ma addObject:current];
/* Note: remember the timezone behaviour of the method below! */
current = [current dateByAddingYears:0 months:0 days:1];
}
return ma;
}
@@ -320,27 +338,32 @@
return idx == NSNotFound ? YES : NO;
}
- (BOOL)isSlotRangeGreen:(NGCalendarDateRange *)_slotRange {
- (BOOL)isSlotRangeGreen: (NGCalendarDateRange *) _slotRange
{
NGCalendarDateRange *aptRange;
NSCalendarDate *aptStartDate, *aptEndDate;
NSTimeZone *timeZone;
if (_slotRange == nil)
return NO;
timeZone = [[context activeUser] timeZone];
/* calculate the interval requested by the user (can be larger) */
aptStartDate = [_slotRange startDate];
// TODO: gives warning on MacOSX
aptEndDate = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
[aptStartDate timeIntervalSince1970]
+ [self durationAsTimeInterval]];
[aptStartDate setTimeZone:[[self clientObject] userTimeZone]];
[aptEndDate setTimeZone:[[self clientObject] userTimeZone]];
aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStartDate
endDate:aptEndDate];
[aptEndDate release]; aptEndDate = nil;
aptEndDate
= [[NSCalendarDate alloc]
initWithTimeIntervalSince1970: ([aptStartDate timeIntervalSince1970]
+ [self durationAsTimeInterval])];
[aptStartDate setTimeZone: timeZone];
[aptEndDate setTimeZone: timeZone];
aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate: aptStartDate
endDate: aptEndDate];
[aptEndDate release];
aptEndDate = nil;
return [self isRangeGreen:aptRange];
return [self isRangeGreen: aptRange];
}
- (BOOL)isFirstHalfGreen {