summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php34
1 files changed, 14 insertions, 20 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 29ffe71..ab6f913 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -575,9 +575,9 @@ class EventController extends Zend_Controller_Action
}
/*
- * ------------------------
- * START CALENDAR FUNCTIONS
- * ------------------------
+ * ----------------------------------
+ * START - SPECIAL CALENDAR FUNCTIONS
+ * ----------------------------------
*/
public function getpoollistAction() {
@@ -663,7 +663,6 @@ class EventController extends Zend_Controller_Action
$evt['title'] = $e['title'];
$cfeventswithrepeat[] = $e;
}
- //} $this->_redirect('/event/');
}
// Check for overlap without repeat
@@ -806,9 +805,6 @@ class EventController extends Zend_Controller_Action
if($cfv) {
$cfeventswithoutrepeat[] = $e;
}
-
- //$this->view->events = $events;
- //$this->view->others = $others;
$this->view->overlapswithrepeat = $overlapswithrepeat;
$this->view->cfeventswithrepeat = $cfeventswithrepeat;
$this->view->overlapswithoutrepeat = $overlapswithoutrepeat;
@@ -1324,27 +1320,25 @@ class EventController extends Zend_Controller_Action
}
foreach ($eventList as $event){
- if($event->getPbs_poolID() == $poolID) {
- if($event->getCategory() == 1){$color = 'green' AND $textColor = 'white' AND $category= 'Lecture';}
- else if ($event->getCategory() == 2){$color = 'yellow' AND $textColor = 'black' AND $category = 'Maintenance';}
- else if ($event->getCategory() == 3){$color = 'blue' AND $textColor = 'white' AND $category = 'Boot';}
- else if ($event->getCategory() == 4){$color = 'red' AND $textColor = 'white' AND $category = 'Shutdown';}
- $events[] = array(
+ if($event->getPbs_poolID() == 2) {$textColor = 'black';}
+ else $textColor = 'white';
$events[] = array(
+
+ $events[] = array(
'id' => $event->getID(),
'title' => $event->getTitle(),
'start' => $event->getStart(),
'end' => $event->getEnd(),
- 'category' => $category,
+ 'category' => $this->eventcategoryMapper->getCategoryTitle($event->getCategory()),
'participants' => $event->getParticipants(),
'note' => $event->getNote(),
'poolID' => $event->getPbs_poolID(),
'bootosID' => $event->getPbs_bootosID(),
'allDay' => false,
- 'color' => $color,
+ 'color' => $this->eventcategoryMapper->getCategoryColor($poolID, $event->getCategory()),
'textColor' => $textColor,
- 'borderColor' => $color,
+ 'borderColor' => $this->eventcategoryMapper->getCategoryColor($poolID, $event->getCategory()),
'selected' => false,
'repeat' => $event->getRepeat(),
'opacity' => 1,
@@ -1352,7 +1346,7 @@ class EventController extends Zend_Controller_Action
'running' => $event->getRunning(),
)
);
- }
+ //}
}
echo json_encode($events);
}
@@ -1364,9 +1358,9 @@ class EventController extends Zend_Controller_Action
}
/*
- * ----------------------
- * END CALENDAR FUNCTIONS
- * ----------------------
+ * --------------------------------
+ * END - SPECIAL CALENDAR FUNCTIONS
+ * --------------------------------
*/