summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 17:29:06 +0200
committerBjörn Geiger2011-10-17 17:29:06 +0200
commit5fda8798f0b4cce64ebb7936b4a262d39038de38 (patch)
tree855a8e262499976727597b7c9e27db5c2fadfccc /application/controllers/EventController.php
parentkleine Korrektur (diff)
downloadpoolctrl-5fda8798f0b4cce64ebb7936b4a262d39038de38.tar.gz
poolctrl-5fda8798f0b4cce64ebb7936b4a262d39038de38.tar.xz
poolctrl-5fda8798f0b4cce64ebb7936b4a262d39038de38.zip
weitere Korrektur
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php18
1 files changed, 16 insertions, 2 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 444ad13..4e99249 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1127,11 +1127,25 @@ class EventController extends Zend_Controller_Action
$runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
if(count($runningEvents) > 0) {
if($boot) {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $updatePeriod * 60);
+ $startTime = $startTime + $lookbacktime * 60;
+ $betweenStart = ($eventStart - $startTime) / 60;
+ if($betweenStart > $updatePeriod) {
+ $addStartTime = $updatePeriod * 60;
+ } else {
+ $addStartTime = $updatePeriod * 60 - $beetweenStart * 60;
+ }
+ $newStart = date('Y-m-d H:i:s', $eventStart + $addStartTime);
$event->setStart($newStart);
}
if($shutdown) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $updatePeriod * 60);
+ $endTime = $endTime - $lookbacktime * 60;
+ $betweenEnd = ($eventEnd - $endTime) / 60;
+ if($betweenEnd > $updatePeriod) {
+ $addEndTime = $updatePeriod * 60;
+ } else {
+ $addEndTime = $updatePeriod * 60 - $beetweenEnd * 60;
+ }
+ $newEnd = date('Y-m-d H:i:s', $eventEnd + $addEndTime);
$event->setEnd($newEnd);
}
try {