summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-06 18:43:33 +0200
committerSebastian Wagner2011-10-06 18:43:33 +0200
commit17e15376dd2fd06d6ad35d712e39985262610bd2 (patch)
tree5508ca711ec33a035b4541a396c4bd0ace88ed8a
parentrunningPlot implemented (diff)
parentkleine Änderung (diff)
downloadpoolctrl-17e15376dd2fd06d6ad35d712e39985262610bd2.tar.gz
poolctrl-17e15376dd2fd06d6ad35d712e39985262610bd2.tar.xz
poolctrl-17e15376dd2fd06d6ad35d712e39985262610bd2.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rwxr-xr-xapplication/controllers/EventController.php94
-rwxr-xr-x[-rw-r--r--]application/controllers/StatisticController.php0
-rwxr-xr-x[-rw-r--r--]application/views/scripts/event/checkright.phtml0
-rwxr-xr-xapplication/views/scripts/person/index.phtml6
-rwxr-xr-x[-rw-r--r--]application/views/scripts/statistic/category.phtml0
-rwxr-xr-x[-rw-r--r--]application/views/scripts/statistic/index.phtml0
-rwxr-xr-x[-rw-r--r--]application/views/scripts/statistic/running.phtml0
-rwxr-xr-xgearman/controllerWorker.jarbin927846 -> 934287 bytes
-rwxr-xr-x[-rw-r--r--]gearman/controllerWorker/ControllerWorker/BootState.java0
-rwxr-xr-x[-rw-r--r--]gearman/controllerWorker/ControllerWorker/ShutdownState.java0
-rwxr-xr-xgearman/worker.sh2
-rwxr-xr-x[-rw-r--r--]public/media/css/jquery.jqplot.min.css0
-rwxr-xr-x[-rw-r--r--]public/media/js/jqplot.barRenderer.min.js0
-rwxr-xr-x[-rw-r--r--]public/media/js/jqplot.categoryAxisRenderer.min.js0
-rwxr-xr-x[-rw-r--r--]public/media/js/jqplot.donutRenderer.min.js0
-rwxr-xr-x[-rw-r--r--]public/media/js/jqplot.pieRenderer.min.js0
-rwxr-xr-x[-rw-r--r--]public/media/js/jqplot.pointLabels.min.js0
-rwxr-xr-x[-rw-r--r--]public/media/js/jquery.jqplot.min.js0
18 files changed, 52 insertions, 50 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 2f6c828..3ac2138 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -214,7 +214,7 @@ class EventController extends Zend_Controller_Action
}
$event = new Application_Model_Event($params);
$event->setPbs_membershipID($this->userIDsNamespace['membershipID']);
- $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=" . $event->getTitle() . "&defaultbootmenu=1&order=0&kcl=0";
+ $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=Poolctrl Bootmenu for Event " . $event->getTitle() . "&defaultbootmenu=0&order=0&kcl=0";
if($event->getPbs_configID()) {
$bootmenuquery .= "&configID=" . $event->getPbs_configID();
}
@@ -223,7 +223,7 @@ class EventController extends Zend_Controller_Action
$bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
$bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
$event->setPbs_bootmenuID($bootmenuID);
- $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=" . $event->getTitle() . "&description=Poolctrl Filter für " . $event->getTitle() . "&created= " . time() . "&priority=100";
+ $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=Poolctrl Filter for Event " . $event->getTitle() . "&description=This Filter was automatically created by the Poolctrl for Event " . $event->getTitle() . "&created= " . time() . "&priority=100";
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterquery);
$filterXMLString = $filterApiResult['http-body'];
$filterXML = new SimpleXMLElement($filterXMLString);
@@ -233,7 +233,7 @@ class EventController extends Zend_Controller_Action
if($event->getEnd()) {
$endTime = date('H:i', strtotime($event->getEnd()));
} else {
- $endTime = date('H:i', strtotime($event->getStart() + 900));
+ $endTime = date('H:i', strtotime($event->getStart()) + 900);
}
$filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
$filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1);
@@ -246,11 +246,11 @@ class EventController extends Zend_Controller_Action
$filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
$filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
if(!$event->getRepeat()) {
- $startDate = date('Y-m-d', strtotime($event->getStart()));
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
if($event->getEnd()) {
- $endDate = date('Y-m-d', strtotime($event->getEnd()));
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($event->getStart()));
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
}
$filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3);
@@ -462,7 +462,7 @@ class EventController extends Zend_Controller_Action
}
$event->setOptions($params);
$event->setID($eventID);
- $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=" . $event->getTitle() . "&defaultbootmenu=1&order=0&kcl=0";
+ $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=Poolctrl Bootmenu for Event " . $event->getTitle() . "&defaultbootmenu=0&order=0&kcl=0";
if($event->getPbs_configID()) {
$bootmenuquery .= "&configID=" . $event->getPbs_configID();
}
@@ -471,7 +471,7 @@ class EventController extends Zend_Controller_Action
$bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
$bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
$event->setPbs_bootmenuID($bootmenuID);
- $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=" . $event->getTitle() . "&description=Poolctrl Filter für " . $event->getTitle() . "&created= " . time() . "&priority=100";
+ $filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=Poolctrl Filter for Event " . $event->getTitle() . "&description=This Filter was automatically created by the Poolctrl for Event " . $event->getTitle() . "&created= " . time() . "&priority=100";
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterquery);
$filterXMLString = $filterApiResult['http-body'];
$filterXML = new SimpleXMLElement($filterXMLString);
@@ -481,7 +481,7 @@ class EventController extends Zend_Controller_Action
if($event->getEnd()) {
$endTime = date('H:i', strtotime($event->getEnd()));
} else {
- $endTime = date('H:i', strtotime($event->getStart() + 900));
+ $endTime = date('H:i', strtotime($event->getStart()) + 900);
}
$filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
$filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1);
@@ -494,11 +494,11 @@ class EventController extends Zend_Controller_Action
$filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
$filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
if(!$event->getRepeat()) {
- $startDate = date('Y-m-d', strtotime($event->getStart()));
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
if($event->getEnd()) {
- $endDate = date('Y-m-d', strtotime($event->getEnd()));
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($event->getStart()));
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
}
$filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3);
@@ -640,17 +640,17 @@ class EventController extends Zend_Controller_Action
if ($evid!="null") {
$this->eventMapper->find($evid,$event); //locate the event in the DB
$oldStartTime = date('H:i', strtotime($event->getStart()));
- $oldStartDate = date('Y-m-d', strtotime($event->getStart()));
+ $oldStartDate = date('d.m.Y', strtotime($event->getStart()));
$evstartTime = intval(strtotime(substr($evstart, 0, 24)));
$newStartTime = date('H:i', $evstartTime);
- $newStartDate = date('Y-m-d', $evstartTime);
+ $newStartDate = date('d.m.Y', $evstartTime);
$event->setStart(date('Y-m-d H:i:s', $evstartTime));
if($event->getEnd()){
$oldEndTime = date('H:i', strtotime($event->getEnd()));
- $oldEndDate = date('Y-m-d', strtotime($event->getEnd()));
+ $oldEndDate = date('d.m.Y', strtotime($event->getEnd()));
$evendTime = intval(strtotime(substr($evend, 0, 24)));
$newEndTime = date('H:i', $evendTime);
- $newEndDate = date('Y-m-d', $evendTime);
+ $newEndDate = date('d.m.Y', $evendTime);
$event->setEnd(date('Y-m-d H:i:s', $evendTime));
}
$this->eventMapper->save($event); //save the event with the new data
@@ -710,18 +710,18 @@ class EventController extends Zend_Controller_Action
foreach($events as $event) {
//1min = 60sec, 1d = 86400sec
$oldStartTime = date('H:i', strtotime($event->getStart()));
- $oldStartDate = date('Y-m-d', 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('Y-m-d', $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('Y-m-d', 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('Y-m-d', $evendTime);
+ $newEndDate = date('d.m.Y', $evendTime);
$eventEnd = date('Y-m-d H:i:s', $evendTime);
$event->setEnd($eventEnd);
}
@@ -1626,11 +1626,11 @@ class EventController extends Zend_Controller_Action
}
$newEvent = $event;
$newEvent->setID(null);
- $startDate = date('Y-m-d', strtotime($event->getStart()));
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
if($event->getEnd()) {
- $endDate = date('Y-m-d', strtotime($event->getEnd()));
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($event->getStart()));
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
}
switch($repeattype->getTitle()) {
case 'Daily':
@@ -1683,17 +1683,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
@@ -1740,17 +1740,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
@@ -1908,17 +1908,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
@@ -1965,17 +1965,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
@@ -2078,17 +2078,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
@@ -2143,17 +2143,17 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
- $endDate = date('Y-m-d', strtotime($newEvent->getEnd()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
} else {
- $endDate = date('Y-m-d', strtotime($newEvent->getStart()));
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
$startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
- $endTime = date('H:i', strtotime($newEvent->getStart() + 900));
+ $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
$filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
diff --git a/application/controllers/StatisticController.php b/application/controllers/StatisticController.php
index da1e56e..da1e56e 100644..100755
--- a/application/controllers/StatisticController.php
+++ b/application/controllers/StatisticController.php
diff --git a/application/views/scripts/event/checkright.phtml b/application/views/scripts/event/checkright.phtml
index b8c8a62..b8c8a62 100644..100755
--- a/application/views/scripts/event/checkright.phtml
+++ b/application/views/scripts/event/checkright.phtml
diff --git a/application/views/scripts/person/index.phtml b/application/views/scripts/person/index.phtml
index 01d35de..aa89e37 100755
--- a/application/views/scripts/person/index.phtml
+++ b/application/views/scripts/person/index.phtml
@@ -44,8 +44,10 @@ if(count($this->groups)==0)
<?php foreach ($this->groups as $group): ?>
<?php
$class='';
- if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
- $class= 'highlight checked';
+ if(isset($this->userIDsNamespace['membershipID'])) {
+ if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+ $class= 'highlight checked';
+ }
?>
<div class='element<?php echo " $class";?>'>
<div class='content'>
diff --git a/application/views/scripts/statistic/category.phtml b/application/views/scripts/statistic/category.phtml
index 6b24f49..6b24f49 100644..100755
--- a/application/views/scripts/statistic/category.phtml
+++ b/application/views/scripts/statistic/category.phtml
diff --git a/application/views/scripts/statistic/index.phtml b/application/views/scripts/statistic/index.phtml
index 0d735bf..0d735bf 100644..100755
--- a/application/views/scripts/statistic/index.phtml
+++ b/application/views/scripts/statistic/index.phtml
diff --git a/application/views/scripts/statistic/running.phtml b/application/views/scripts/statistic/running.phtml
index 927b18a..927b18a 100644..100755
--- a/application/views/scripts/statistic/running.phtml
+++ b/application/views/scripts/statistic/running.phtml
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index 0729d36..f925a67 100755
--- a/gearman/controllerWorker.jar
+++ b/gearman/controllerWorker.jar
Binary files differ
diff --git a/gearman/controllerWorker/ControllerWorker/BootState.java b/gearman/controllerWorker/ControllerWorker/BootState.java
index 91c1f7a..91c1f7a 100644..100755
--- a/gearman/controllerWorker/ControllerWorker/BootState.java
+++ b/gearman/controllerWorker/ControllerWorker/BootState.java
diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownState.java b/gearman/controllerWorker/ControllerWorker/ShutdownState.java
index cf3aa8e..cf3aa8e 100644..100755
--- a/gearman/controllerWorker/ControllerWorker/ShutdownState.java
+++ b/gearman/controllerWorker/ControllerWorker/ShutdownState.java
diff --git a/gearman/worker.sh b/gearman/worker.sh
index 94271ed..7d355de 100755
--- a/gearman/worker.sh
+++ b/gearman/worker.sh
@@ -34,4 +34,4 @@
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
./shutdownWorker.py >> shutdownWorker.log 2>&1 &
-#./controllerWorker.jar ../application/configs/application.ini controllerWorker.log &
+./controllerWorker.jar ../application/configs/application.ini controllerWorker.log &
diff --git a/public/media/css/jquery.jqplot.min.css b/public/media/css/jquery.jqplot.min.css
index d1b2fef..d1b2fef 100644..100755
--- a/public/media/css/jquery.jqplot.min.css
+++ b/public/media/css/jquery.jqplot.min.css
diff --git a/public/media/js/jqplot.barRenderer.min.js b/public/media/js/jqplot.barRenderer.min.js
index 4d5766c..4d5766c 100644..100755
--- a/public/media/js/jqplot.barRenderer.min.js
+++ b/public/media/js/jqplot.barRenderer.min.js
diff --git a/public/media/js/jqplot.categoryAxisRenderer.min.js b/public/media/js/jqplot.categoryAxisRenderer.min.js
index 982d642..982d642 100644..100755
--- a/public/media/js/jqplot.categoryAxisRenderer.min.js
+++ b/public/media/js/jqplot.categoryAxisRenderer.min.js
diff --git a/public/media/js/jqplot.donutRenderer.min.js b/public/media/js/jqplot.donutRenderer.min.js
index c9095f1..c9095f1 100644..100755
--- a/public/media/js/jqplot.donutRenderer.min.js
+++ b/public/media/js/jqplot.donutRenderer.min.js
diff --git a/public/media/js/jqplot.pieRenderer.min.js b/public/media/js/jqplot.pieRenderer.min.js
index a324f80..a324f80 100644..100755
--- a/public/media/js/jqplot.pieRenderer.min.js
+++ b/public/media/js/jqplot.pieRenderer.min.js
diff --git a/public/media/js/jqplot.pointLabels.min.js b/public/media/js/jqplot.pointLabels.min.js
index 86b3fd8..86b3fd8 100644..100755
--- a/public/media/js/jqplot.pointLabels.min.js
+++ b/public/media/js/jqplot.pointLabels.min.js
diff --git a/public/media/js/jquery.jqplot.min.js b/public/media/js/jquery.jqplot.min.js
index 56dc881..56dc881 100644..100755
--- a/public/media/js/jquery.jqplot.min.js
+++ b/public/media/js/jquery.jqplot.min.js