summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-24 11:34:12 +0200
committerBjörn Geiger2011-10-24 11:34:12 +0200
commitc533a8fe9184e64f9fe6966006045dbee476d65a (patch)
tree04cbb17c768e2d996b845c833fa7d1b9b19c3147
parentverschiedenes (diff)
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-c533a8fe9184e64f9fe6966006045dbee476d65a.tar.gz
poolctrl-c533a8fe9184e64f9fe6966006045dbee476d65a.tar.xz
poolctrl-c533a8fe9184e64f9fe6966006045dbee476d65a.zip
merge
-rwxr-xr-xapplication/controllers/EventController.php78
-rwxr-xr-xapplication/views/scripts/event/index.phtml8
-rw-r--r--gearman/controllerWorker/ControllerWorker/Worker.java37
3 files changed, 81 insertions, 42 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index b60c96d..1951fa3 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -953,48 +953,50 @@ class EventController extends Zend_Controller_Action
}
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 = '';
+ 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 = '';
+ }
}
+ $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) . "<br/>";
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index c5c7c38..8908de7 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -671,16 +671,16 @@ var dayClick = false;
event.editable = false;
}
- // disable resizing if the event is a boot- or shutdown-event
+ // disable resizing if the event is a boot- or shutdown-event
if(event.category == 'Boot' || event.category == 'Shutdown') {
element.resizable(false); // calendar resizing
element.resizable("destroy"); // jqeury resizing
element.removeClass('fc-event-vert'); // css class
}
-
+
+ // disable editing of immediate events
if(event.immediate == 1) {
- element.draggable( "destroy" );
- element.removeClass('fc-event-draggable');
+ element.ediable = false;
}
element.qtip({
diff --git a/gearman/controllerWorker/ControllerWorker/Worker.java b/gearman/controllerWorker/ControllerWorker/Worker.java
new file mode 100644
index 0000000..3501179
--- /dev/null
+++ b/gearman/controllerWorker/ControllerWorker/Worker.java
@@ -0,0 +1,37 @@
+package ControllerWorker;
+
+import org.gearman.common.GearmanJobServerConnection;
+import org.gearman.common.GearmanNIOJobServerConnection;
+import org.gearman.worker.GearmanWorker;
+import org.gearman.worker.GearmanWorkerImpl;
+
+public class Worker extends Thread {
+ private GearmanWorker worker;
+
+ public Worker() {
+ final GearmanJobServerConnection connection = new GearmanNIOJobServerConnection(
+ "127.0.0.1", 4730);
+ worker = new GearmanWorkerImpl();
+ worker.registerFunction(SomePingWorker.class);
+ worker.registerFunction(BootWorker.class);
+ worker.registerFunction(ShutdownWorker.class);
+ worker.registerFunction(StatusWorker.class);
+ worker.addServer(connection);
+ }
+
+ public void run() {
+ work();
+ }
+
+ private void work() {
+ worker.work();
+ }
+
+ public boolean isRunning() {
+ if (worker != null) {
+ return worker.isRunning();
+ } else {
+ return false;
+ }
+ }
+}