summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-22 15:38:56 +0200
committerSebastian Wagner2011-10-22 15:38:56 +0200
commit3a74fb206761a09944e0c7f920fa2719e9e27065 (patch)
tree66379fd49d928f758a16c1d04aaee125ce54849a
parentsome overlapping changes, conflict-free-event plot implemented (diff)
downloadpoolctrl-3a74fb206761a09944e0c7f920fa2719e9e27065.tar.gz
poolctrl-3a74fb206761a09944e0c7f920fa2719e9e27065.tar.xz
poolctrl-3a74fb206761a09944e0c7f920fa2719e9e27065.zip
bugfix
-rwxr-xr-xapplication/controllers/EventController.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index f1036d6..21b6fd4 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -667,11 +667,13 @@ class EventController extends Zend_Controller_Action
$eventID = $this->getRequest()->getParam('eventID');
$date = intval(strtotime(substr($this->getRequest()->getParam('date'), 0, 24)));
+ $poolID = $this->getRequest()->getParam('poolID');
$events['withrepeat'] = $this->eventMapper->getDraggingEvents($eventID);
$events['withoutrepeat'] = $this->eventMapper->getDraggingEvent($eventID);
$others = $this->eventMapper->getNotDraggingEvents($eventID);
+ $allEvents = $this->eventMapper->fetchAllasArray($poolID);
// Calculate time shift
$diff=0;
@@ -715,9 +717,9 @@ class EventController extends Zend_Controller_Action
$enewend = strtotime($e['end']) + $diff;
// overlap events
- foreach($others as $o) {
- if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start'])
- || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end'])) {
+ foreach($allEvents as $o) {
+ if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start']) && $o['eventID'] != $eventID
+ || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end']) && $o['eventID'] != $eventID) {
$overlapswithoutrepeat[] = $o;
$cfv = false;
}