summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-10 15:36:14 +0200
committerBjörn Geiger2011-10-10 15:36:14 +0200
commit6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f (patch)
tree9ebe3a6805f7c6b3bc0402616c4e52e0abfa87f2 /application
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.tar.gz
poolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.tar.xz
poolctrl-6ad8b3a8c3e31c4689d008b8e29a101e3ed8d12f.zip
kleine Korrekturen
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php10
-rwxr-xr-xapplication/models/EventMapper.php2
-rwxr-xr-xapplication/models/EventcategoryMapper.php2
-rwxr-xr-xapplication/models/EventreportMapper.php2
-rwxr-xr-xapplication/models/RepeatendMapper.php6
-rwxr-xr-xapplication/models/RepeattypeMapper.php6
-rwxr-xr-xapplication/models/RunningtypeMapper.php6
7 files changed, 26 insertions, 8 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ab001f5..7365d2a 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -430,9 +430,9 @@ class EventController extends Zend_Controller_Action
unset($params[$configName]);
$event->setPbs_configID(null);
}
- $params['start'] = date ('Y-m-d H:i', strtotime($params['start']));
+ $params['start'] = date ('Y-m-d H:i:s', strtotime($params['start']));
if(isset($params['end'])) {
- $params['end'] = date ('Y-m-d H:i', strtotime($params['end']));
+ $params['end'] = date ('Y-m-d H:i:s', strtotime($params['end']));
} else {
unset($params['end']);
}
@@ -443,7 +443,7 @@ class EventController extends Zend_Controller_Action
unset($params['repeatend']);
}
if(isset($params['repeatdate'])) {
- $params['repeatdate'] = date ('Y-m-d H:i', strtotime($params['repeatdate']));
+ $params['repeatdate'] = date ('Y-m-d H:i:s', strtotime($params['repeatdate']));
} else {
unset($params['repeatdate']);
}
@@ -2215,7 +2215,7 @@ class EventController extends Zend_Controller_Action
private function editRepeatEvent(Application_Model_Event $oldEvent, Application_Model_Event $newEvent) {
$diff = $this->eventMapper->compare($newEvent, $oldEvent);
if(isset($diff['start']) || isset($diff['end']) || isset($diff['pbs_filterID'])) {
-
+
} else {
$events = $this->eventMapper->findBy(array($oldEvent->getTitle()));
try {
@@ -2246,4 +2246,4 @@ class EventController extends Zend_Controller_Action
return;
}
}
-}
+} \ No newline at end of file
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index b99ece4..1b6d0fe 100755
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -181,7 +181,7 @@ class Application_Model_EventMapper
public function compare(Application_Model_Event $v1,Application_Model_Event $v2){
$vv1 = $v1->toArray();
$vv2 = $v2->toArray();
- return array_diff($vv1,$vv2);
+ return array_diff_assoc($vv1,$vv2);
}
public function getCategoryBarCount($poolID) {
diff --git a/application/models/EventcategoryMapper.php b/application/models/EventcategoryMapper.php
index f1a5996..251fc82 100755
--- a/application/models/EventcategoryMapper.php
+++ b/application/models/EventcategoryMapper.php
@@ -149,7 +149,7 @@ class Application_Model_EventcategoryMapper
public function compare(Application_Model_Eventcategory $v1,Application_Model_Eventcategory $v2){
$vv1 = $v1->toArray();
$vv2 = $v2->toArray();
- return array_diff($vv1,$vv2);
+ return array_diff_assoc($vv1,$vv2);
}
public function getCategoryColor($poolID) {
diff --git a/application/models/EventreportMapper.php b/application/models/EventreportMapper.php
index 4d2b55d..89c1124 100755
--- a/application/models/EventreportMapper.php
+++ b/application/models/EventreportMapper.php
@@ -161,7 +161,7 @@ class Application_Model_EventreportMapper
public function compare(Application_Model_Eventreport $v1,Application_Model_Eventreport $v2){
$vv1 = $v1->toArray();
$vv2 = $v2->toArray();
- return array_diff($vv1,$vv2);
+ return array_diff_assoc($vv1,$vv2);
}
public function getSuccessBarCount($poolID) {
diff --git a/application/models/RepeatendMapper.php b/application/models/RepeatendMapper.php
index dc7782a..a79e478 100755
--- a/application/models/RepeatendMapper.php
+++ b/application/models/RepeatendMapper.php
@@ -136,4 +136,10 @@ class Application_Model_RepeatendMapper
}
return $entries;
}
+
+ public function compare(Application_Model_Repeatend $v1,Application_Model_Repeatend $v2){
+ $vv1 = $v1->toArray();
+ $vv2 = $v2->toArray();
+ return array_diff_assoc($vv1,$vv2);
+ }
} \ No newline at end of file
diff --git a/application/models/RepeattypeMapper.php b/application/models/RepeattypeMapper.php
index aceb4ce..86c398d 100755
--- a/application/models/RepeattypeMapper.php
+++ b/application/models/RepeattypeMapper.php
@@ -136,4 +136,10 @@ class Application_Model_RepeattypeMapper
}
return $entries;
}
+
+ public function compare(Application_Model_Repeattype $v1,Application_Model_Repeattype $v2){
+ $vv1 = $v1->toArray();
+ $vv2 = $v2->toArray();
+ return array_diff_assoc($vv1,$vv2);
+ }
} \ No newline at end of file
diff --git a/application/models/RunningtypeMapper.php b/application/models/RunningtypeMapper.php
index 17d18de..f2018e1 100755
--- a/application/models/RunningtypeMapper.php
+++ b/application/models/RunningtypeMapper.php
@@ -136,4 +136,10 @@ class Application_Model_RunningtypeMapper
}
return $entries;
}
+
+ public function compare(Application_Model_Runningtype $v1,Application_Model_Runningtype $v2){
+ $vv1 = $v1->toArray();
+ $vv2 = $v2->toArray();
+ return array_diff_assoc($vv1,$vv2);
+ }
} \ No newline at end of file