From c16a9e9108d6fccf42bd22be58a7c051cc21afa8 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 26 Oct 2011 11:16:17 +0200 Subject: drop/resize conflict free implemented --- application/controllers/EventController.php | 36 ++++++++++++++++------------- application/views/scripts/event/index.phtml | 10 +++++++- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 9c75295..fd7ff9b 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -1330,25 +1330,29 @@ class EventController extends Zend_Controller_Action $this->_helper->viewRenderer->setNoRender(); $cfevents = $this->getRequest()->getParam('cfevents'); + $cfeventsJSON = Zend_Json::decode($cfevents); $evmindelta = $this->getRequest()->getParam('evmindelta'); $poolID = $this->getRequest()->getParam('poolID'); - $events = null; - - if($cfevents!=null) { - foreach($cfevents as $e) { - $event = new Application_Model_Event($e); - $events[] = $event; - } - } - - if ($events!=null) { - - /*if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { - if (!$this->acl->checkRight('edo')) { - $this->_redirect('/'); - } - }*/ + $events = null; + + if($cfeventsJSON!=null) { + foreach($cfeventsJSON as $e) { + $event = new Application_Model_Event($e); + $event->setID($e['eventID']); + $events[] = $event; + } + } + + if ($events!=null) { + + if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { + if (!$this->acl->checkRight('edo')) { + $this->_redirect('/'); + } + } + + // event resize to the past - check try { foreach($events as $event) { if($event->getRunning() == 0) { diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index a3ee114..a1a6828 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -7,6 +7,7 @@ $(document).ready(function() {iniCalendar();}); + /* * calendar variables */ @@ -398,6 +399,7 @@ var dayClick = false; var returndata = jQuery.parseJSON(data); // get conflict free events var cfevents = returndata.cfevents; + var cfeventsString = $.toJSON(cfevents); //initialize eventNotDroppableDialog Dialog @@ -410,7 +412,7 @@ var dayClick = false; buttons: { "Resize Conflict-Free Events": function() { $(this).dialog("close"); - self.location="/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; + $.post("/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfeventsString); }, "OK": function() { $(this).dialog("close"); @@ -694,14 +696,20 @@ var dayClick = false; // event is running $(element).find('.fc-event-time').addClass("fc-event-time-1"); event.editable = false; + element.resizable("destroy"); // jqeury resizing + element.removeClass('fc-event-vert'); // css class } else if(event.running == 2) { // event successfully $(element).find('.fc-event-time').addClass("fc-event-time-2"); event.editable = false; + element.resizable("destroy"); // jqeury resizing + element.removeClass('fc-event-vert'); // css class } else if(event.running == 3) { // event failed $(element).find('.fc-event-time').addClass("fc-event-time-3"); event.editable = false; + element.resizable("destroy"); // jqeury resizing + element.removeClass('fc-event-vert'); // css class } // disable resizing if the event is a boot- or shutdown-event -- cgit v1.2.3-55-g7522