tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-23 09:59:22 +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

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

@ -3,8 +3,8 @@
export: {
export_data: false, // or true
labels_long: null,
homeurl: "",
},
homeurl: ""
}
};
function init(plot) {
@ -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];
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") {
/* [
@ -156,7 +156,7 @@
result.push({
date: date,
value: value,
label: dataObject.label,
label: dataObject.label
});
});
}
@ -177,7 +177,6 @@
});
graphData = elements;
// Transform the object data into a string
// cause PHP has limitations in the number
// of POST params received.
@ -290,7 +289,7 @@
if (type === "csv") {
result = {
head: ["date", "value", "label"],
data: [],
data: []
};
dataObject.data.forEach(function(item, index) {
@ -341,7 +340,7 @@
result.push({
date: date,
value: value,
label: dataObject.label,
label: dataObject.label
});
});
}
@ -420,6 +419,6 @@
init: init,
options: options,
name: "exportdata",
version: "0.1",
version: "0.1"
});
})(jQuery);