mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 16:55:05 +02:00
Merge branch 'ent-11968-16139-graficas-de-histograma-se-visualizan-vacias-en-pdf' into 'develop'
Ent 11968 16139 graficas de histograma se visualizan vacias en pdf See merge request artica/pandorafms!6399
This commit is contained in:
commit
f95e0af2c9
@ -943,17 +943,25 @@ function pandoraFlotSlicebar(
|
|||||||
|
|
||||||
// Format functions
|
// Format functions
|
||||||
function xFormatter(v) {
|
function xFormatter(v) {
|
||||||
// var ct = new Date();
|
var ct;
|
||||||
var ct = new timezoneJS.Date();
|
if (typeof timezoneJS === "undefined") {
|
||||||
ct.setTimezone(phpTimezone);
|
ct = new Date();
|
||||||
|
} else {
|
||||||
|
ct = new timezoneJS.Date();
|
||||||
|
ct.setTimezone(phpTimezone);
|
||||||
|
}
|
||||||
|
|
||||||
var currentTime = ct.getTime();
|
var currentTime = ct.getTime();
|
||||||
|
|
||||||
var diffDates = (currentTime - 1000 * datelimit) / 1000;
|
var diffDates = (currentTime - 1000 * datelimit) / 1000;
|
||||||
|
|
||||||
// var d = new Date(1000 * (v + datelimit));
|
var d;
|
||||||
var d = new timezoneJS.Date(1000 * (v + datelimit));
|
if (typeof timezoneJS === "undefined") {
|
||||||
d.setTimezone(phpTimezone);
|
d = new Date(1000 * (v + datelimit));
|
||||||
|
} else {
|
||||||
|
d = new timezoneJS.Date(1000 * (v + datelimit));
|
||||||
|
d.setTimezone(phpTimezone);
|
||||||
|
}
|
||||||
|
|
||||||
var monthNames = [
|
var monthNames = [
|
||||||
"Jan",
|
"Jan",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user