git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1045 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / Scheduler / UIxAppointmentProposal.m

diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m
index d540e2ff5bae8a2b9d5fe00729d571ac11cff996..f81d87eba8e784222ef7fcfc9d786febacb053db 100644 (file)
--- a/UI/Scheduler/UIxAppointmentProposal.m
+++ b/UI/Scheduler/UIxAppointmentProposal.m
@@ -57,7 +57,7 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoFreeBusyObject.h>
 #include <NGExtensions/NGCalendarDateRange.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "common.h"
 
 @implementation UIxAppointmentProposal
@@ -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 viewTimeZone]];
+                        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 viewTimeZone]];
+                        timeZone: timeZone];
 }
 
 - (void)setDuration:(id)_duration {
@@ -273,28 +287,31 @@
   // TODO: from startdate to enddate
   NSMutableArray *ma;
   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:[self viewTimeZone]];
+                        timeZone: timeZone];
   stop = [NSCalendarDate dateWithYear:[[self endDateYear] intValue]
                         month:[[self endDateMonth] intValue]
                         day:[[self endDateDay] intValue]
                         hour:12 minute:0 second:0
-                        timeZone:[self viewTimeZone]];
-  
-  ma = [NSMutableArray arrayWithCapacity:16];
+                        timeZone: timeZone];
+  ma = [NSMutableArray arrayWithCapacity: 16];
   
   current = base;
-  while ([current compare:stop] != NSOrderedDescending) {
-    [current setTimeZone:[self viewTimeZone]];
-    [ma addObject:current];
+  while ([current compare:stop] != NSOrderedDescending)
+    {
+      [current setTimeZone: timeZone];
+      [ma addObject:current];
     
     /* Note: remember the timezone behaviour of the method below! */
-    current = [current dateByAddingYears:0 months:0 days:1];
-  }
+      current = [current dateByAddingYears:0 months:0 days:1];
+    }
+
   return ma;
 }
 
@@ -323,6 +340,7 @@
 - (BOOL)isSlotRangeGreen:(NGCalendarDateRange *)_slotRange {
   NGCalendarDateRange *aptRange;
   NSCalendarDate *aptStartDate, *aptEndDate;
+  NSTimeZone *timeZone;
 
   if (_slotRange == nil)
     return NO;
@@ -334,8 +352,9 @@
   aptEndDate   = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
                                           [aptStartDate timeIntervalSince1970]
                                         + [self durationAsTimeInterval]];
-  [aptStartDate setTimeZone:[self viewTimeZone]];
-  [aptEndDate   setTimeZone:[self viewTimeZone]];
+  timeZone = [[context activeUser] timeZone];
+  [aptStartDate setTimeZone: timeZone];
+  [aptEndDate   setTimeZone: timeZone];
   aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStartDate
                                  endDate:aptEndDate];
   [aptEndDate release]; aptEndDate = nil;
@@ -416,7 +435,7 @@
     
     fb    = [fbos objectAtIndex:i];
     if (fb != (SOGoFreeBusyObject *)[NSNull null]) {
-      infos = [fb fetchFreebusyInfosFrom:[self startDate] to:[self endDate]];
+      infos = [fb fetchFreeBusyInfosFrom:[self startDate] to:[self endDate]];
       [allInfos addObjectsFromArray:infos];
     }
   }