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

Chart legend

Browse Source
This commit is contained in:
Marc Delisle 2012-09-03 10:19:17 -04:00
parent 39e9744f04
commit ff94643044
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/tbl_chart.js
View File

@ -51,9 +51,11 @@ $(document).ready(function() {
text: $('input[name="chartTitle"]').attr('value')
//margin:20
},
//plotOptions: {
// series: {}
//}
legend: {
show: true,
placement: 'outsideGrid',
location: 'se'
}
}
$('#querychart').html('');
@ -146,29 +148,30 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
var series = new Array();
var xaxis = { type: 'linear' };
var yaxis = new Object();
var legends = new Array();
$.each(data[0],function(index,element) {
columnNames.push(index);
});
$.each(columnNames, function(index, element) {
if (parseInt(chart_xaxis_idx) != index) {
legends.push(element);
}
});
switch(passedNonJqplotSettings.chart.type) {
case 'column':
case 'spline':
case 'line':
case 'bar':
//xaxis.categories = new Array();
if (chart_series == 'columns') {
var j = 0;
for (var i=0; i < columnNames.length; i++)
if (i != chart_xaxis_idx) {
series[j] = new Array();
//series[j].data = new Array();
//series[j].name = columnNames[i];
$.each(data,function(key,value) {
//series[j].data.push(parseFloat(value[columnNames[i]]));
//series[j].data[0].push(parseFloat(value[columnNames[i]]));
series[j].push(
[
value[columnNames[chart_xaxis_idx]],
@ -176,8 +179,6 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
parseFloat(value[columnNames[i]])
]
);
//if( j== 0 && chart_xaxis_idx != -1 && ! xaxis.categories[value[columnNames[chart_xaxis_idx]]])
//xaxis.categories.push(value[columnNames[chart_xaxis_idx]]);
});
j++;
}
@ -209,9 +210,6 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
xaxis.categories.push(value[columnNames[chart_xaxis_idx]]);
});
}
if(columnNames.length == 2)
yaxis.title = { text: columnNames[0] };
break;
@ -269,5 +267,10 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
// Overwrite/Merge default settings with passedsettings
$.extend(true, settings, passedSettings);
settings.series = new Array();
for (var i = 0; i < legends.length; i++) {
settings.series.push({ label: legends[i] });
}
return $.jqplot('querychart', series, settings);
}