summaryrefslogtreecommitdiffstats
path: root/application/models
diff options
context:
space:
mode:
authorSebastian Wagner2011-11-16 13:18:15 +0100
committerSebastian Wagner2011-11-16 13:18:15 +0100
commit19ba0a7718ebc2745eb9b7c04a75f6e3657a1fa8 (patch)
treec8926acb5b0494b29882b552cec3f4ceec9abf81 /application/models
parentCode Cleaning und verschiedene kleine Korrekturen (diff)
downloadpoolctrl-19ba0a7718ebc2745eb9b7c04a75f6e3657a1fa8.tar.gz
poolctrl-19ba0a7718ebc2745eb9b7c04a75f6e3657a1fa8.tar.xz
poolctrl-19ba0a7718ebc2745eb9b7c04a75f6e3657a1fa8.zip
more clean up
Diffstat (limited to 'application/models')
-rwxr-xr-xapplication/models/EventMapper.php2
-rwxr-xr-xapplication/models/EventcategoryMapper.php63
2 files changed, 48 insertions, 17 deletions
diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php
index 9545380..438613f 100755
--- a/application/models/EventMapper.php
+++ b/application/models/EventMapper.php
@@ -468,7 +468,7 @@ class Application_Model_EventMapper
$event->setID($result['eventID']);
$return[] = $event;
}
-
+
return $return;
}
diff --git a/application/models/EventcategoryMapper.php b/application/models/EventcategoryMapper.php
index 251fc82..3db9013 100755
--- a/application/models/EventcategoryMapper.php
+++ b/application/models/EventcategoryMapper.php
@@ -152,22 +152,24 @@ class Application_Model_EventcategoryMapper
return array_diff_assoc($vv1,$vv2);
}
- public function getCategoryColor($poolID) {
+ public function getCategoryColor($poolID, $eventcategoryID) {
$db = Zend_Db_Table::getDefaultAdapter();
if($poolID != 'all'){
- $select = $this->getDbTable()->select()
- ->distinct()
- ->setIntegrityCheck(false)
- ->from(array('pcec' => 'poolctrl_eventcategory'),
- array('color' => 'pcec.color'))
- ->join(array('pce' => 'poolctrl_event'),
+ if(isset($eventcategoryID)) {
+ $select = $this->getDbTable()->select()
+ ->distinct()
+ ->setIntegrityCheck(false)
+ ->from(array('pcec' => 'poolctrl_eventcategory'),
+ array('color' => 'pcec.color'))
+ ->join(array('pce' => 'poolctrl_event'),
'pce.category = pcec.eventcategoryID',
- array())
- ->where('pce.pbs_poolID = ?', $poolID)
- ->group('pce.category')
- ->order('eventcategoryID ASC');}
- else {
+ array())
+ ->where('pce.pbs_poolID = ?', $poolID)
+ ->where('pcec.eventcategoryID = ?', $eventcategoryID)
+ ->group('pce.category')
+ ->order('eventcategoryID ASC');
+ } else {
$select = $this->getDbTable()->select()
->distinct()
->setIntegrityCheck(false)
@@ -176,14 +178,43 @@ class Application_Model_EventcategoryMapper
->join(array('pce' => 'poolctrl_event'),
'pce.category = pcec.eventcategoryID',
array())
+ ->where('pce.pbs_poolID = ?', $poolID)
->group('pce.category')
->order('eventcategoryID ASC');
}
+ }
+ else {
+ $select = $this->getDbTable()->select()
+ ->distinct()
+ ->setIntegrityCheck(false)
+ ->from(array('pcec' => 'poolctrl_eventcategory'),
+ array('color' => 'pcec.color'))
+ ->join(array('pce' => 'poolctrl_event'),
+ 'pce.category = pcec.eventcategoryID',
+ array())
+ ->group('pce.category')
+ ->order('eventcategoryID ASC');
+ }
- $stmt = $db->query($select);
- $result = $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
-
- return $result;
+ $stmt = $db->query($select);
+ $result = $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
+
+ return $result;
+ }
+
+ public function getCategoryTitle($eventcategoryID) {
+ $db = Zend_Db_Table::getDefaultAdapter();
+ $select = $this->getDbTable()->select()
+ ->from(array('pcec' => 'poolctrl_eventcategory'),
+ 'pcec.title')
+ ->where('pcec.eventcategoryID = ?', $eventcategoryID)
+ ->group('pcec.eventcategoryID');
+
+ $stmt = $db->query($select);
+ $result = $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
+
+ return $result;
+
}
} \ No newline at end of file