summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-22 16:08:46 +0200
committerBjörn Geiger2011-08-22 16:08:46 +0200
commit4f13c4f092dda388fe3956bd435a2e5b571b9e75 (patch)
tree7eeacfda54d12ba2f1c51c0811058ce86c65091e /application
parentminor (diff)
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-4f13c4f092dda388fe3956bd435a2e5b571b9e75.tar.gz
poolctrl-4f13c4f092dda388fe3956bd435a2e5b571b9e75.tar.xz
poolctrl-4f13c4f092dda388fe3956bd435a2e5b571b9e75.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php17
-rw-r--r--application/controllers/GearmanController.php2
-rw-r--r--application/views/scripts/event/index.phtml19
3 files changed, 28 insertions, 10 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 6a9a470..39eb9e7 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -305,6 +305,7 @@ class EventController extends Zend_Controller_Action
$filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3);
$filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
+ $event->setRunning(false);
try {
$eventID = $this->eventMapper->save($event);
} catch(Zend_Exception $e)
@@ -462,6 +463,7 @@ class EventController extends Zend_Controller_Action
$filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3);
$filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
+ $event->setRunning(false);
try {
$this->eventMapper->save($event);
} catch(Zend_Exception $e)
@@ -476,7 +478,6 @@ class EventController extends Zend_Controller_Action
$event = new Application_Model_Event();
$this->eventMapper->find($eventID, $event);
$this->getRequest()->setParam('title', $event->getTitle());
- $this->getRequest()->setParam('action', $event->getAction());
$this->getRequest()->setParam('immediate', $event->getImmediate());
$this->getRequest()->setParam('start', $event->getStart());
$this->getRequest()->setParam('end', $event->getEnd());
@@ -495,24 +496,34 @@ class EventController extends Zend_Controller_Action
}
}
- public function listAction(){
+ public function listeventsAction(){
+
$this->_helper->layout->disableLayout();
$this->_helper->viewRenderer->setNoRender();
$eventList = $this->eventMapper->fetchAll();
foreach ($eventList as $event){
+
+ if($event->getCategory() == 1){$color= 'green' AND $category= 'Lecture';}
+ else if ($event->getCategory() == 2){$color= 'yellow' AND $category= 'Maintenance';}
+ else if ($event->getCategory() == 3){$color= 'blue' AND $category= 'BootEvent';}
+ else if ($event->getCategory() == 4){$color= 'red' AND $category= 'ShutdownEvent';}
+ $events[] = array(
+
$events[] = array(
'id' => $event->getID(),
'title' => $event->getTitle(),
'start' => $event->getStart(),
'end' => $event->getEnd(),
- 'category' => $event->getCategory(),
+ 'category' => $category,
'participants' => $event->getParticipants(),
'note' => $event->getNote(),
'poolID' => $event->getPbs_poolID(),
'bootosID' => $event->getPbs_bootosID(),
'allDay' => false,
+ 'color' => $color,
+ )
);
}
echo json_encode($events);
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 2ac1abd..8e0252f 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -22,8 +22,8 @@ class GearmanController extends Zend_Controller_Action
if(isset($this->userIDsNamespace['apikey'])) {
$this->acl = new Poolctrl_Acl($this->pbs2host, $this->config['pbs2']['checkright'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
}
- $this->gearmanServerHost = $this->config['gearman']['server']['host'];
$this->gearmanServerPort = $this->config['gearman']['server']['port'];
+ $this->gearmanServerHost = $this->config['gearman']['server']['host'];
$this->gearmanWorkerWaitTime = $this->config['gearman']['worker']['waitTime'];
$this->gearmanWorkerUpdateRate = $this->config['gearman']['worker']['updateRate'];
$this->gearmanClient = new GearmanClient();
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 8bfe4c1..a1db7b6 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -20,6 +20,11 @@
</select>
</form>
+<input type=checkbox name="shutdown" checked=ON><font color="#008800">Lecture</font>
+<input type=checkbox name="shutdown" checked=ON><font color="#FFFF00">Maintenance</font>
+<input type=checkbox name="shutdown" checked=ON><font color="#0000FF">BootEvents</font>
+<input type=checkbox name="shutdown" checked=ON><font color="#FF0000">ShutdownEvents</font>
+
<div id='calendar' style='margin:3em 0;font-size:13px'></div>
<script type="text/javascript">
@@ -72,18 +77,20 @@ $(document).ready(function() {iniCalendar();});
defaultView: 'agendaWeek',
allDay : false,
- events: "/event/list",
+ events: "/event/listevents",
dayClick: function(date, allDay, jsEvent, view) {
self.location="/event/add/";
},
- eventClick: function(event, element) {
- var title = prompt('New Title:');
- event.title = title;
-
- $('#calendar').fullCalendar('updateEvent', event);
+ eventClick: function(calEvent) {
+ alert('Event: ' + calEvent.title +
+ '\nStart: ' + calEvent.start +
+ '\nEnd: ' + calEvent.end +
+ '\nNote: ' + calEvent.note +
+ '\nCategory: ' + calEvent.category +
+ '\nParticipants ' + calEvent.participants);
}
});
}