bugfix for proposal

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 7db31e9e377a099543596d264f998491d61e22af..2993902d5fbaf13ebe9363f6a49f08a21a8c2d38 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-25  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * UIxAppointmentProposal.m: changed -isSecondHalfGreen and
+         -isSlotRangeGreen due to a bugfix in NGExtensions (v0.9.70)
+
        * v0.9.69
 
        * UIxAppointmentProposal.m: completed edit functionality. Resources and

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 99858480481acc02eb613dcd1c4cfec78173ae36..fdeee2a63d2a9a3916b51e1fde9d450e5439cad5 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -310,9 +310,10 @@
   
   idx = [self->blockedRanges indexOfFirstIntersectingDateRange:_range];
   if (idx != NSNotFound) {
-    [self debugWithFormat:@"blocked range:\n  range: %@\n  block: %@", 
+    [self debugWithFormat:@"blocked range:\n  range: %@\n  block: %@\nintersection:%@", 
            _range,
-           [self->blockedRanges objectAtIndex:idx]];
+           [self->blockedRanges objectAtIndex:idx],
+      [_range intersectionDateRange:[self->blockedRanges objectAtIndex:idx]]];
   }
   
   return idx == NSNotFound ? YES : NO;
@@ -330,7 +331,7 @@
   aptStartDate = [_slotRange startDate];
   aptEndDate   = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
                                           [aptStartDate timeIntervalSince1970]
-                                        + [self durationAsTimeInterval] - 1];
+                                        + [self durationAsTimeInterval]];
   [aptStartDate setTimeZone:[self viewTimeZone]];
   [aptEndDate   setTimeZone:[self viewTimeZone]];
   aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStartDate
@@ -355,8 +356,8 @@
   NSCalendarDate *from, *to;
   NGCalendarDateRange *range;
 
-  from  = [self->currentDay hour:[[self item] intValue] minute:30];
-  to    = [self->currentDay hour:[[self item] intValue] minute:59];
+  from  = [self->currentDay hour:[[self item] intValue]     minute:30];
+  to    = [self->currentDay hour:[[self item] intValue] + 1 minute:0];
   range = [NGCalendarDateRange calendarDateRangeWithStartDate:from endDate:to];
   return [self isSlotRangeGreen:range];
 }

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index daa21696827167923d01d2affb2871a4720ec3b5..a03b5ec4a13c6486920a23a5aa34ff9ba2f843a2 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,7 +1,8 @@
 # $Id$
 
-SUBMINOR_VERSION:=69
+SUBMINOR_VERSION:=70
 
+# v0.9.70 requires libNGExtensions v4.3.107
 # v0.9.67 requires SOPE 4.3
 # v0.9.61 requires libNGExtensions v4.2.102
 # v0.9.41 requires libNGObjWeb     v4.2.431