summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-07 15:32:57 +0200
committerSebastian Wagner2011-09-07 15:32:57 +0200
commit2be81f5ddbc943922a2b61a111d63b864669b8ed (patch)
tree3a9789fbba51e0a4934a2cfa2942c8a5ea392929 /application
parentkleine korrektur in DB (diff)
downloadpoolctrl-2be81f5ddbc943922a2b61a111d63b864669b8ed.tar.gz
poolctrl-2be81f5ddbc943922a2b61a111d63b864669b8ed.tar.xz
poolctrl-2be81f5ddbc943922a2b61a111d63b864669b8ed.zip
some changes
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php8
-rw-r--r--application/views/scripts/event/index.phtml38
2 files changed, 26 insertions, 20 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 2221ca5..dd4ceee 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -533,7 +533,7 @@ class EventController extends Zend_Controller_Action
$evid = $this->getRequest()->getParam('evid');
$evend = $this->getRequest()->getParam('evend');
- var_dump(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
+ //var_dump(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
if ($evid!=null) {
$this->eventMapper->find($evid,$event); //locate the event in the DB
@@ -547,10 +547,13 @@ class EventController extends Zend_Controller_Action
$this->_helper->layout->disableLayout();
$this->_helper->viewRenderer->setNoRender();
+ $poolID = $this->getRequest()->getParam('poolID');
$eventList = $this->eventMapper->fetchAll();
+ //var_dump($poolID);
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';}
@@ -572,6 +575,7 @@ class EventController extends Zend_Controller_Action
'textColor' => $textColor,
)
);
+ }
}
echo json_encode($events);
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index afc1e19..e858338 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -10,17 +10,16 @@
?>
<form name="PoolSelectForm"><select name="PoolSelectbox"
- onChange="deselectAll();selectPool();addEventSource()">
- <option>Please choose a Pool</option>
- <?php if(count($this->poollist)>0){
- foreach($this->poollist as $pool => $p){
- echo "<option value='" . $p->getID() . "'>" . $p->getTitle() . "</option>";
- }
- } else echo '<option> No Pools </option>';?>
+ onChange="deselectAll();selectPool();">
+ <option>Please choose a Pool</option>
+ <?php if(count($this->poollist)>0){
+ foreach($this->poollist as $pool => $p){
+ echo "<option value='" . $p->getID() . "'>" . $p->getTitle() . "</option>";
+ }
+ } else echo '<option> No Pools </option>';?>
</select></form>
-<div
- id='calendar' style='margin: 3em 0; font-size: 13px'></div>
+<div id='calendar' style='margin: 3em 0; font-size: 13px'></div>
<script type="text/javascript">
@@ -35,8 +34,9 @@ var lastview;
$("#calendar").hide();
}
- function getPoolID(poolID){
- poolID = selectedOption.value;
+ function getPoolID() {
+ poolID = 1;
+ //poolID = selectedOption.value;
return poolID;
}
@@ -48,6 +48,7 @@ var lastview;
poolID = selectedOption.value;
setVisible('pool' + poolID);
}
+
function deselectAll() {
selectForm = document.PoolSelectForm;
selectBox = selectForm.PoolSelectbox;
@@ -83,8 +84,8 @@ var lastview;
slotMinutes: 30,
defaultEventMinutes: 5,
-
- events: "/event/eventlist",
+
+ events: "/event/eventlist/poolID/" + getPoolID(),
@@ -111,12 +112,13 @@ var lastview;
select: function( startDate, endDate, allDay, jsEvent, view ) {
- //$.post("/event/add/evstart" + startDate + "/evend" + endDate);
- //self.location="/event/add/evstart" + startDate + "/evend" + endDate;
- //alert(startDate + "\n" + endDate);
if (!confirm("Are you sure to add an Event from " + startDate + " to " + endDate + " ?")) {
-
- }else {self.location="/event/add/";}
+ $('#calendar').fullCalendar( 'unselect' );
+ }else {
+ self.location="/event/add/";
+ //self.location="/event/add/evstart" + startDate + "/evend" + endDate;
+ //$.post("/event/add/evstart" + startDate + "/evend" + endDate);
+ }
},