tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed csv import

Browse Source
This commit is contained in:
Daniel Maya 2017-10-05 15:22:55 +02:00
parent 9b59702edd
commit edeeb19bed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
View File

@ -22,7 +22,7 @@
result = []; result = [];
// Throw errors // Throw errors
var retrieveDataOject = function (dataObjects) { var retrieveDataOject = function (dataObjects, custom) {
var result; var result;
if (typeof dataObjects === 'undefined') if (typeof dataObjects === 'undefined')
@ -34,7 +34,13 @@
} }
if (dataObjects.length > 1) { if (dataObjects.length > 1) {
dataObjects.forEach(function (element) { dataObjects.forEach(function (element) {
result = element; if(custom){
if (/^Avg.:/i.test(element.label)){
result = element;
}
} else {
result = element;
}
}); });
// If the avg set is missing, retrieve the first set // If the avg set is missing, retrieve the first set
@ -142,14 +148,14 @@
var custom_graph = $('#hidden-custom_graph').val(); var custom_graph = $('#hidden-custom_graph').val();
if (custom_graph) { if (custom_graph) {
dataObject = retrieveDataOject(dataObjects); dataObject = retrieveDataOject(dataObjects,0);
dataObjects.forEach(function (element) { dataObjects.forEach(function (element) {
elements.push(processDataObject(element)); elements.push(processDataObject(element));
}); });
graphData = elements; graphData = elements;
} }
else { else {
dataObject = retrieveDataOject(dataObjects); dataObject = retrieveDataOject(dataObjects,1);
elements.push(processDataObject(dataObject)); elements.push(processDataObject(dataObject));
graphData = elements; graphData = elements;
} }