mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
fixed csv charts
This commit is contained in:
parent
318094d758
commit
170ee5b9a5
@ -1,14 +1,14 @@
|
||||
(function ($) {
|
||||
(function($) {
|
||||
var options = {
|
||||
export: {
|
||||
export_data: false, // or true
|
||||
labels_long: null,
|
||||
homeurl: "",
|
||||
},
|
||||
homeurl: ""
|
||||
}
|
||||
};
|
||||
|
||||
function init(plot) {
|
||||
plot.exportDataCSV = function (args) {
|
||||
plot.exportDataCSV = function(args) {
|
||||
//amount = plot.getOptions().export.type,
|
||||
//options = options || {};
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
result = [];
|
||||
|
||||
// Throw errors
|
||||
var retrieveDataOject = function (dataObjects) {
|
||||
var retrieveDataOject = function(dataObjects) {
|
||||
var result;
|
||||
|
||||
if (typeof dataObjects === "undefined")
|
||||
@ -33,7 +33,7 @@
|
||||
result = dataObjects.shift();
|
||||
}
|
||||
if (dataObjects.length > 1) {
|
||||
dataObjects.forEach(function (element) {
|
||||
dataObjects.forEach(function(element) {
|
||||
if (/^Avg.:/i.test(element.label)) result = element;
|
||||
});
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
};
|
||||
|
||||
// Throw errors
|
||||
var processDataObject = function (dataObject) {
|
||||
var processDataObject = function(dataObject) {
|
||||
var result;
|
||||
|
||||
if (typeof dataObject === "undefined")
|
||||
@ -71,12 +71,12 @@
|
||||
*/
|
||||
if (type === "csv") {
|
||||
result = {
|
||||
head: ["timestap", "date", "value", "label"],
|
||||
data: [],
|
||||
head: ["timestamp", "date", "value", "label"],
|
||||
data: []
|
||||
};
|
||||
|
||||
dataObject.data.forEach(function (item, index) {
|
||||
var timestap = item[0];
|
||||
dataObject.data.forEach(function(item, index) {
|
||||
var timestamp = item[0];
|
||||
|
||||
var d = new Date(item[0]);
|
||||
var monthNames = [
|
||||
@ -91,7 +91,7 @@
|
||||
"Sep",
|
||||
"Oct",
|
||||
"Nov",
|
||||
"Dec",
|
||||
"Dec"
|
||||
];
|
||||
|
||||
date_format =
|
||||
@ -119,7 +119,7 @@
|
||||
dataObject.label
|
||||
];
|
||||
clean_label = clean_label.replace(new RegExp(" ", "g"), " ");
|
||||
result.data.push([timestap, date, value, clean_label]);
|
||||
result.data.push([timestamp, date, value, clean_label]);
|
||||
});
|
||||
} else if (type === "json") {
|
||||
/* [
|
||||
@ -144,7 +144,7 @@
|
||||
*/
|
||||
result = [];
|
||||
|
||||
dataObject.data.forEach(function (item, index) {
|
||||
dataObject.data.forEach(function(item, index) {
|
||||
var date = "",
|
||||
value = item[1];
|
||||
|
||||
@ -156,7 +156,7 @@
|
||||
result.push({
|
||||
date: date,
|
||||
value: value,
|
||||
label: dataObject.label,
|
||||
label: dataObject.label
|
||||
});
|
||||
});
|
||||
}
|
||||
@ -172,12 +172,11 @@
|
||||
if (dataObject) {
|
||||
elements.push(processDataObject(dataObject));
|
||||
}
|
||||
dataObjects.forEach(function (element) {
|
||||
dataObjects.forEach(function(element) {
|
||||
elements.push(processDataObject(element));
|
||||
});
|
||||
graphData = elements;
|
||||
|
||||
|
||||
// Transform the object data into a string
|
||||
// cause PHP has limitations in the number
|
||||
// of POST params received.
|
||||
@ -226,7 +225,7 @@
|
||||
}
|
||||
};
|
||||
|
||||
plot.exportDataJSON = function (args) {
|
||||
plot.exportDataJSON = function(args) {
|
||||
//amount = plot.getOptions().export.type,
|
||||
//options = options || {};
|
||||
|
||||
@ -240,7 +239,7 @@
|
||||
result = [];
|
||||
|
||||
// Throw errors
|
||||
var retrieveDataOject = function (dataObjects) {
|
||||
var retrieveDataOject = function(dataObjects) {
|
||||
var result;
|
||||
|
||||
if (typeof dataObjects === "undefined")
|
||||
@ -251,7 +250,7 @@
|
||||
result = dataObjects.shift();
|
||||
}
|
||||
if (dataObjects.length > 1) {
|
||||
dataObjects.forEach(function (element) {
|
||||
dataObjects.forEach(function(element) {
|
||||
if (/^Avg.:/i.test(element.label)) result = element;
|
||||
});
|
||||
|
||||
@ -265,7 +264,7 @@
|
||||
};
|
||||
|
||||
// Throw errors
|
||||
var processDataObject = function (dataObject) {
|
||||
var processDataObject = function(dataObject) {
|
||||
var result;
|
||||
|
||||
if (typeof dataObject === "undefined")
|
||||
@ -290,10 +289,10 @@
|
||||
if (type === "csv") {
|
||||
result = {
|
||||
head: ["date", "value", "label"],
|
||||
data: [],
|
||||
data: []
|
||||
};
|
||||
|
||||
dataObject.data.forEach(function (item, index) {
|
||||
dataObject.data.forEach(function(item, index) {
|
||||
var date = "",
|
||||
value = item[1];
|
||||
|
||||
@ -329,7 +328,7 @@
|
||||
*/
|
||||
result = [];
|
||||
|
||||
dataObject.data.forEach(function (item, index) {
|
||||
dataObject.data.forEach(function(item, index) {
|
||||
var date = "",
|
||||
value = item[1];
|
||||
|
||||
@ -341,7 +340,7 @@
|
||||
result.push({
|
||||
date: date,
|
||||
value: value,
|
||||
label: dataObject.label,
|
||||
label: dataObject.label
|
||||
});
|
||||
});
|
||||
}
|
||||
@ -357,7 +356,7 @@
|
||||
|
||||
if (custom_graph) {
|
||||
dataObject = retrieveDataOject(dataObjects);
|
||||
dataObjects.forEach(function (element) {
|
||||
dataObjects.forEach(function(element) {
|
||||
elements.push(processDataObject(element));
|
||||
});
|
||||
graphData = elements;
|
||||
@ -420,6 +419,6 @@
|
||||
init: init,
|
||||
options: options,
|
||||
name: "exportdata",
|
||||
version: "0.1",
|
||||
version: "0.1"
|
||||
});
|
||||
})(jQuery);
|
||||
|
Loading…
x
Reference in New Issue
Block a user