From 656fd134e8b450bb98d84c10df263210eea1f680 Mon Sep 17 00:00:00 2001 From: sebastian wagner Date: Sun, 23 Oct 2011 20:11:41 +0200 Subject: repeat == 0 query implemented --- application/controllers/EventController.php | 41 ++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index f7711ed..2a280b3 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -693,11 +693,19 @@ class EventController extends Zend_Controller_Action $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; + 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 @@ -789,15 +797,22 @@ class EventController extends Zend_Controller_Action $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) { - $overlapswithrepeat[] = $o; - $cfv = false; - } - } + 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; @@ -952,6 +967,7 @@ 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())); @@ -995,6 +1011,7 @@ class EventController extends Zend_Controller_Action } $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() . "
"; -- cgit v1.2.3-55-g7522 From e7e7129c5ecf8a91a4bf5c24fcb456c8365b0167 Mon Sep 17 00:00:00 2001 From: sebastian wagner Date: Sun, 23 Oct 2011 20:39:18 +0200 Subject: disable editing of immediate-events --- application/views/scripts/event/index.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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({ -- cgit v1.2.3-55-g7522 From 07022dcbd91ea63f71a13f63f323e5b425de577d Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Mon, 24 Oct 2011 09:36:35 +0200 Subject: Worker.java --- .../controllerWorker/ControllerWorker/Worker.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 gearman/controllerWorker/ControllerWorker/Worker.java 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; + } + } +} -- cgit v1.2.3-55-g7522