diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 1615e9fbe..e672bd151 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -404,7 +404,7 @@ else [self setIsCycleEndUntil]; - [until setTimeZone:[self viewTimeZone]]; + [until setTimeZone:[[self clientObject] userTimeZone]]; [self setCycleUntilDate:until]; } @@ -695,7 +695,7 @@ date = [NSCalendarDate dateWithString:_str calendarFormat:@"%Y-%m-%d %H:%M %Z"]; - [date setTimeZone:[self backendTimeZone]]; + [date setTimeZone:[[self clientObject] serverTimeZone]]; return date; } @@ -775,8 +775,8 @@ endDate = [[startDate hour:[startDate hourOfDay] + 1 minute:0] copy]; } - [startDate setTimeZone:[self viewTimeZone]]; - [endDate setTimeZone:[self viewTimeZone]]; + [startDate setTimeZone:[[self clientObject] userTimeZone]]; + [endDate setTimeZone:[[self clientObject] userTimeZone]]; title = [[_appointment summary] copy]; location = [[_appointment location] copy]; @@ -787,7 +787,7 @@ participants = [[_appointment participants] retain]; resources = [[_appointment resources] retain]; - NSLog (@"summary יאט: '%@'", title); +// NSLog (@"summary יאט: '%@'", title); s = [_appointment accessClass]; if(!s || [s isEqualToString:@"PUBLIC"]) diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m index d540e2ff5..4f180d834 100644 --- a/UI/Scheduler/UIxAppointmentProposal.m +++ b/UI/Scheduler/UIxAppointmentProposal.m @@ -177,7 +177,7 @@ hour:[[self startDateHour] intValue] minute:[[self startDateMinute] intValue] second:0 - timeZone:[self viewTimeZone]]; + timeZone:[[self clientObject] userTimeZone]]; } - (void)setEndDate:(NSCalendarDate *)_date { [self setEndDateHour:[NSNumber numberWithInt:[_date hourOfDay]]]; @@ -193,7 +193,7 @@ hour:[[self endDateHour] intValue] minute:[[self endDateMinute] intValue] second:59 - timeZone:[self viewTimeZone]]; + timeZone:[[self clientObject] userTimeZone]]; } - (void)setDuration:(id)_duration { @@ -278,18 +278,18 @@ month:[[self startDateMonth] intValue] day:[[self startDateDay] intValue] hour:12 minute:0 second:0 - timeZone:[self viewTimeZone]]; + 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 viewTimeZone]]; + timeZone:[[self clientObject] userTimeZone]]; ma = [NSMutableArray arrayWithCapacity:16]; current = base; while ([current compare:stop] != NSOrderedDescending) { - [current setTimeZone:[self viewTimeZone]]; + [current setTimeZone:[[self clientObject] userTimeZone]]; [ma addObject:current]; /* Note: remember the timezone behaviour of the method below! */ @@ -334,8 +334,8 @@ aptEndDate = [[NSCalendarDate alloc] initWithTimeIntervalSince1970: [aptStartDate timeIntervalSince1970] + [self durationAsTimeInterval]]; - [aptStartDate setTimeZone:[self viewTimeZone]]; - [aptEndDate setTimeZone:[self viewTimeZone]]; + [aptStartDate setTimeZone:[[self clientObject] userTimeZone]]; + [aptEndDate setTimeZone:[[self clientObject] userTimeZone]]; aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStartDate endDate:aptEndDate]; [aptEndDate release]; aptEndDate = nil; diff --git a/UI/Scheduler/UIxAppointmentView.m b/UI/Scheduler/UIxAppointmentView.m index b8c5730f5..aef7ef5e3 100644 --- a/UI/Scheduler/UIxAppointmentView.m +++ b/UI/Scheduler/UIxAppointmentView.m @@ -97,7 +97,7 @@ NSCalendarDate *date; date = [[self appointment] startDate]; - [date setTimeZone:[self viewTimeZone]]; + [date setTimeZone:[[self clientObject] userTimeZone]]; return date; } @@ -105,7 +105,7 @@ NSCalendarDate *date; date = [[self appointment] endDate]; - [date setTimeZone:[self viewTimeZone]]; + [date setTimeZone:[[self clientObject] userTimeZone]]; return date; } diff --git a/UI/Scheduler/UIxCalAptListView.m b/UI/Scheduler/UIxCalAptListView.m index 6d1d30d7c..b6904cdb5 100644 --- a/UI/Scheduler/UIxCalAptListView.m +++ b/UI/Scheduler/UIxCalAptListView.m @@ -129,7 +129,7 @@ date = [NSCalendarDate dateWithTimeIntervalSince1970: [[currentAppointment objectForKey: @"startdate"] intValue]]; - [date setTimeZone: [self viewTimeZone]]; + [date setTimeZone: [[self clientObject] userTimeZone]]; return [[self itemDateFormatter] stringForObjectValue: date]; } @@ -141,7 +141,7 @@ date = [NSCalendarDate dateWithTimeIntervalSince1970: [[currentAppointment objectForKey: @"enddate"] intValue]]; - [date setTimeZone: [self viewTimeZone]]; + [date setTimeZone: [[self clientObject] userTimeZone]]; return [[self itemDateFormatter] stringForObjectValue: date]; } diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m index 6a0958796..e61fe536c 100644 --- a/UI/Scheduler/UIxCalDateSelector.m +++ b/UI/Scheduler/UIxCalDateSelector.m @@ -33,7 +33,7 @@ - (void) setSelectedDate: (NSCalendarDate *) _date { ASSIGN (selectedDate, _date); - [selectedDate setTimeZone: [self viewTimeZone]]; + [selectedDate setTimeZone: [[self clientObject] userTimeZone]]; } - (NSCalendarDate *) selectedDate diff --git a/UI/Scheduler/UIxCalInlineMonthOverview.m b/UI/Scheduler/UIxCalInlineMonthOverview.m index 57bdba04f..87d11a8ec 100644 --- a/UI/Scheduler/UIxCalInlineMonthOverview.m +++ b/UI/Scheduler/UIxCalInlineMonthOverview.m @@ -52,7 +52,7 @@ /* binding accessors */ - (void)setSelectedDate:(NSCalendarDate *)_date { - [_date setTimeZone:[self viewTimeZone]]; + [_date setTimeZone:[[self clientObject] userTimeZone]]; ASSIGN(self->selectedDate, _date); } - (NSCalendarDate *)selectedDate { diff --git a/UI/Scheduler/UIxCalMonthPrintview.m b/UI/Scheduler/UIxCalMonthPrintview.m index 841f59622..88872aaf4 100644 --- a/UI/Scheduler/UIxCalMonthPrintview.m +++ b/UI/Scheduler/UIxCalMonthPrintview.m @@ -47,10 +47,10 @@ canAccessApt = [self canAccessApt]; spansRange = NO; startDate = [apt valueForKey:@"startDate"]; - [startDate setTimeZone:[self viewTimeZone]]; + [startDate setTimeZone:[[self clientObject] userTimeZone]]; endDate = [apt valueForKey:@"endDate"]; if(endDate != nil) { - [endDate setTimeZone:[self viewTimeZone]]; + [endDate setTimeZone:[[self clientObject] userTimeZone]]; spansRange = ![endDate isEqualToDate:startDate]; }