summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-04 13:23:45 +0200
committerBjörn Geiger2011-10-04 13:23:45 +0200
commitd92188ebad9526d4c0b94043b6044e6566fc18dc (patch)
treee769d71829eec88280aa02931f9ed68dbb801435
parentsome changes (diff)
downloadpoolctrl-d92188ebad9526d4c0b94043b6044e6566fc18dc.tar.gz
poolctrl-d92188ebad9526d4c0b94043b6044e6566fc18dc.tar.xz
poolctrl-d92188ebad9526d4c0b94043b6044e6566fc18dc.zip
kleine Korrektur
-rwxr-xr-xapplication/controllers/EventController.php46
1 files changed, 26 insertions, 20 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 7e09c37..c063f2e 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -633,15 +633,17 @@ class EventController extends Zend_Controller_Action
$this->eventMapper->find($evid,$event); //locate the event in the DB
$oldStartTime = date('H:i', strtotime($event->getStart()));
$oldStartDate = date('Y-m-d', strtotime($event->getStart()));
- $newStartTime = date('H:i', strtotime(substr($evstart, 0, 24)));
- $newStartDate = date('Y-m-d', strtotime(substr($evstart, 0, 24)));
- $event->setStart(date('Y-m-d H:i:s', strtotime(substr($evstart, 0, 24))));
- $oldEndTime = date('H:i', strtotime($event->getEnd()));
- $oldEndDate = date('Y-m-d', strtotime($event->getEnd()));
- $newEndTime = date('H:i', strtotime(substr($evend, 0, 24)));
- $newEndDate = date('Y-m-d', strtotime(substr($evend, 0, 24)));
- if($evend!="null"){
- $event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
+ $evstartTime = intval(strtotime(substr($evstart, 0, 24)));
+ $newStartTime = date('H:i', $evstartTime);
+ $newStartDate = date('Y-m-d', $evstartTime);
+ $event->setStart(date('Y-m-d H:i:s', $evstartTime));
+ if($event->getEnd()){
+ $oldEndTime = date('H:i', strtotime($event->getEnd()));
+ $oldEndDate = date('Y-m-d', strtotime($event->getEnd()));
+ $evendTime = intval(strtotime(substr($evend, 0, 24)));
+ $newEndTime = date('H:i', $evendTime);
+ $newEndDate = date('Y-m-d', $evendTime);
+ $event->setEnd(date('Y-m-d H:i:s', $evendTime));
}
$this->eventMapper->save($event); //save the event with the new data
if($event->getPbs_filterID()) {
@@ -701,16 +703,20 @@ class EventController extends Zend_Controller_Action
//1min = 60sec, 1d = 86400sec
$oldStartTime = date('H:i', strtotime($event->getStart()));
$oldStartDate = date('Y-m-d', strtotime($event->getStart()));
- $newStartTime = date('H:i', strtotime(substr($evstart, 0, 24)));
- $newStartDate = date('Y-m-d', strtotime(substr($evstart, 0, 24)));
- $oldEndTime = date('H:i', strtotime($event->getEnd()));
- $oldEndDate = date('Y-m-d', strtotime($event->getEnd()));
- $newEndTime = date('H:i', strtotime(substr($evend, 0, 24)));
- $newEndDate = date('Y-m-d', strtotime(substr($evend, 0, 24)));
- $eventStart = date('Y-m-d H:i:s', intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400));
- $eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400));
+ $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $newStartTime = date('H:i', $evstartTime);
+ $newStartDate = date('Y-m-d', $evstartTime);
+ $eventStart = date('Y-m-d H:i:s', $evstartTime);
$event->setStart($eventStart);
- $event->setEnd($eventEnd);
+ if($event->getEnd()) {
+ $oldEndTime = date('H:i', strtotime($event->getEnd()));
+ $oldEndDate = date('Y-m-d', strtotime($event->getEnd()));
+ $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $newEndTime = date('H:i', $evendTime);
+ $newEndDate = date('Y-m-d', $evendTime);
+ $eventEnd = date('Y-m-d H:i:s', $evendTime);
+ $event->setEnd($eventEnd);
+ }
$event->setPbs_poolID($poolID);
if($event->getPbs_filterID()) {
if($event->getRepeat()) {
@@ -1349,7 +1355,7 @@ class EventController extends Zend_Controller_Action
$clientsXML = $pool->clients;
$count = 1;
foreach($clientsXML->client as $clientNew) {
- if($event->getParticipants() > 0 && $event->getParticipants() > $count) {
+ if($event->getImmediate() || ($event->getParticipants() > 0 && $event->getParticipants() > $count)) {
$client = new Application_Model_Client();
$client->setID(sprintf("%s", $clientNew->clientID));
$client->setCreated(sprintf("%s", $clientNew->created));
@@ -2170,4 +2176,4 @@ class EventController extends Zend_Controller_Action
return;
}
}
-} \ No newline at end of file
+}