nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix and a query result format changes according to the latest wiki article about charts.

Browse Source
This commit is contained in:
Martynas Mickevicius
2010-07-27 18:11:01 +03:00
parent 3afe966b51
commit 0604e81526
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/chart.lib.php
View File

@@ -99,7 +99,7 @@ function PMA_chart_results($data, &$chartSettings, &$chartErrors = array())
return __('No data found for the chart.'); return __('No data found for the chart.');
} }
if (count($data[0]) == 1 || count($data[0] == 2)) { if (count($data[0]) == 1 || count($data[0]) == 2) {
// Two columns in every row. // Two columns in every row.
// This data is suitable for a simple bar chart. // This data is suitable for a simple bar chart.
@@ -113,7 +113,7 @@ function PMA_chart_results($data, &$chartSettings, &$chartErrors = array())
$chartData[$rowKey] = $values[0]; $chartData[$rowKey] = $values[0];
} }
else { else {
$chartData[$values[0]] = $values[1]; $chartData[$values[1]] = $values[0];
} }
} }
@@ -156,8 +156,8 @@ function PMA_chart_results($data, &$chartSettings, &$chartErrors = array())
$chartSettings['multi'] = true; $chartSettings['multi'] = true;
$keys = array_keys($data[0]); $keys = array_keys($data[0]);
$xAxisKey = $keys[0]; $yAxisKey = $keys[0];
$yAxisKey = $keys[1]; $xAxisKey = $keys[1];
$seriesKey = $keys[2]; $seriesKey = $keys[2];
// get all the series labels // get all the series labels

4
libraries/chart/pma_pchart_single.php
View File

@@ -18,8 +18,8 @@ abstract class PMA_pChart_single extends PMA_pChart_chart
$keys = array_keys($this->data); $keys = array_keys($this->data);
// Dataset definition // Dataset definition
$this->dataSet->AddPoint($values[1], "Values"); $this->dataSet->AddPoint($values[0], "Values");
$this->dataSet->AddPoint($values[0], "Keys"); $this->dataSet->AddPoint($values[1], "Keys");
//$this->dataSet->AddAllSeries(); //$this->dataSet->AddAllSeries();
$this->dataSet->AddSerie("Values"); $this->dataSet->AddSerie("Values");

2
libraries/chart/pma_pchart_single_radar.php
View File

@@ -18,7 +18,7 @@ class PMA_pChart_single_radar extends PMA_pChart_single
{ {
$maxValue = 0; $maxValue = 0;
$keys = array_keys($this->data); $keys = array_keys($this->data);
$valueKey = $keys[1]; $valueKey = $keys[0];
$maxValue = max($this->data[$valueKey]); $maxValue = max($this->data[$valueKey]);
foreach ($this->data[$valueKey] as &$value) { foreach ($this->data[$valueKey] as &$value) {