oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

invert the logic on getEventsIn to grab events that hang into and out of the time frame. The same needs to be done to non-all day events

Browse source
This commit is contained in:
Colin Kuskie 2007-03-09 06:01:02 +00:00
parent 172985e2a0
commit 98cc2c684c
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -630,8 +630,11 @@ sub getEventsIn {
( (
Event.startTime IS NULL Event.startTime IS NULL
&& Event.endTime IS NULL && Event.endTime IS NULL
&& Event.startDate >= '$startDate' && !
&& Event.startDate < '$endDate' (
Event.startDate >= '$endDate'
|| Event.endDate < '$startDate'
)
) )
|| ( || (
CONCAT(Event.startDate,' ',Event.startTime) >= '$startTz' CONCAT(Event.startDate,' ',Event.startTime) >= '$startTz'