summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-07 13:10:31 +0200
committerSebastian Wagner2011-09-07 13:10:31 +0200
commit6d13ab651dc30c5116bc4a801f61a92b2883b25a (patch)
tree97693a0b4396e5adc048cafe6d1663a493710b2a /application
parentminor (diff)
downloadpoolctrl-6d13ab651dc30c5116bc4a801f61a92b2883b25a.tar.gz
poolctrl-6d13ab651dc30c5116bc4a801f61a92b2883b25a.tar.xz
poolctrl-6d13ab651dc30c5116bc4a801f61a92b2883b25a.zip
some bugfixes
Diffstat (limited to 'application')
-rw-r--r--application/controllers/EventController.php6
-rw-r--r--application/views/scripts/event/index.phtml15
2 files changed, 16 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index c25f1cd..51fdf1e 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -512,11 +512,13 @@ class EventController extends Zend_Controller_Action
$evid = $this->getRequest()->getParam('evid');
$evstart = $this->getRequest()->getParam('evstart');
$evend = $this->getRequest()->getParam('evend');
-
+ var_dump($evend);
+
if ($evid!=null) {
$this->eventMapper->find($evid,$event); //locate the event in the DB
$event->setStart(date('Y-m-d H:i:s', strtotime(substr($evstart, 0, 24))));
- $event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
+ if($evend!=null){
+ $event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));}
$this->eventMapper->save($event); //save the event with the new data
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b286e3d..afc1e19 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -10,7 +10,7 @@
?>
<form name="PoolSelectForm"><select name="PoolSelectbox"
- onChange="deselectAll();selectPool();">
+ onChange="deselectAll();selectPool();addEventSource()">
<option>Please choose a Pool</option>
<?php if(count($this->poollist)>0){
foreach($this->poollist as $pool => $p){
@@ -34,6 +34,11 @@ var lastview;
function hideCalendar() {
$("#calendar").hide();
}
+
+ function getPoolID(poolID){
+ poolID = selectedOption.value;
+ return poolID;
+ }
function selectPool() {
selectForm = document.PoolSelectForm;
@@ -81,15 +86,16 @@ var lastview;
events: "/event/eventlist",
+
+
dayClick: function( date, allDay, jsEvent, view ) {
-
//self.location="/event/add/";
},
eventMouseover: function( event, jsEvent, view ) {
},
- eventMouseout: function( event, jsEvent, view ) {
+ eventMouseout: function( event, jsEvent, view ) {
},
eventClick: function(calEvent) {
@@ -190,6 +196,9 @@ var lastview;
$('.fc-header-center').append('<span class="fc-button fc-state-default fc-corner-right fc-state-active"><span class="fc-button-inner"><span id="boot" class="fc-button-content">Boot</span><span class="fc-button-effect"><span></span></span></span></span>');
$('.fc-header-center').append('<span class="fc-button fc-state-default fc-corner-right fc-state-active"><span class="fc-button-inner"><span id="shutdown" class="fc-button-content">Shutdown</span><span class="fc-button-effect"><span></span></span></span></span>');
// $('.fc-header-right').append('<span class="fc-button fc-state-default fc-corner-right fc-state-active"><span class="fc-button-inner"><span id="addevent" class="fc-button-content">Add Event</span><span class="fc-button-effect"><span></span></span></span></span>');
+ $('.fc-header-left').append('<form name="PoolSelectForm"><select name="PoolSelectbox" onChange=""><option>Please choose a Pool</option></select></form>');
+
+
$('#calendar').click(function() {
//$('#calendar').fullCalendar('addEventSource', "/event/eventlist");
//$('#calendar').fullCalendar('removeEvents', function(calEvent) { return calEvent.category == 'Lecture'} );