tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that the TimeRange cannot handle events occured at full hours

Browse Source 
refs #4190
This commit is contained in:
Johannes Meyer 2014-03-21 12:55:53 +01:00
parent 862b50264a
commit e21d288f5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/library/Monitoring/Timeline/TimeRange.php
View File

@ -130,10 +130,10 @@ class TimeRange implements Iterator
{ {
foreach ($this as $timeframeIdentifier => $timeframe) { foreach ($this as $timeframeIdentifier => $timeframe) {
if ($this->negative) { if ($this->negative) {
if ($dateTime <= $timeframe->start && $dateTime > $timeframe->end) { if ($dateTime <= $timeframe->start && $dateTime >= $timeframe->end) {
return $asTimestamp ? $timeframeIdentifier : $timeframe; return $asTimestamp ? $timeframeIdentifier : $timeframe;
} }
} elseif ($dateTime >= $timeframe->start && $dateTime < $timeframe->end) { } elseif ($dateTime >= $timeframe->start && $dateTime <= $timeframe->end) {
return $asTimestamp ? $timeframeIdentifier : $timeframe; return $asTimestamp ? $timeframeIdentifier : $timeframe;
} }
} }