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/controllers/EventController.php | 1 - application/controllers/StatisticsController.php | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'application/controllers') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index ab6f913..8cd21ea 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -1346,7 +1346,6 @@ class EventController extends Zend_Controller_Action 'running' => $event->getRunning(), ) ); - //} } echo json_encode($events); } diff --git a/application/controllers/StatisticsController.php b/application/controllers/StatisticsController.php index 868a2a6..b98acf4 100755 --- a/application/controllers/StatisticsController.php +++ b/application/controllers/StatisticsController.php @@ -41,7 +41,7 @@ class StatisticsController extends Zend_Controller_Action } } - public function categorylistAction() { + public function categoryplotAction() { if(!$this->acl->checkRight('eo')) { $this->_redirect('/'); } @@ -57,15 +57,15 @@ class StatisticsController extends Zend_Controller_Action $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - $ret['dataBar'] = $this->eventMapper->getCategoryBarCount($poolID); - $ret['dataPie'] = $this->eventMapper->getCategoryPieCount($poolID); + $ret['dataBar'] = $this->eventMapper->getCategoryPlotdata($poolID, 1); + $ret['dataPie'] = $this->eventMapper->getCategoryPlotdata($poolID, 2); $ret['color'] = $this->eventcategoryMapper->getCategoryColor($poolID, null); echo json_encode($ret); } - public function runninglistAction() { + public function runningplotAction() { if(!$this->acl->checkRight('er')) { $this->_redirect('/'); } @@ -81,14 +81,14 @@ class StatisticsController extends Zend_Controller_Action $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - $ret['dataBar'] = $this->eventMapper->getRunningBarCount($poolID); - $ret['dataPie'] = $this->eventMapper->getRunningPieCount($poolID); + $ret['dataBar'] = $this->eventMapper->getRunningPlotdata($poolID, 1); + $ret['dataPie'] = $this->eventMapper->getRunningPlotdata($poolID, 2); echo json_encode($ret); } - public function successlistAction() { + public function successplotAction() { if(!$this->acl->checkRight('er')) { $this->_redirect('/'); } @@ -104,14 +104,14 @@ class StatisticsController extends Zend_Controller_Action $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - $ret['dataBar'] = $this->eventreportMapper->getSuccessBarCount($poolID); - $ret['dataPieS'] = $this->eventreportMapper->getSuccessPieCount($poolID); + $ret['dataBar'] = $this->eventreportMapper->getSuccessPlotdata($poolID, 1); + $ret['dataPieS'] = $this->eventreportMapper->getSuccessPlotdata($poolID, 2); echo json_encode($ret); } - public function typelistAction() { + public function typeplotAction() { if(!$this->acl->checkRight('eo')) { $this->_redirect('/'); } @@ -127,8 +127,8 @@ class StatisticsController extends Zend_Controller_Action $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - $ret['dataBar'] = $this->eventMapper->getTypeBarCount($poolID); - $ret['dataPie'] = $this->eventMapper->getTypePieCount($poolID); + $ret['dataBar'] = $this->eventMapper->getTypePlotdata($poolID, 1); + $ret['dataPie'] = $this->eventMapper->getTypePlotdata($poolID, 2); echo json_encode($ret); -- cgit v1.2.3-55-g7522