summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 13:45:49 +0200
committerBjörn Geiger2011-09-08 13:45:49 +0200
commiteb21e13dcdd038315d0ad1ff4941d1069af9b977 (patch)
treef01bcd0cc3e5efa56cec23f650582f6d33af8481 /application/controllers/EventController.php
parentsome changes (diff)
downloadpoolctrl-eb21e13dcdd038315d0ad1ff4941d1069af9b977.tar.gz
poolctrl-eb21e13dcdd038315d0ad1ff4941d1069af9b977.tar.xz
poolctrl-eb21e13dcdd038315d0ad1ff4941d1069af9b977.zip
kleine korrekturen
Diffstat (limited to 'application/controllers/EventController.php')
-rw-r--r--application/controllers/EventController.php25
1 files changed, 19 insertions, 6 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 4edabab..5a5e92e 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -227,18 +227,31 @@ class EventController extends Zend_Controller_Action
$add = $this->getRequest()->getParam("add");
if($this->getRequest()->getParam('evstart')) {
$evstart = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evstart'), 0, 24)));
+ } else if($this->getRequest()->getParam('start')) {
+ $evstart = $this->getRequest()->getParam('start');
}
if($this->getRequest()->getParam('evend')) {
$evend = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evend'), 0, 24)));
+ } else if($this->getRequest()->getParam('end')) {
+ $evend = $this->getRequest()->getParam('end');
}
if (!isset($add)){
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $evstart, 'end' => $evend, 'defaultEventCategory' => $this->config['event']['category']['default']));
+ $defaultEventCategory = $this->config['event']['category']['default'];
+ foreach($eventcategorylist as $eventcategory) {
+ if($eventcategory->getTitle() == $defaultEventCategory) {
+ $defaultEventCategoryID = $eventcategory->getID();
+ break;
+ }
+ }
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $evstart, 'end' => $evend, 'defaultEventCategoryID' => $defaultEventCategoryID));
} else {
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'defaultEventCategory' => $this->config['event']['category']['default'], $this->getRequest()->getParams()));
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $evstart, 'end' => $evend, $this->getRequest()->getParams()));
if ($addForm->isValid($this->getRequest()->getParams())) {
- $this->getRequest()->setParam('start', date ('Y-m-d H:i', strtotime($this->getRequest()->getParam('start'))));
+ $startTimestamp = strtotime($this->getRequest()->getParam('start'));
+ $this->getRequest()->setParam('start', date ('Y-m-d H:i', $startTimestamp));
if($this->getRequest()->getParam('end')) {
- $this->getRequest()->setParam('end', date ('Y-m-d H:i', strtotime($this->getRequest()->getParam('end'))));
+ $endTimestamp = strtotime($this->getRequest()->getParam('end'));
+ $this->getRequest()->setParam('end', date ('Y-m-d H:i', $endTimestamp));
}
$event = new Application_Model_Event($this->getRequest()->getParams());
$event->setPbs_membershipID($this->userIDsNamespace['membershipID']);
@@ -601,9 +614,9 @@ class EventController extends Zend_Controller_Action
}
$this->_helper->layout->disableLayout();
$this->_helper->viewRenderer->setNoRender();
- $startTime = time();
+ $startTime = time() - 60;
$updatePeriod = $this->config['event']['updatePeriod'];
- $endTime = $startTime + $updatePeriod * 60;
+ $endTime = $startTime + 60 + $updatePeriod * 60;
$eventlist = $this->eventMapper->fetchAll();
$eventcategoryMapper = new Application_Model_EventcategoryMapper();
$result = $eventcategoryMapper->fetchAll();