[TASK] Allow rendering multiple charts when no counter is specified

Action requires token to be present; individual charts to not. As a measure to prevent abuse.
NamelessCoder · Sep 6, 2015 · 31b5f04 · 31b5f04
1 parent b0f332e
commit 31b5f04
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "namelesscoder/numerolog-lavacharts",
     "description": "Chart renderer for Numerolog data sources",
     "require": {
-        "namelesscoder/numerolog": "^1.0",
+        "namelesscoder/numerolog": "^1.2",
         "khill/lavacharts": "^2.5"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/ChartQuery.php b/src/ChartQuery.php
@@ -55,6 +55,10 @@ class ChartQuery extends Query {
 	 */
 	protected $count = 20;
 
+	/**
+	 * @var boolean
+	 */
+	protected $scriptOnly = FALSE;
 
 	/**
 	 * @var array
@@ -181,6 +185,21 @@ public function setChartDateTimeFormat($chartDateTimeFormat) {
 		$this->chartDateTimeFormat = $chartDateTimeFormat;
 	}
 
+	/**
+	 * @return boolean
+	 */
+	public function getScriptOnly() {
+		return $this->scriptOnly;
+	}
+
+	/**
+	 * @param boolean $scriptOnly
+	 * @return void
+	 */
+	public function setScriptOnly($scriptOnly) {
+		$this->scriptOnly = $scriptOnly;
+	}
+
 	/**
 	 * @return array
 	 */

diff --git a/src/NumerologChart.php b/src/NumerologChart.php
@@ -16,7 +16,7 @@ class NumerologChart extends Lavacharts {
 	 * @param ChartQuery $query
 	 * @return string
 	 */
-	public function renderGraphQuery(ChartQuery $query) {
+	public function renderChartQuery(ChartQuery $query) {
 		if (Query::ACTION_GET !== $query->getAction()) {
 			throw new \RuntimeException('NumerologChart only accepts the Numerolog `get` command');
 		}
@@ -34,6 +34,9 @@ public function renderGraphQuery(ChartQuery $query) {
 			$chart->setOptions($chartAttributes);
 		}
 		$chart->datatable($table);
+		if ($query->getScriptOnly()) {
+			return $this->render($chartType, $chartLabel, $query->getChartId());
+		}
 		return $this->render($chartType, $chartLabel, $query->getChartId(), array(
 			'width' => $query->getChartWidth(),
 			'height' => $query->getChartHeight()

diff --git a/web/index.php b/web/index.php
@@ -2,5 +2,37 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 
 $query = new \NamelessCoder\NumerologLavacharts\ChartQuery($_GET);
+$query->setAction(\NamelessCoder\Numerolog\Query::ACTION_GET);
 $chart = new \NamelessCoder\NumerologLavacharts\NumerologChart();
-echo $chart->renderGraphQuery($query);
+
+
+if ($query->getCounter()) {
+	echo $chart->renderChartQuery($query);
+}
+
+if (!$query->getCounter()) {
+	$countersQuery = clone $query;
+	$countersQuery->setAction(\NamelessCoder\Numerolog\Query::ACTION_COUNTERS);
+	$client = new \NamelessCoder\Numerolog\Client();
+	$client->setPackage($query->getPackage());
+	$client->setToken($query->getToken());
+	$counters = $client->query($countersQuery);
+	foreach (array_keys($counters['results']) as $index => $counterName) {
+		$counterNumber = $i + 1;
+		$query->setCounter($counterName);
+		$query->setChartId('chart-' . $counterNumber);
+		$query->setChartLabel('chart-' . $counterNumber);
+		if (!$query->getScriptOnly()) {
+			echo $chart->renderChartQuery($query);
+			$query->setScriptOnly(TRUE);
+		} else {
+			echo sprintf(
+				'<div id="chart-%s" style="width:%dpx; height:%dpx;"></div>',
+				$counterNumber,
+				$query->getChartWidth(),
+				$query->getChartHeight()
+			);
+		}
+	}
+}
+