Monotone-Parent: 4de8470166df292fcd9ceff9ebe9f6837f051a3e

Monotone-Revision: b0e1ac9e028f296dd60f8db6aff67c520b3f1fea

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-05T16:55:26
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalListingActions.m

@@ -1218,7 +1218,7 @@ _computeBlocksPosition (NSArray *blocks)
   NSMutableDictionary *rc;
   int direction, count, blockDuration, step;
   unsigned int **fbData;
-  BOOL isAllDay = NO;
+  BOOL isAllDay = NO, onlyOfficeHours = YES;
 
   r = [context request];
   rc = nil;
@@ -1227,6 +1227,7 @@ _computeBlocksPosition (NSArray *blocks)
   if ([uids count] > 0)
     {
       isAllDay = [[r formValueForKey: @"isAllDay"] boolValue];
+      onlyOfficeHours = [[r formValueForKey: @"onlyOfficeHours"] boolValue];
       direction = [[r formValueForKey: @"direction"] intValue];
       limits = [self _loadScheduleLimitsForUsers: uids];
       
@@ -1251,9 +1252,10 @@ _computeBlocksPosition (NSArray *blocks)
            count += step)
         {
           //NSLog (@"Trying %@ -> %@", nStart, nEnd);
-          if ([self _validateStart: nStart 
-                            andEnd: nEnd 
-                           against: limits])
+          if ((onlyOfficeHours && [self _validateStart: nStart 
+                                                andEnd: nEnd 
+                                               against: limits]) 
+              || !onlyOfficeHours)
             {
               //NSLog (@"valid");
               if ([self _possibleBlock: count