LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Respect max bookings of resources in freebusy data 

Fixes #2560
pull/17/head
Francis Lachapelle 2014-02-03 11:56:00 -05:00
parent b3dc645282
commit a6424680cc
2 changed files with 85 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -31,6 +31,7 @@ Bug fixes
- fixed handling of the '=' character in cards/events/tasks (#2505)
- simplify searches in the address book (#2187)
- warn user when dnd failed because of a resource conflict (#1613)
- respect the maximum number of bookings when viewing the freebusy information of a resource (#2560)
2.1.1b (2013-12-04)
-------------------

45
UI/MainUI/SOGoUserHomePage.m
View File

@ -91,12 +91,16 @@
NSDictionary *record;
SOGoUser *user;
int recordCount, recordMax, count, startInterval, endInterval, i, type;
int recordCount, recordMax, count, startInterval, endInterval, i, type, maxBookings, isResource;
recordMax = [records count];
user = [SOGoUser userWithLogin: [[self clientObject] ownerInContext: context]
roles: nil];
user = [SOGoUser userWithLogin: [[self clientObject] ownerInContext: context] roles: nil];
maxBookings = [user numberOfSimultaneousBookings];
isResource = [user isResource];
// Don't fetch freebusy information if the user is of type 'resource' and has unlimited bookings
if (!isResource || maxBookings > 0)
{
for (recordCount = 0; recordCount < recordMax; recordCount++)
{
record = [records objectAtIndex: recordCount];
@ -134,6 +138,9 @@
}
}
if (type == 1)
{
// User is busy for this event; update items bit string
currentDate = [record objectForKey: @"startDate"];
if ([currentDate earlierDate: startDate] == currentDate)
startInterval = 0;
@ -148,11 +155,27 @@
endInterval = ([currentDate timeIntervalSinceDate: startDate]
/ intervalSeconds);
if (type == 1)
// Update bit string representation
// If the user is a resource, keep the sum of overlapping events
for (count = startInterval; count < endInterval; count++)
{
*(items + count) = isResource ? *(items + count) + 1 : 1;
}
}
}
}
if (maxBookings > 0)
{
// Reset the freebusy for the periods that are bellow the maximum number of bookings
for (count = 0; count < itemCount; count++)
{
if (*(items + count) < maxBookings)
*(items + count) = 0;
else
*(items + count) = 1;
}
}
}
}
- (NSString *) _freeBusyFromStartDate: (NSCalendarDate *) startDate
@ -168,17 +191,23 @@
interval = [endDate timeIntervalSinceDate: startDate] + 60;
intervals = interval / intervalSeconds; /* slices of 15 minutes */
// Build a bit string representation of the freebusy data for the period
freeBusyItems = NSZoneCalloc (NULL, intervals, sizeof (int));
[self _fillFreeBusyItems: freeBusyItems count: intervals
[self _fillFreeBusyItems: freeBusyItems
count: intervals
withRecords: [fb fetchFreeBusyInfosFrom: startDate to: endDate forContact: uid]
fromStartDate: startDate toEndDate: endDate];
fromStartDate: startDate
toEndDate: endDate];
// Convert bit string to a NSArray
freeBusy = [NSMutableArray arrayWithCapacity: intervals];
for (count = 0; count < intervals; count++)
[freeBusy
addObject: [NSString stringWithFormat: @"%d", *(freeBusyItems + count)]];
{
[freeBusy addObject: [NSString stringWithFormat: @"%d", *(freeBusyItems + count)]];
}
NSZoneFree (NULL, freeBusyItems);
// Return a NSString representation
return [freeBusy componentsJoinedByString: @","];
}