From e436fee45dee956d7cf5f0fbcf9758d6af57f00a Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 16 Nov 2011 16:09:02 +0100 Subject: more clean up --- application/models/EventMapper.php | 155 ++++++------------------------- application/models/EventreportMapper.php | 50 ++-------- 2 files changed, 39 insertions(+), 166 deletions(-) (limited to 'application/models') diff --git a/application/models/EventMapper.php b/application/models/EventMapper.php index 438613f..01d2f4c 100755 --- a/application/models/EventMapper.php +++ b/application/models/EventMapper.php @@ -186,44 +186,7 @@ class Application_Model_EventMapper return array_diff_assoc($vv1,$vv2); } - public function getCategoryBarCount($poolID) { - - $db = Zend_Db_Table::getDefaultAdapter(); - if($poolID != 'all'){ - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('count' => 'COUNT(*)', 'category' => 'pcec.title')) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()) - ->where('pce.pbs_poolID = ?', $poolID) - ->group('pce.category') - ->order('pce.category ASC');} - else { - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('count' => 'COUNT(*)', 'category' => 'pcec.title')) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()) - ->group('pce.category') - ->order('pce.category ASC'); - } - - $stmt = $db->query($select); - $result = $stmt->fetchAll(PDO::FETCH_NUM); - $ret = null; - - foreach ($result as $r) { - $ret[] = array((int)$r[0], $r[1]); - } - - return array($ret); - } - - public function getCategoryPieCount($poolID) { + public function getCategoryPlotdata($poolID, $plotType) { $db = Zend_Db_Table::getDefaultAdapter(); if($poolID != 'all'){ @@ -254,13 +217,17 @@ class Application_Model_EventMapper $ret = null; foreach ($result as $r) { - $ret[] = array($r[0], (int)$r[1]); + if($plotType == 1) { + $ret[] = array((int)$r[1], $r[0]); + } else if ($plotType == 2) { + $ret[] = array($r[0], (int)$r[1]); + } } return array($ret); } - public function getRunningBarCount($poolID) { + public function getRunningPlotdata($poolID, $plotType) { $db = Zend_Db_Table::getDefaultAdapter(); if($poolID != 'all'){ @@ -288,51 +255,21 @@ class Application_Model_EventMapper $result = $stmt->fetchAll(PDO::FETCH_NUM); foreach ($result as $r) { - $ret1 = array((int)$r[0],'not over'); - $ret2 = array((int)$r[1],'over'); - $return[] = array($ret1,$ret2); - } - - return $return; - } - - public function getRunningPieCount($poolID) { - - $db = Zend_Db_Table::getDefaultAdapter(); - if($poolID != 'all'){ - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('count1' => 'SUM(IF(pce.running=1,1,0))', 'count0' => 'SUM(IF(pce.running=1,0,1))') - ) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()) - ->where('pce.pbs_poolID = ?', $poolID);} - else { - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('over' => 'SUM(IF(pce.running=1,1,0))', 'not_over' => 'SUM(IF(pce.running=1,0,1))') - ) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()); - } - - $stmt = $db->query($select); - $result = $stmt->fetchAll(PDO::FETCH_NUM); - - foreach ($result as $r) { - $ret1 = array('over', (int)$r[0]); - $ret2 = array('not over', (int)$r[1]); - $return[] = array($ret1,$ret2); + if($plotType == 1) { + $ret1 = array((int)$r[0],'not over'); + $ret2 = array((int)$r[1],'over'); + $return[] = array($ret1,$ret2); + } else if($plotType == 2) { + $ret1 = array('over', (int)$r[0]); + $ret2 = array('not over', (int)$r[1]); + $return[] = array($ret1,$ret2); + } } return $return; } - public function getTypeBarCount($poolID) { + public function getTypePlotdata($poolID, $plotType) { $db = Zend_Db_Table::getDefaultAdapter(); if($poolID != 'all'){ @@ -364,51 +301,17 @@ class Application_Model_EventMapper $result = $stmt->fetchAll(PDO::FETCH_NUM); foreach ($result as $r) { - $ret1 = array((int)$r[0], 'other'); - $ret2 = array((int)$r[1], 'repeat'); - $ret3 = array((int)$r[2], 'immediate'); - $return[] = array($ret1,$ret2,$ret3); - } - - return $return; - } - - public function getTypePieCount($poolID) { - - $db = Zend_Db_Table::getDefaultAdapter(); - if($poolID != 'all'){ - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('other' => 'SUM(IF(pce.repeat=0 AND pce.immediate=0,1,0))', - 'repeat' => 'SUM(IF(pce.repeat=1 AND pce.immediate=0,1,0))', - 'immediate' => 'SUM(IF(pce.repeat=0 AND pce.immediate=1,1,0))') - ) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()) - ->where('pce.pbs_poolID = ?', $poolID);} - else { - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pce' => 'poolctrl_event'), - array('other' => 'SUM(IF(pce.repeat=0 AND pce.immediate=0,1,0))', - 'repeat' => 'SUM(IF(pce.repeat=1 AND pce.immediate=0,1,0))', - 'immediate' => 'SUM(IF(pce.repeat=0 AND pce.immediate=1,1,0))') - ) - ->join(array('pcec' => 'poolctrl_eventcategory'), - 'pce.category = pcec.eventcategoryID', - array()); - } - - $stmt = $db->query($select); - $result = $stmt->fetchAll(PDO::FETCH_NUM); - - foreach ($result as $r) { - $ret1 = array('other', (int)$r[0]); - $ret2 = array('repeat', (int)$r[1]); - $ret3 = array('immediate', (int)$r[2]); - $return[] = array($ret1,$ret2,$ret3); + if($plotType == 1) { + $ret1 = array((int)$r[0], 'other'); + $ret2 = array((int)$r[1], 'repeat'); + $ret3 = array((int)$r[2], 'immediate'); + $return[] = array($ret1,$ret2,$ret3); + } else if ($plotType == 2) { + $ret1 = array('other', (int)$r[0]); + $ret2 = array('repeat', (int)$r[1]); + $ret3 = array('immediate', (int)$r[2]); + $return[] = array($ret1,$ret2,$ret3); + } } return $return; @@ -468,7 +371,7 @@ class Application_Model_EventMapper $event->setID($result['eventID']); $return[] = $event; } - + return $return; } diff --git a/application/models/EventreportMapper.php b/application/models/EventreportMapper.php index da37e66..371fa26 100755 --- a/application/models/EventreportMapper.php +++ b/application/models/EventreportMapper.php @@ -164,7 +164,7 @@ class Application_Model_EventreportMapper return array_diff_assoc($vv1,$vv2); } - public function getSuccessBarCount($poolID) { + public function getSuccessPlotdata($poolID, $plotType) { $db = Zend_Db_Table::getDefaultAdapter(); if($poolID != 'all'){ @@ -192,49 +192,19 @@ class Application_Model_EventreportMapper $result = $stmt->fetchAll(PDO::FETCH_NUM); foreach ($result as $r) { - $ret1 = array((int)$r[0],'Succeeded'); - $ret2 = array((int)$r[1],'Failed'); - $return[] = array($ret1,$ret2); + if($plotType == 1) { + $ret1 = array((int)$r[0],'Succeeded'); + $ret2 = array((int)$r[1],'Failed'); + $return[] = array($ret1,$ret2); + } else if($plotType == 2) { + $ret1 = array('Successful', (int)$r[0]); + $ret2 = array('Failed', (int)$r[1]); + $return[] = array($ret1,$ret2); + } } return $return; } - public function getSuccessPieCount($poolID) { - - $db = Zend_Db_Table::getDefaultAdapter(); - if($poolID != 'all'){ - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pcr' => 'poolctrl_eventreport'), - array('count1' => 'SUM(IF(pcr.result="succeeded",1,0))', 'count0' => 'SUM(IF(pcr.result="failed",1,0))') - ) - ->join(array('pce' => 'poolctrl_event'), - 'pce.eventID = pcr.eventID', - array()) - ->where('pce.pbs_poolID = ?', $poolID);} - else { - $select = $this->getDbTable()->select() - ->setIntegrityCheck(false) - ->from(array('pcr' => 'poolctrl_eventreport'), - array('count1' => 'SUM(IF(pcr.result="succeeded",1,0))', 'count0' => 'SUM(IF(pcr.result="failed",1,0))') - ) - ->join(array('pce' => 'poolctrl_event'), - 'pce.eventID = pcr.eventID', - array()); - } - - $stmt = $db->query($select); - $result = $stmt->fetchAll(PDO::FETCH_NUM); - - foreach ($result as $r) { - $ret1 = array('Successful', (int)$r[0]); - $ret2 = array('Failed', (int)$r[1]); - $return[] = array($ret1,$ret2); - } - - return $return; - } - } -- cgit v1.2.3-55-g7522