From 3360587b41cd0534ecf4a99bc3868c1a8cecf471 Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 25 Aug 2004 13:43:51 +0000 Subject: [PATCH] bugfix for proposal git-svn-id: http://svn.opengroupware.org/SOGo/trunk@267 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Scheduler/ChangeLog | 3 +++ SOGo/UI/Scheduler/UIxAppointmentProposal.m | 11 ++++++----- SOGo/UI/Scheduler/Version | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 7db31e9e..2993902d 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,5 +1,8 @@ 2004-08-25 Marcus Mueller + * 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 99858480..fdeee2a6 100644 --- 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 daa21696..a03b5ec4 100644 --- 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 -- 2.39.5