git-svn-id: http://svn.opengroupware.org/SOGo/trunk@261 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 3794674c07ff2b2cd99a39ca0b2b3406ffbd7dfd..f89b442d41ce56e56a24c8bcc72906eab96d7275 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,8 +1,10 @@
-2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+2004-08-16  Helge Hess  <helge.hess@skyrix.com>
 
-       * v0.9.64
+       * UIxAppointmentProposal.m: small bugfix to range processing (v0.9.65)
+
+2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * UIxTimeDateControl.m: removed a debug log.
+       * UIxTimeDateControl.m: removed a debug log. (v0.9.64)
 
        * v0.9.63
 

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 85e15b5b2ec81cc57f70262098ea5a4e01f89e84..39996737f367ec8b71e83eb266bdae923990f8b1 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -280,6 +280,7 @@
   
   current = base;
   while ([current compare:stop] != NSOrderedDescending) {
+    [current setTimeZone:[self viewTimeZone]];
     [ma addObject:current];
     
     /* Note: remember the timezone behaviour of the method below! */
@@ -298,12 +299,15 @@
 
 - (BOOL)isRangeGreen:(NGCalendarDateRange *)_range {
   unsigned idx;
-
+  
   idx = [self->blockedRanges indexOfFirstIntersectingDateRange:_range];
-  if (idx != NSNotFound)
-    return NO;
+  if (idx != NSNotFound) {
+    [self debugWithFormat:@"blocked range:\n  range: %@\n  block: %@", 
+           _range,
+           [self->blockedRanges objectAtIndex:idx]];
+  }
   
-  return YES;
+  return idx == NSNotFound ? YES : NO;
 }
 
 - (BOOL)isSlotRangeGreen:(NGCalendarDateRange *)_slotRange {
@@ -318,7 +322,7 @@
   aptStartDate = [_slotRange startDate];
   aptEndDate   = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
                                           [aptStartDate timeIntervalSince1970]
-                                        + [self durationAsTimeInterval]];
+                                        + [self durationAsTimeInterval] - 1];
   [aptStartDate setTimeZone:[self viewTimeZone]];
   [aptEndDate   setTimeZone:[self viewTimeZone]];
   aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStartDate

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index fccd3799b564264f97af27426dfa969be02ac221..7f555bc74aa06cb31ae63affe33750fd515c3068 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=64
+SUBMINOR_VERSION:=65
 
 # v0.9.61 requires libNGExtensions v4.2.102
 # v0.9.41 requires libNGObjWeb     v4.2.431