From c1e77f441d87a14c578b2a070b0a334d8ef77482 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Oct 2006 16:35:30 +0000 Subject: [PATCH] Monotone-Parent: d437e557ba061f106fd0db804a748fcc43343cad Monotone-Revision: 2a7c60a2ee3b528beed93ea6fa36231b661edfae Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-26T16:35:30 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/MainUI/SOGoUserHomePage.m | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b444eb5a3..5ae001467 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-10-26 Wolfgang Sourdeau + * UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage + -_freeBusyAsText]): added handling of an "additional"-named query + parameter that describe the number of additional days after + enddate that should be returned. + * UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView -_responseForResults:results]): give priority to results with "c_uid" fields. If none returned, use the first contact received. diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 300e369bb..b44c607e8 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -301,7 +301,7 @@ static NSArray *internetAccessStates = nil; { SOGoFreeBusyObject *co; NSCalendarDate *startDate, *endDate; - NSString *queryDay; + NSString *queryDay, *additionalDays; NSTimeZone *uTZ; co = [self clientObject]; @@ -326,8 +326,12 @@ static NSArray *internetAccessStates = nil; inTimeZone: uTZ]; else endDate = [startDate hour: 23 minute: 59]; - endDate = [endDate dateByAddingYears: 0 months: 0 days: 2 - hours: 0 minutes: 0 seconds: 0]; + + additionalDays = [self queryParameterForKey: @"additional"]; + if ([additionalDays length] > 0) + endDate = [endDate dateByAddingYears: 0 months: 0 + days: [additionalDays intValue] + hours: 0 minutes: 0 seconds: 0]; return [self _freeBusyAsTextFromStartDate: startDate toEndDate: endDate forFreeBusy: co];