summaryrefslogtreecommitdiffstats
path: root/application/controllers/StatisticsController.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/controllers/StatisticsController.php')
-rwxr-xr-xapplication/controllers/StatisticsController.php32
1 files changed, 16 insertions, 16 deletions
diff --git a/application/controllers/StatisticsController.php b/application/controllers/StatisticsController.php
index 868a2a6..66141c8 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('/');
}
@@ -56,16 +56,16 @@ class StatisticsController extends Zend_Controller_Action
} else {
$eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID']));
}
-
- $ret['dataBar'] = $this->eventMapper->getCategoryBarCount($poolID);
- $ret['dataPie'] = $this->eventMapper->getCategoryPieCount($poolID);
+ // 1 = barPlot 2 = piePlot
+ $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('/');
}
@@ -80,15 +80,15 @@ class StatisticsController extends Zend_Controller_Action
} else {
$eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID']));
}
-
- $ret['dataBar'] = $this->eventMapper->getRunningBarCount($poolID);
- $ret['dataPie'] = $this->eventMapper->getRunningPieCount($poolID);
+ // 1 = barPlot 2 = piePlot
+ $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('/');
}
@@ -103,15 +103,15 @@ class StatisticsController extends Zend_Controller_Action
} else {
$eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID']));
}
-
- $ret['dataBar'] = $this->eventreportMapper->getSuccessBarCount($poolID);
- $ret['dataPieS'] = $this->eventreportMapper->getSuccessPieCount($poolID);
+ // 1 = barPlot 2 = piePlot
+ $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('/');
}
@@ -126,9 +126,9 @@ class StatisticsController extends Zend_Controller_Action
} else {
$eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID']));
}
-
- $ret['dataBar'] = $this->eventMapper->getTypeBarCount($poolID);
- $ret['dataPie'] = $this->eventMapper->getTypePieCount($poolID);
+ // 1 = barPlot 2 = piePlot
+ $ret['dataBar'] = $this->eventMapper->getTypePlotdata($poolID, 1);
+ $ret['dataPie'] = $this->eventMapper->getTypePlotdata($poolID, 2);
echo json_encode($ret);