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

Merge branch 'ent-6658-Aparece-timestap-en-vez-de-timestamp-en-csv-exportado-de-graficas-y-faltan-labels' into 'develop'

Browse Source 
fixed csv charts

See merge request artica/pandorafms!3582
This commit is contained in:
Daniel Rodriguez 2020-10-29 18:19:35 +01:00
commit 6161ba078f
1 changed files with 360 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
(function ($) { (function($) {
var options = { var options = {
export: { export: {
export_data: false, // or true export_data: false, // or true
labels_long: null, labels_long: null,
homeurl: "", homeurl: ""
}, }
}; };
function init(plot) { function init(plot) {
plot.exportDataCSV = function (args) { plot.exportDataCSV = function(args) {
//amount = plot.getOptions().export.type, //amount = plot.getOptions().export.type,
//options = options || {}; //options = options || {};
@ -22,7 +22,7 @@
result = []; result = [];
// Throw errors // Throw errors
var retrieveDataOject = function (dataObjects) { var retrieveDataOject = function(dataObjects) {
var result; var result;
if (typeof dataObjects === "undefined") if (typeof dataObjects === "undefined")
@ -33,7 +33,7 @@
result = dataObjects.shift(); result = dataObjects.shift();
} }
if (dataObjects.length > 1) { if (dataObjects.length > 1) {
dataObjects.forEach(function (element) { dataObjects.forEach(function(element) {
if (/^Avg.:/i.test(element.label)) result = element; if (/^Avg.:/i.test(element.label)) result = element;
}); });
@ -47,7 +47,7 @@
}; };
// Throw errors // Throw errors
var processDataObject = function (dataObject) { var processDataObject = function(dataObject) {
var result; var result;
if (typeof dataObject === "undefined") if (typeof dataObject === "undefined")
@ -71,12 +71,12 @@
*/ */
if (type === "csv") { if (type === "csv") {
result = { result = {
head: ["timestap", "date", "value", "label"], head: ["timestamp", "date", "value", "label"],
data: [], data: []
}; };
dataObject.data.forEach(function (item, index) { dataObject.data.forEach(function(item, index) {
var timestap = item[0]; var timestamp = item[0];
var d = new Date(item[0]); var d = new Date(item[0]);
var monthNames = [ var monthNames = [
@ -91,7 +91,7 @@
"Sep", "Sep",
"Oct", "Oct",
"Nov", "Nov",
"Dec", "Dec"
]; ];
date_format = date_format =
@ -119,7 +119,7 @@
dataObject.label dataObject.label
]; ];
clean_label = clean_label.replace(new RegExp(" ", "g"), " "); 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") { } else if (type === "json") {
/* [ /* [
@ -144,7 +144,7 @@
*/ */
result = []; result = [];
dataObject.data.forEach(function (item, index) { dataObject.data.forEach(function(item, index) {
var date = "", var date = "",
value = item[1]; value = item[1];
@ -156,7 +156,7 @@
result.push({ result.push({
date: date, date: date,
value: value, value: value,
label: dataObject.label, label: dataObject.label
}); });
}); });
} }
@ -172,12 +172,11 @@
if (dataObject) { if (dataObject) {
elements.push(processDataObject(dataObject)); elements.push(processDataObject(dataObject));
} }
dataObjects.forEach(function (element) { dataObjects.forEach(function(element) {
elements.push(processDataObject(element)); elements.push(processDataObject(element));
}); });
graphData = elements; graphData = elements;
// Transform the object data into a string // Transform the object data into a string
// cause PHP has limitations in the number // cause PHP has limitations in the number
// of POST params received. // of POST params received.
@ -226,7 +225,7 @@
} }
}; };
plot.exportDataJSON = function (args) { plot.exportDataJSON = function(args) {
//amount = plot.getOptions().export.type, //amount = plot.getOptions().export.type,
//options = options || {}; //options = options || {};
@ -240,7 +239,7 @@
result = []; result = [];
// Throw errors // Throw errors
var retrieveDataOject = function (dataObjects) { var retrieveDataOject = function(dataObjects) {
var result; var result;
if (typeof dataObjects === "undefined") if (typeof dataObjects === "undefined")
@ -251,7 +250,7 @@
result = dataObjects.shift(); result = dataObjects.shift();
} }
if (dataObjects.length > 1) { if (dataObjects.length > 1) {
dataObjects.forEach(function (element) { dataObjects.forEach(function(element) {
if (/^Avg.:/i.test(element.label)) result = element; if (/^Avg.:/i.test(element.label)) result = element;
}); });
@ -265,7 +264,7 @@
}; };
// Throw errors // Throw errors
var processDataObject = function (dataObject) { var processDataObject = function(dataObject) {
var result; var result;
if (typeof dataObject === "undefined") if (typeof dataObject === "undefined")
@ -290,10 +289,10 @@
if (type === "csv") { if (type === "csv") {
result = { result = {
head: ["date", "value", "label"], head: ["date", "value", "label"],
data: [], data: []
}; };
dataObject.data.forEach(function (item, index) { dataObject.data.forEach(function(item, index) {
var date = "", var date = "",
value = item[1]; value = item[1];
@ -329,7 +328,7 @@
*/ */
result = []; result = [];
dataObject.data.forEach(function (item, index) { dataObject.data.forEach(function(item, index) {
var date = "", var date = "",
value = item[1]; value = item[1];
@ -341,7 +340,7 @@
result.push({ result.push({
date: date, date: date,
value: value, value: value,
label: dataObject.label, label: dataObject.label
}); });
}); });
} }
@ -357,7 +356,7 @@
if (custom_graph) { if (custom_graph) {
dataObject = retrieveDataOject(dataObjects); dataObject = retrieveDataOject(dataObjects);
dataObjects.forEach(function (element) { dataObjects.forEach(function(element) {
elements.push(processDataObject(element)); elements.push(processDataObject(element));
}); });
graphData = elements; graphData = elements;
@ -420,6 +419,6 @@
init: init, init: init,
options: options, options: options,
name: "exportdata", name: "exportdata",
version: "0.1", version: "0.1"
}); });
})(jQuery); })(jQuery);