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/views/scripts/statistics/category.phtml | 2 +- application/views/scripts/statistics/running.phtml | 2 +- application/views/scripts/statistics/success.phtml | 2 +- application/views/scripts/statistics/type.phtml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'application/views') diff --git a/application/views/scripts/statistics/category.phtml b/application/views/scripts/statistics/category.phtml index 8319d20..db17b63 100755 --- a/application/views/scripts/statistics/category.phtml +++ b/application/views/scripts/statistics/category.phtml @@ -25,7 +25,7 @@ function setPoolIDtmp() { function plot() { poolID = $("#poolselectbox option:selected").val(); - $.get("/statistics/categorylist/poolID/" + poolID, function(data) { + $.get("/statistics/categoryplot/poolID/" + poolID, function(data) { if(data.dataBar == '' && poolID != 'default') { $( "#noEventsDialog" ).dialog('open'); $('#plotBar').empty(); diff --git a/application/views/scripts/statistics/running.phtml b/application/views/scripts/statistics/running.phtml index 7bf27b8..a23628c 100755 --- a/application/views/scripts/statistics/running.phtml +++ b/application/views/scripts/statistics/running.phtml @@ -25,7 +25,7 @@ function setPoolIDtmp() { function plot() { poolID = $("#poolselectbox option:selected").val(); - $.get("/statistics/runninglist/poolID/" + poolID, function(data) { + $.get("/statistics/runningplot/poolID/" + poolID, function(data) { if(data.dataBar == '0,Event over,0,Event not over' && poolID != 'default') { $('#plotBar').empty(); $('#plotPie').empty(); diff --git a/application/views/scripts/statistics/success.phtml b/application/views/scripts/statistics/success.phtml index e00a01d..5d5c895 100755 --- a/application/views/scripts/statistics/success.phtml +++ b/application/views/scripts/statistics/success.phtml @@ -24,7 +24,7 @@ function setPoolIDtmp() { function plot() { poolID = $("#poolselectbox option:selected").val(); - $.get("/statistics/successlist/poolID/" + poolID, function(data) { + $.get("/statistics/successplot/poolID/" + poolID, function(data) { if(data.dataBar == '0,Successful,0,Failed' && poolID != 'default') { $( "#noEventsDialog" ).dialog('open'); $('#plotBar').empty(); diff --git a/application/views/scripts/statistics/type.phtml b/application/views/scripts/statistics/type.phtml index a34eb2b..6872436 100755 --- a/application/views/scripts/statistics/type.phtml +++ b/application/views/scripts/statistics/type.phtml @@ -25,7 +25,7 @@ function setPoolIDtmp() { function plot() { poolID = $("#poolselectbox option:selected").val(); - $.get("/statistics/typelist/poolID/" + poolID, function(data) { + $.get("/statistics/typeplot/poolID/" + poolID, function(data) { if(data.dataBar == '0,other,0,repeat,0,immediate' && poolID != 'default') { $('#plotBar').empty(); $('#plotPie').empty(); -- cgit v1.2.3-55-g7522 From 0447f20f91dc54d7989bea2d303b15de4ebc88b2 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 16 Nov 2011 16:26:13 +0100 Subject: some js outsourced --- application/controllers/StatisticsController.php | 8 +- .../views/scripts/statistics/category.phtml | 95 +--------------------- application/views/scripts/statistics/running.phtml | 93 +-------------------- application/views/scripts/statistics/success.phtml | 93 +-------------------- application/views/scripts/statistics/type.phtml | 93 +-------------------- 5 files changed, 16 insertions(+), 366 deletions(-) (limited to 'application/views') diff --git a/application/controllers/StatisticsController.php b/application/controllers/StatisticsController.php index b98acf4..66141c8 100755 --- a/application/controllers/StatisticsController.php +++ b/application/controllers/StatisticsController.php @@ -56,7 +56,7 @@ class StatisticsController extends Zend_Controller_Action } else { $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - + // 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); @@ -80,7 +80,7 @@ class StatisticsController extends Zend_Controller_Action } else { $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - + // 1 = barPlot 2 = piePlot $ret['dataBar'] = $this->eventMapper->getRunningPlotdata($poolID, 1); $ret['dataPie'] = $this->eventMapper->getRunningPlotdata($poolID, 2); @@ -103,7 +103,7 @@ class StatisticsController extends Zend_Controller_Action } else { $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - + // 1 = barPlot 2 = piePlot $ret['dataBar'] = $this->eventreportMapper->getSuccessPlotdata($poolID, 1); $ret['dataPieS'] = $this->eventreportMapper->getSuccessPlotdata($poolID, 2); @@ -126,7 +126,7 @@ class StatisticsController extends Zend_Controller_Action } else { $eventList = $this->eventMapper->findBy(array("pbs_membershipID", $this->userIDsNamespace['membershipID'])); } - + // 1 = barPlot 2 = piePlot $ret['dataBar'] = $this->eventMapper->getTypePlotdata($poolID, 1); $ret['dataPie'] = $this->eventMapper->getTypePlotdata($poolID, 2); diff --git a/application/views/scripts/statistics/category.phtml b/application/views/scripts/statistics/category.phtml index db17b63..2f8ed37 100755 --- a/application/views/scripts/statistics/category.phtml +++ b/application/views/scripts/statistics/category.phtml @@ -11,98 +11,9 @@ - + +
All Pools - + +
All Pools - + +
diff --git a/application/views/scripts/statistics/type.phtml b/application/views/scripts/statistics/type.phtml index 6872436..b4082e6 100755 --- a/application/views/scripts/statistics/type.phtml +++ b/application/views/scripts/statistics/type.phtml @@ -11,96 +11,9 @@ - + +