summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php19
1 files changed, 14 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 74efd39..65fcc49 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -682,6 +682,8 @@ class EventController extends Zend_Controller_Action
// Check for overlap with repeat
$overlapswithrepeat = array();
+ $cfevents = array();
+
foreach($events['withrepeat'] as $e) {
$enewstart = strtotime($e['start']) + $diff;
@@ -712,7 +714,7 @@ class EventController extends Zend_Controller_Action
$this->view->others = $others;
$this->view->overlapswithrepeat = $overlapswithrepeat;
$this->view->overlapswithoutrepeat = $overlapswithoutrepeat;
-
+ //$this->view->overlapswithoutrepeat = $cfevents;
}
public function checkoverlapselectAction() {
@@ -735,7 +737,6 @@ class EventController extends Zend_Controller_Action
}
$this->view->overlaps = $overlaps;
-
}
public function checkoverlapresizeAction() {
@@ -758,6 +759,8 @@ class EventController extends Zend_Controller_Action
// Check for overlap with repeat
$overlapswithrepeat = array();
+ $cfevents = array();
+
foreach($events['withrepeat'] as $e) {
$enewstart = strtotime($e['start']);
@@ -772,6 +775,7 @@ class EventController extends Zend_Controller_Action
// Check for overlap without repeat
$overlapswithoutrepeat = array();
+
foreach($events['withoutrepeat'] as $e) {
$enewstart = strtotime($e['start']);
@@ -780,7 +784,7 @@ class EventController extends Zend_Controller_Action
foreach($others as $o) {
if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start'])
|| $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end']))
- $overlapswithoutrepeat[] = $o;
+ $overlapswithoutrepeat[] = $o;
}
}
@@ -788,7 +792,7 @@ class EventController extends Zend_Controller_Action
$this->view->others = $others;
$this->view->overlapswithrepeat = $overlapswithrepeat;
$this->view->overlapswithoutrepeat = $overlapswithoutrepeat;
-
+ $this->view->overlapswithoutrepeat = $cfevents;
}
public function eventmoveAction() {
@@ -809,7 +813,8 @@ class EventController extends Zend_Controller_Action
if ($evid!="null") {
$this->eventMapper->find($evid,$event); //locate the event in the DB
$this->eventMapper->find($evid,$oldEvent);
- $event->setRepeat(0);
+ //es beleibt ein repeatEvent! ob alle verschoben werden oder nur das selektierte wird über den kalender abgefragt
+ //$event->setRepeat(0);
$event->setRepeattype(null);
$event->setRepeatend(null);
$event->setRepeatdate(null);
@@ -894,6 +899,8 @@ class EventController extends Zend_Controller_Action
$evmindelta = $this->getRequest()->getParam('evmindelta');
$evdaydelta = $this->getRequest()->getParam('evdaydelta');
$poolID = $this->getRequest()->getParam('poolID');
+
+ //$cfevents = $this-getRequest()->getParam('cfevents');
if ($eventTitle!=null) {
@@ -1047,6 +1054,8 @@ class EventController extends Zend_Controller_Action
$eventTitle = $this->getRequest()->getParam('eventTitle');
$evmindelta = $this->getRequest()->getParam('evmindelta');
$poolID = $this->getRequest()->getParam('poolID');
+
+ //$cfevents = $this-getRequest()->getParam('cfevents');
if ($eventTitle!=null) {