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

Fix that single column results work too

Browse Source
This commit is contained in:
Tyron Madlener 2011-06-09 12:33:07 +02:00
parent f4fa0d9f79
commit c928d53ef8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/tbl_chart.js
View File

@ -1,4 +1,4 @@
var chart_xaxis_idx = 0;
var chart_xaxis_idx = -1;
$(document).ready(function() {
@ -119,7 +119,7 @@ function PMA_queryChart(data,passedSettings) {
series[j].name = columnNames[i];
$.each(data,function(key,value) {
series[j].data.push(parseFloat(value[columnNames[i]]));
if(j==0)
if(j==0 && chart_xaxis_idx!=-1 && !xaxis.categories[value[columnNames[chart_xaxis_idx]]])
xaxis.categories.push(value[columnNames[chart_xaxis_idx]]);
});
j++;
@ -172,8 +172,6 @@ function PMA_queryChart(data,passedSettings) {
formatter: function() { return '<b>'+this.series.name+'</b><br/>'+this.y; }
}
};
if(passedSettings.chart.type=='pie')
settings.tooltip.formatter = function() { return '<b>'+columnNames[0]+'</b><br/>'+this.y; }

9
tbl_chart.php
View File

@ -104,10 +104,12 @@ url_query = '<?php echo $url_query;?>';
</span>
<br>
<input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>">
<?php echo __('X-Axis:'); ?> <select name="chartXAxis">
<?php $keys = array_keys($data[0]);
if(count($keys)>1) {
echo __('X-Axis:'); ?> <select name="chartXAxis">
<?php
$yaxis=-1;
$keys = array_keys($data[0]);
foreach($keys as $idx=>$key) {
if($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) {
echo '<option value="'.$idx.'" selected>'.$key.'</option>';
@ -119,6 +121,9 @@ url_query = '<?php echo $url_query;?>';
?>
</select>
<?php
}
?>
</div>
<div style="float:left; padding-left:40px;">
<?php echo __('X-Axis label:'); ?> <input style="margin-top:0;" type="text" name="xaxis_label" value="<?php echo $keys[$yaxis]; ?>"><br>