amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-19 03:49:28 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: a0d20fb51aabc237f03e950c0259c001dd429c4e

Browse Source 
Monotone-Revision: 766dad0635896e668e91ba03381986aaac17e5c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-30T22:39:31
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-10-30 22:39:31 +00:00
parent 42ea7a3458
commit 445664f2d7
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2006-10-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder
-fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): reverted to search algorithm to search for events happening outside 0 or 1 (at most) boundary of the timerange.
* UI/Scheduler/UIxFreeBusyUserSelectorTable.[hm]: new subcomponent
derived and taken as a subset of UIxFreeBusyUserSelector that
implements the table part of the FreeBusy view. Most of the

18
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -633,6 +633,19 @@ static NSNumber *sharedYes = nil;
return sqlString;
}
- (NSString *) _sqlStringRangeFrom: (NSCalendarDate *) _startDate
to: (NSCalendarDate *) _endDate
{
unsigned int start, end;
start = (unsigned int) [_startDate timeIntervalSince1970];
end = (unsigned int) [_endDate timeIntervalSince1970];
return [NSString stringWithFormat:
@" AND (startdate <= %d) AND (enddate >= %d)",
end, start];
}
- (NSArray *) fetchFields: (NSArray *) _fields
fromFolder: (GCSFolder *) _folder
from: (NSCalendarDate *) _startDate
@@ -655,10 +668,7 @@ static NSNumber *sharedYes = nil;
{
r = [NGCalendarDateRange calendarDateRangeWithStartDate: _startDate
endDate: _endDate];
dateSqlString
= [NSString stringWithFormat: @" AND (startdate >= %d) AND (enddate <= %d)",
(unsigned int) [_startDate timeIntervalSince1970],
(unsigned int) [_endDate timeIntervalSince1970]];
dateSqlString = [self _sqlStringRangeFrom: _startDate to: _endDate];
}
else
{