amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 2b4777c3ca432b7b604c9d23a47dae304ddd83b7

Browse Source 
Monotone-Revision: 5092b7192c90ae7b78ecc0442ac5ec1841d30a8d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-27T14:49:28
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-06-27 14:49:28 +00:00
parent 07e5875c7e
commit 09a3866d02
2 changed files with 109 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2008-06-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject
-contentAsString]): add the ending interval to "today" instead of
to the start date.
([SOGoFreeBusyObject
-contentAsStringWithMethod:methodfrom:_startDateto:_endDate]): new
method that accepts a method parameter to specify in the returned
iCalendar object.
2008-06-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject -labelForKey:key]):
SoObjects/Appointments/SOGoFreeBusyObject.m
+99 -86
View File
@@ -71,6 +71,89 @@ static unsigned int freebusyRangeEnd = 0;
}
}
- (iCalPerson *) iCalPersonWithUID: (NSString *) uid
{
iCalPerson *person;
LDAPUserManager *um;
NSDictionary *contactInfos;
um = [LDAPUserManager sharedUserManager];
contactInfos = [um contactInfosForUserWithUIDorEmail: uid];
person = [iCalPerson new];
[person autorelease];
[person setCn: [contactInfos objectForKey: @"cn"]];
[person setEmail: [contactInfos objectForKey: @"c_email"]];
return person;
}
/* Private API */
- (iCalFreeBusyType) _fbTypeForEventStatus: (NSNumber *) eventStatus
{
unsigned int status;
iCalFreeBusyType fbType;
status = [eventStatus unsignedIntValue];
if (status == 0)
fbType = iCalFBBusyTentative;
else if (status == 1)
fbType = iCalFBBusy;
else
fbType = iCalFBFree;
return fbType;
}
- (NSString *) iCalStringForFreeBusyInfos: (NSArray *) _infos
withMethod: (NSString *) method
from: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
{
NSString *uid;
NSEnumerator *events;
iCalCalendar *calendar;
iCalFreeBusy *freebusy;
NSDictionary *info;
iCalFreeBusyType type;
uid = [container ownerInContext: context];
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
[calendar setProdID: @"//Inverse groupe conseil/SOGo 0.9"];
[calendar setVersion: @"2.0"];
if (method)
[calendar setMethod: method];
freebusy = [iCalFreeBusy groupWithTag: @"vfreebusy"];
[freebusy addToAttendees: [self iCalPersonWithUID: uid]];
[freebusy setTimeStampAsDate: [NSCalendarDate calendarDate]];
[freebusy setStartDate: _startDate];
[freebusy setEndDate: _endDate];
/* ORGANIZER - strictly required but missing for now */
/* ATTENDEE */
// person = [self iCalPersonWithUid: uid];
// [person setTag: @"ATTENDEE"];
// [ms appendString: [person versitString]];
/* FREEBUSY */
events = [_infos objectEnumerator];
while ((info = [events nextObject]))
if ([[info objectForKey: @"c_isopaque"] boolValue])
{
type = [self _fbTypeForEventStatus: [info objectForKey: @"c_status"]];
[freebusy addFreeBusyFrom: [info objectForKey: @"startDate"]
to: [info objectForKey: @"endDate"]
type: type];
}
[calendar setUniqueChild: freebusy];
return [calendar versitString];
}
- (NSString *) contentAsString
{
NSCalendarDate *today, *startDate, *endDate;
@@ -82,20 +165,30 @@ static unsigned int freebusyRangeEnd = 0;
startDate = [today dateByAddingYears: 0 months: 0 days: -freebusyRangeStart
hours: 0 minutes: 0 seconds: 0];
endDate = [startDate dateByAddingYears: 0 months: 0 days: freebusyRangeEnd
hours: 0 minutes: 0 seconds: 0];
endDate = [today dateByAddingYears: 0 months: 0 days: freebusyRangeEnd
hours: 0 minutes: 0 seconds: 0];
return [self contentAsStringFrom: startDate to: endDate];
}
- (NSString *) contentAsStringFrom: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
- (NSString *) contentAsStringWithMethod: (NSString *) method
from: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
{
NSArray *infos;
infos = [self fetchFreeBusyInfosFrom:_startDate to:_endDate];
infos = [self fetchFreeBusyInfosFrom: _startDate to: _endDate];
return [self iCalStringForFreeBusyInfos:infos from:_startDate to:_endDate];
return [self iCalStringForFreeBusyInfos: infos withMethod: method
from: _startDate to: _endDate];
}
- (NSString *) contentAsStringFrom: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
{
return [self contentAsStringWithMethod: nil
from: _startDate
to: _endDate];
}
- (NSArray *) fetchFreeBusyInfosFrom: (NSCalendarDate *) startDate
@@ -130,86 +223,6 @@ static unsigned int freebusyRangeEnd = 0;
return [self contentAsString];
}
/* Private API */
- (iCalFreeBusyType) _fbTypeForEventStatus: (NSNumber *) eventStatus
{
unsigned int status;
iCalFreeBusyType fbType;
status = [eventStatus unsignedIntValue];
if (status == 0)
fbType = iCalFBBusyTentative;
else if (status == 1)
fbType = iCalFBBusy;
else
fbType = iCalFBFree;
return fbType;
}
- (iCalPerson *) iCalPersonWithUID: (NSString *) uid
{
iCalPerson *person;
LDAPUserManager *um;
NSDictionary *contactInfos;
um = [LDAPUserManager sharedUserManager];
contactInfos = [um contactInfosForUserWithUIDorEmail: uid];
person = [iCalPerson new];
[person autorelease];
[person setCn: [contactInfos objectForKey: @"cn"]];
[person setEmail: [contactInfos objectForKey: @"c_email"]];
return person;
}
- (NSString *) iCalStringForFreeBusyInfos: (NSArray *) _infos
from: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
{
NSString *uid;
NSEnumerator *events;
iCalCalendar *calendar;
iCalFreeBusy *freebusy;
NSDictionary *info;
iCalFreeBusyType type;
uid = [container ownerInContext: context];
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
[calendar setProdID: @"//Inverse groupe conseil/SOGo 0.9"];
[calendar setVersion: @"2.0"];
freebusy = [iCalFreeBusy groupWithTag: @"vfreebusy"];
[freebusy addToAttendees: [self iCalPersonWithUID: uid]];
[freebusy setTimeStampAsDate: [NSCalendarDate calendarDate]];
[freebusy setStartDate: _startDate];
[freebusy setEndDate: _endDate];
/* ORGANIZER - strictly required but missing for now */
/* ATTENDEE */
// person = [self iCalPersonWithUid: uid];
// [person setTag: @"ATTENDEE"];
// [ms appendString: [person versitString]];
/* FREEBUSY */
events = [_infos objectEnumerator];
while ((info = [events nextObject]))
if ([[info objectForKey: @"c_isopaque"] boolValue])
{
type = [self _fbTypeForEventStatus: [info objectForKey: @"c_status"]];
[freebusy addFreeBusyFrom: [info objectForKey: @"startDate"]
to: [info objectForKey: @"endDate"]
type: type];
}
[calendar setUniqueChild: freebusy];
return [calendar versitString];
}
/* deliver content without need for view method */
- (id) GETAction: (id)_ctx