From 2814d3510f1b3b1e4d10537673e0ebacf682ea53 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 24 Oct 2011 15:43:24 +0200 Subject: some changes --- application/controllers/EventController.php | 585 ++++++++++++++-------------- application/views/scripts/event/index.phtml | 8 +- 2 files changed, 294 insertions(+), 299 deletions(-) (limited to 'application') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 1951fa3..2a280b3 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -278,10 +278,10 @@ class EventController extends Zend_Controller_Action $eventCategory = $eventcategories[$event->getCategory()]; $runningtypeMapper = new Application_Model_RunningtypeMapper(); $runningtype = $runningtypeMapper->findBy(array("title" => $eventCategory)); - $event->setRunning(1); + $event->setRunning(true); $event->setRunningtype($runningtype[0]->getID()); } else { - $event->setRunning(0); + $event->setRunning(false); } $event->setCreated(time()); if($event->repeat) { @@ -584,7 +584,6 @@ class EventController extends Zend_Controller_Action $this->getRequest()->setParam('pbs_bootosID', $event->getPbs_bootosID()); $this->getRequest()->setParam('pbs_configID_' . $event->getPbs_bootosID(), $event->getPbs_configID()); $this->getRequest()->setParam('pbs_membershipID', $event->getPbs_membershipID()); - $this->getRequest()->setParam('force', $event->getForce()); $params = $this->getRequest()->getParams(); $editForm = new Application_Form_EventEdit(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'configlist' => $configlist, 'poollist' => $poollist, 'repeattypelist' => $repeattypelist, 'repeatendlist' => $repeatendlist, 'oldtitle' => $event->getTitle(), 'params' => $params)); } @@ -669,7 +668,7 @@ 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); @@ -686,117 +685,27 @@ class EventController extends Zend_Controller_Action // Check for overlap with repeat $overlapswithrepeat = array(); $cfeventswithrepeat = array(); - + foreach($events['withrepeat'] as $e) { $enewstart = strtotime($e['start']) + $diff; $enewend = strtotime($e['end']) + $diff; $cfv = true; - - // overlap events - foreach($others as $o) { - if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start']) - || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end'])) { - $overlapswithrepeat[] = $o; - $cfv = false; - } - } - // conflict free events with repeat - if($cfv) { - $cfeventswithrepeat[] = $e; - } - } - - // Check for overlap without repeat - $overlapswithoutrepeat = array(); - $cfeventswithoutrepeat = array(); - $cfv = true; - - foreach($events['withoutrepeat'] as $e) { - - $enewstart = strtotime($e['start']) + $diff; - $enewend = strtotime($e['end']) + $diff; - + // overlap events 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; + if($e['running'] == 0) { + if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start']) && $o['eventID'] != $e['eventID'] + || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end']) && $o['eventID'] != $e['eventID']) { + $overlapswithrepeat[] = $o; $cfv = false; - } - } - // conflict free events without repeat - if($cfv) { - $cfeventswithoutrepeat[] = $e; - } - } - - $this->view->events = $events; - $this->view->others = $others; - $this->view->overlapswithrepeat = $overlapswithrepeat; - $this->view->cfeventswithrepeat = $cfeventswithrepeat; - $this->view->overlapswithoutrepeat = $overlapswithoutrepeat; - $this->view->cfeventswithoutrepeat = $cfeventswithoutrepeat; - - } - - public function checkoverlapselectAction() { - if(!$this->acl->checkRight('eo')) { - $this->_redirect('/'); - } - $this->_helper->layout->disableLayout(); - - $poolID = $this->getRequest()->getParam('poolID'); - $startDate = intval(strtotime(substr($this->getRequest()->getParam('startDate'), 0, 24))); - $endDate = intval(strtotime(substr($this->getRequest()->getParam('endDate'), 0, 24))); - - $allEvents = $this->eventMapper->fetchAllasArray($poolID); - - $overlaps = array(); - foreach($allEvents as $e) { - if($startDate <= strtotime($e['start']) && $endDate >= strtotime($e['start']) - || $startDate >= strtotime($e['start']) && $startDate <= strtotime($e['end'])) - $overlaps[] = $e; - } - - $this->view->overlaps = $overlaps; - } - - public function checkoverlapresizeAction() { - if(!$this->acl->checkRight('eo')) { - $this->_redirect('/'); - } - $this->_helper->layout->disableLayout(); - - $poolID = $this->getRequest()->getParam('poolID'); - - $eventID = $this->getRequest()->getParam('eventID'); - $minuteDelta = intval($this->getRequest()->getParam('minuteDelta')*60); - $dayDelta = intval($this->getRequest()->getParam('dayDelta')*24*60*60); - $diffDelta = intval($minuteDelta + $dayDelta); - - $events['withrepeat'] = $this->eventMapper->getDraggingEvents($eventID); - $events['withoutrepeat'] = $this->eventMapper->getDraggingEvent($eventID); - - $others = $this->eventMapper->getNotDraggingEvents($eventID); - $allEvents = $this->eventMapper->fetchAllasArray($poolID); - - // Check for overlap with repeat - $overlapswithrepeat = array(); - $cfeventswithrepeat = array(); - - foreach($events['withrepeat'] as $e) { - - $enewstart = strtotime($e['start']); - $enewend = strtotime($e['end']) + $diffDelta; - $cfv = true; - - // overlap events - foreach($allEvents as $o) { - if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start']) && $o['eventID'] != $e['eventID'] && $o['eventID'] != $eventID - || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end']) && $o['eventID'] != $e['eventID'] && $o['eventID'] != $eventID) { + } + } else { + if($e['start'] <= strtotime($o['start']) && $e['end'] >= strtotime($o['start']) && $o['eventID'] != $e['eventID'] + || $e['start'] >= strtotime($o['start']) && $e['start'] <= strtotime($o['end']) && $o['eventID'] != $e['eventID']) { $overlapswithrepeat[] = $o; $cfv = false; + } } } // conflict free events with repeat @@ -804,30 +713,30 @@ class EventController extends Zend_Controller_Action $cfeventswithrepeat[] = $e; } } - + // Check for overlap without repeat - $overlapswithoutrepeat = array(); - $cfeventswithoutrepeat = array(); - - foreach($events['withoutrepeat'] as $e) { - - $enewstart = strtotime($e['start']); - $enewend = strtotime($e['end']) + $diffDelta; - $cfv = true; - - // overlap events - 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; - } - } - // conflict free events without repeat - if($cfv) { - $cfeventswithoutrepeat[] = $e; - } - } + $overlapswithoutrepeat = array(); + $cfeventswithoutrepeat = array(); + $cfv = true; + + foreach($events['withoutrepeat'] as $e) { + + $enewstart = strtotime($e['start']) + $diff; + $enewend = strtotime($e['end']) + $diff; + + // overlap events + 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; + } + } + // conflict free events without repeat + if($cfv) { + $cfeventswithoutrepeat[] = $e; + } + } $this->view->events = $events; $this->view->others = $others; @@ -835,8 +744,113 @@ class EventController extends Zend_Controller_Action $this->view->cfeventswithrepeat = $cfeventswithrepeat; $this->view->overlapswithoutrepeat = $overlapswithoutrepeat; $this->view->cfeventswithoutrepeat = $cfeventswithoutrepeat; - + } + + public function checkoverlapselectAction() { + if(!$this->acl->checkRight('eo')) { + $this->_redirect('/'); + } + $this->_helper->layout->disableLayout(); + + $poolID = $this->getRequest()->getParam('poolID'); + $startDate = intval(strtotime(substr($this->getRequest()->getParam('startDate'), 0, 24))); + $endDate = intval(strtotime(substr($this->getRequest()->getParam('endDate'), 0, 24))); + + $allEvents = $this->eventMapper->fetchAllasArray($poolID); + + $overlaps = array(); + foreach($allEvents as $e) { + if($startDate <= strtotime($e['start']) && $endDate >= strtotime($e['start']) + || $startDate >= strtotime($e['start']) && $startDate <= strtotime($e['end'])) + $overlaps[] = $e; + } + + $this->view->overlaps = $overlaps; + } + + public function checkoverlapresizeAction() { + if(!$this->acl->checkRight('eo')) { + $this->_redirect('/'); + } + $this->_helper->layout->disableLayout(); + + $poolID = $this->getRequest()->getParam('poolID'); + + $eventID = $this->getRequest()->getParam('eventID'); + $minuteDelta = intval($this->getRequest()->getParam('minuteDelta')*60); + $dayDelta = intval($this->getRequest()->getParam('dayDelta')*24*60*60); + $diffDelta = intval($minuteDelta + $dayDelta); + + $events['withrepeat'] = $this->eventMapper->getDraggingEvents($eventID); + $events['withoutrepeat'] = $this->eventMapper->getDraggingEvent($eventID); + + $others = $this->eventMapper->getNotDraggingEvents($eventID); + $allEvents = $this->eventMapper->fetchAllasArray($poolID); + + // Check for overlap with repeat + $overlapswithrepeat = array(); + $cfeventswithrepeat = array(); + + foreach($events['withrepeat'] as $e) { + + $enewstart = strtotime($e['start']); + $enewend = strtotime($e['end']) + $diffDelta; + $cfv = true; + // overlap events + foreach($allEvents as $o) { + if($e['running'] == 0) { + if($enewstart <= strtotime($o['start']) && $enewend >= strtotime($o['start']) && $o['eventID'] != $e['eventID'] + || $enewstart >= strtotime($o['start']) && $enewstart <= strtotime($o['end']) && $o['eventID'] != $e['eventID']) { + $overlapswithrepeat[] = $o; + $cfv = false; + } + } else { + if($e['start'] <= strtotime($o['start']) && $e['end'] >= strtotime($o['start']) && $o['eventID'] != $e['eventID'] + || $e['start'] >= strtotime($o['start']) && $e['start'] <= strtotime($o['end']) && $o['eventID'] != $e['eventID']) { + $overlapswithrepeat[] = $o; + $cfv = false; + } + } + } + // conflict free events with repeat + if($cfv) { + $cfeventswithrepeat[] = $e; + } + } + + // Check for overlap without repeat + $overlapswithoutrepeat = array(); + $cfeventswithoutrepeat = array(); + + foreach($events['withoutrepeat'] as $e) { + + $enewstart = strtotime($e['start']); + $enewend = strtotime($e['end']) + $diffDelta; + $cfv = true; + + // overlap events + 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; + } + } + // conflict free events without repeat + if($cfv) { + $cfeventswithoutrepeat[] = $e; + } + } + + $this->view->events = $events; + $this->view->others = $others; + $this->view->overlapswithrepeat = $overlapswithrepeat; + $this->view->cfeventswithrepeat = $cfeventswithrepeat; + $this->view->overlapswithoutrepeat = $overlapswithoutrepeat; + $this->view->cfeventswithoutrepeat = $cfeventswithoutrepeat; + + } public function eventmoveAction() { if(!$this->acl->checkRight('eo')) { @@ -954,49 +968,49 @@ class EventController extends Zend_Controller_Action try { foreach($events as $event) { if($event->getRunning() == 0) { - //1min = 60sec, 1d = 86400sec - $oldStartTime = date('H:i', strtotime($event->getStart())); - $oldStartDate = date('d.m.Y', strtotime($event->getStart())); - $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400); - $newStartTime = date('H:i', $evstartTime); - $newStartDate = date('d.m.Y', $evstartTime); - $eventStart = date('Y-m-d H:i:s', $evstartTime); - $event->setStart($eventStart); - if($event->getEnd()) { - $oldEndTime = date('H:i', strtotime($event->getEnd())); - $oldEndDate = date('d.m.Y', strtotime($event->getEnd())); - $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400); - $newEndTime = date('H:i', $evendTime); - $newEndDate = date('d.m.Y', $evendTime); - $eventEnd = date('Y-m-d H:i:s', $evendTime); - $event->setEnd($eventEnd); - } - $event->setPbs_poolID($poolID); - $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); - $shutdownCategory = $result[0]; - if($event->getCategory() != $shutdownCategory->getID()) { - if($event->getPbs_filterID()) { - if($event->getRepeat()) { - $repeattypeMapper = new Application_Model_RepeattypeMapper(); - $repeattype = new Application_Model_Repeattype(); - $repeattypeMapper->find($event->getRepeattype(), $repeattype); - if($repeattype == "Once a week") { - $oldStartDate = date("N", strototime($oldStartDate)); - $oldEndDate = ''; - $newStartDate = date("N", strototime($newStartDate)); - $newEndDate = ''; - } + //1min = 60sec, 1d = 86400sec + $oldStartTime = date('H:i', strtotime($event->getStart())); + $oldStartDate = date('d.m.Y', strtotime($event->getStart())); + $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400); + $newStartTime = date('H:i', $evstartTime); + $newStartDate = date('d.m.Y', $evstartTime); + $eventStart = date('Y-m-d H:i:s', $evstartTime); + $event->setStart($eventStart); + if($event->getEnd()) { + $oldEndTime = date('H:i', strtotime($event->getEnd())); + $oldEndDate = date('d.m.Y', strtotime($event->getEnd())); + $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400); + $newEndTime = date('H:i', $evendTime); + $newEndDate = date('d.m.Y', $evendTime); + $eventEnd = date('Y-m-d H:i:s', $evendTime); + $event->setEnd($eventEnd); + } + $event->setPbs_poolID($poolID); + $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); + $shutdownCategory = $result[0]; + if($event->getCategory() != $shutdownCategory->getID()) { + if($event->getPbs_filterID()) { + if($event->getRepeat()) { + $repeattypeMapper = new Application_Model_RepeattypeMapper(); + $repeattype = new Application_Model_Repeattype(); + $repeattypeMapper->find($event->getRepeattype(), $repeattype); + if($repeattype == "Once a week") { + $oldStartDate = date("N", strototime($oldStartDate)); + $oldEndDate = ''; + $newStartDate = date("N", strototime($newStartDate)); + $newEndDate = ''; } - $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . strtotime($oldStartDate) . "&oldvalue2=" . strtotime($oldEndDate) . "&value1=" . strtotime($newStartDate) . "&value2=" . strtotime($newEndDate); - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); - unset($filterApiResult); - $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); - unset($filterApiResult); } + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . strtotime($oldStartDate) . "&oldvalue2=" . strtotime($oldEndDate) . "&value1=" . strtotime($newStartDate) . "&value2=" . strtotime($newEndDate); + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); } - $this->eventMapper->save($event); //save the event with the new data } + $this->eventMapper->save($event); //save the event with the new data + } } } catch (Zend_Exception $e) { echo "Caught exception: " . get_class($e) . "
"; @@ -1009,91 +1023,91 @@ class EventController extends Zend_Controller_Action return; } } - + public function eventmovecfAction() { - if(!$this->acl->checkRight('eo')) { - $this->_redirect('/'); - } - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - $cfevents = $this->getRequest()->getParam('cfevents'); - $evmindelta = $this->getRequest()->getParam('evmindelta'); - $evdaydelta = $this->getRequest()->getParam('evdaydelta'); - $poolID = $this->getRequest()->getParam('poolID'); - - $eventsArray = (array) $cfevents; - - //$event = new Application_Model_Event($cfevents); - - var_dump($eventsArray); - - //print_r($cfevents['eventID']); - - /*if ($cfevents!=null) { - - $events = $this->eventMapper->findBy(array("eventID" => $cfevents['eventID'])); - if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { - if (!$this->acl->checkRight('edo')) { - $this->_redirect('/'); - } - } - try { - foreach($events as $event) { - //1min = 60sec, 1d = 86400sec - $oldStartTime = date('H:i', strtotime($event->getStart())); - $oldStartDate = date('d.m.Y', strtotime($event->getStart())); - $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400); - $newStartTime = date('H:i', $evstartTime); - $newStartDate = date('d.m.Y', $evstartTime); - $eventStart = date('Y-m-d H:i:s', $evstartTime); - $event->setStart($eventStart); - if($event->getEnd()) { - $oldEndTime = date('H:i', strtotime($event->getEnd())); - $oldEndDate = date('d.m.Y', strtotime($event->getEnd())); - $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400); - $newEndTime = date('H:i', $evendTime); - $newEndDate = date('d.m.Y', $evendTime); - $eventEnd = date('Y-m-d H:i:s', $evendTime); - $event->setEnd($eventEnd); - } - $event->setPbs_poolID($poolID); - $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); - $shutdownCategory = $result[0]; - if($event->getCategory() != $shutdownCategory->getID()) { - if($event->getPbs_filterID()) { - if($event->getRepeat()) { - $repeattypeMapper = new Application_Model_RepeattypeMapper(); - $repeattype = new Application_Model_Repeattype(); - $repeattypeMapper->find($event->getRepeattype(), $repeattype); - if($repeattype == "Once a week") { - $oldStartDate = date("N", strototime($oldStartDate)); - $oldEndDate = ''; - $newStartDate = date("N", strototime($newStartDate)); - $newEndDate = ''; - } - } - $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . strtotime($oldStartDate) . "&oldvalue2=" . strtotime($oldEndDate) . "&value1=" . strtotime($newStartDate) . "&value2=" . strtotime($newEndDate); - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); - unset($filterApiResult); - $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); - unset($filterApiResult); - } - } - $this->eventMapper->save($event); //save the event with the new data - } - } catch (Zend_Exception $e) { - echo "Caught exception: " . get_class($e) . "
"; - echo "Message: " . $e->getMessage() . "
"; - return; - } - $this->_redirect('/event/'); - } else { - $this->_redirect('/event/'); - return; - }*/ - } + if(!$this->acl->checkRight('eo')) { + $this->_redirect('/'); + } + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $cfevents = $this->getRequest()->getParam('cfevents'); + $evmindelta = $this->getRequest()->getParam('evmindelta'); + $evdaydelta = $this->getRequest()->getParam('evdaydelta'); + $poolID = $this->getRequest()->getParam('poolID'); + + $eventsArray = (array) $cfevents; + + //$event = new Application_Model_Event($cfevents); + + var_dump($eventsArray); + + //print_r($cfevents['eventID']); + + /*if ($cfevents!=null) { + + $events = $this->eventMapper->findBy(array("eventID" => $cfevents['eventID'])); + if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { + if (!$this->acl->checkRight('edo')) { + $this->_redirect('/'); + } + } + try { + foreach($events as $event) { + //1min = 60sec, 1d = 86400sec + $oldStartTime = date('H:i', strtotime($event->getStart())); + $oldStartDate = date('d.m.Y', strtotime($event->getStart())); + $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400); + $newStartTime = date('H:i', $evstartTime); + $newStartDate = date('d.m.Y', $evstartTime); + $eventStart = date('Y-m-d H:i:s', $evstartTime); + $event->setStart($eventStart); + if($event->getEnd()) { + $oldEndTime = date('H:i', strtotime($event->getEnd())); + $oldEndDate = date('d.m.Y', strtotime($event->getEnd())); + $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400); + $newEndTime = date('H:i', $evendTime); + $newEndDate = date('d.m.Y', $evendTime); + $eventEnd = date('Y-m-d H:i:s', $evendTime); + $event->setEnd($eventEnd); + } + $event->setPbs_poolID($poolID); + $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); + $shutdownCategory = $result[0]; + if($event->getCategory() != $shutdownCategory->getID()) { + if($event->getPbs_filterID()) { + if($event->getRepeat()) { + $repeattypeMapper = new Application_Model_RepeattypeMapper(); + $repeattype = new Application_Model_Repeattype(); + $repeattypeMapper->find($event->getRepeattype(), $repeattype); + if($repeattype == "Once a week") { + $oldStartDate = date("N", strototime($oldStartDate)); + $oldEndDate = ''; + $newStartDate = date("N", strototime($newStartDate)); + $newEndDate = ''; + } + } + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . strtotime($oldStartDate) . "&oldvalue2=" . strtotime($oldEndDate) . "&value1=" . strtotime($newStartDate) . "&value2=" . strtotime($newEndDate); + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); + } + } + $this->eventMapper->save($event); //save the event with the new data + } + } catch (Zend_Exception $e) { + echo "Caught exception: " . get_class($e) . "
"; + echo "Message: " . $e->getMessage() . "
"; + return; + } + $this->_redirect('/event/'); + } else { + $this->_redirect('/event/'); + return; + }*/ + } public function eventresizeAction() { if(!$this->acl->checkRight('eo')) { @@ -1194,20 +1208,20 @@ class EventController extends Zend_Controller_Action try { foreach($events as $event) { if($event->getRunning() == 0) { - $eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60)); - $event->setEnd($eventEnd); - $event->setPbs_poolID($poolID); - $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); - $shutdownCategory = $result[0]; - if($event->getCategory() != $shutdownCategory->getID()) { - if($event->getPbs_filterID()) { - $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; - $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); - unset($filterApiResult); - } + $eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60)); + $event->setEnd($eventEnd); + $event->setPbs_poolID($poolID); + $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); + $shutdownCategory = $result[0]; + if($event->getCategory() != $shutdownCategory->getID()) { + if($event->getPbs_filterID()) { + $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; + $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); + unset($filterApiResult); } - $this->eventMapper->save($event); //save the event with the new data } + $this->eventMapper->save($event); //save the event with the new data + } } } catch (Zend_Exception $e) { echo "Caught exception: " . get_class($e) . "
"; @@ -1387,11 +1401,6 @@ class EventController extends Zend_Controller_Action $data = array( 'eventName' => $event->getTitle(), ); - if($event->getForce()) { - $data['force'] = true; - } else { - $data['force'] = false; - } $poolRequest = "poolid=" . $event->getPbs_poolID(); $this->config['pbs2']['getpools']; $poolApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getpools'] . $apikey, 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $poolRequest); @@ -1461,7 +1470,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "boot")); $runningtypeBoot = $result[0]; - $event->setRunning(1); + $event->setRunning(true); $event->setRunningtype($runningtypeBoot->getID()); try { $this->eventMapper->save($event); @@ -1482,7 +1491,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "shutdown")); $runningtypeShutdown = $result[0]; - $event->setRunning(1); + $event->setRunning(true); $event->setRunningtype($runningtypeShutdown->getID()); try { $this->eventMapper->save($event); @@ -1557,7 +1566,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(0); + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1577,9 +1586,6 @@ class EventController extends Zend_Controller_Action $eventreport->setCreated(time()); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); - $event->setRunning(3); - } else { - $event->setRunning(2); } $eventreport->setType($runningtypeBoot->getID()); try { @@ -1590,6 +1596,7 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1623,7 +1630,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(0); + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1643,9 +1650,6 @@ class EventController extends Zend_Controller_Action $eventreport->setCreated(time()); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); - $event->setRunning(3); - } else { - $event->setRunning(2); } $eventreport->setType($runningtypeShutdown->getID()); try { @@ -1656,7 +1660,7 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } - + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1770,11 +1774,6 @@ class EventController extends Zend_Controller_Action $data = array( 'eventName' => $event->getTitle(), ); - if($event->getForce()) { - $data['force'] = true; - } else { - $data['force'] = false; - } $poolRequest = "poolid=" . $event->getPbs_poolID(); $this->config['pbs2']['getpools']; $poolApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getpools'] . $apikey, 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $poolRequest); @@ -1881,7 +1880,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "boot")); $runningtypeBoot = $result[0]; - $event->setRunning(1); + $event->setRunning(true); $event->setRunningtype($runningtypeBoot->getID()); try { $this->eventMapper->save($event); @@ -1902,7 +1901,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "shutdown")); $runningtypeShutdown = $result[0]; - $event->setRunning(1); + $event->setRunning(true); $event->setRunningtype($runningtypeShutdown->getID()); try { $this->eventMapper->save($event); @@ -1951,7 +1950,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(0); + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1968,9 +1967,6 @@ class EventController extends Zend_Controller_Action $eventreport->setResult($eventResult->$resultShortcutName); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); - $event->setRunning(3); - } else { - $event->setRunning(2); } $eventreport->setType($runningtypeBoot->getID()); try { @@ -1981,6 +1977,7 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -2010,7 +2007,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(0); + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -2027,9 +2024,6 @@ class EventController extends Zend_Controller_Action $eventreport->setResult($eventResult->$resultShortcutName); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); - $event->setRunning(3); - } else { - $event->setRunning(2); } $eventreport->setType($runningtypeShutdown->getID()); try { @@ -2040,6 +2034,7 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } + $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 83e4032..61e23e9 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -657,18 +657,18 @@ var dayClick = false; // add running icons and handle editing of events if(event.running == 0) { // event will take place soon - $(element).children().children(":first-child").addClass("fc-event-time-0"); + $(element).find('.fc-event-time').addClass("fc-event-time-0"); } else if(event.running == 1) { // event is running - $(element).children().children(":first-child").addClass("fc-event-time-1"); + $(element).find('.fc-event-time').addClass("fc-event-time-1"); event.editable = false; } else if(event.running == 2) { // event successfully - $(element).children().children(":first-child").addClass("fc-event-time-2"); + $(element).find('.fc-event-time').addClass("fc-event-time-2"); event.editable = false; } else if(event.running == 3) { // event failed - $(element).children().children(":first-child").addClass("fc-event-time-3"); + $(element).find('.fc-event-time').addClass("fc-event-time-3"); event.editable = false; } -- cgit v1.2.3-55-g7522