tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix pandora_enterprise#3943

This commit is contained in:
Daniel Barbero Martin 2022-02-04 09:48:10 +01:00
parent c971ed6dd5
commit 6f15d26af2
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pandora_console/include/javascript/pandora_fullcalendar.js
View File

@ -417,49 +417,51 @@ function loadEventBBDD(events) {
Object.entries(JSON.parse(events)).forEach(function(element) {
var day_string = element[0];
var events_day = element[1];
events_day.forEach(function(event) {
if (event != null) {
var time_from = event.start.split(":");
var time_to = event.end.split(":");
if (events_day != "" && events_day != null && events_day != undefined) {
events_day.forEach(function(event) {
if (event != null) {
var time_from = event.start.split(":");
var time_to = event.end.split(":");
var start = dates[day_string].setHours(
time_from[0],
time_from[1],
time_from[2],
0
);
var start = dates[day_string].setHours(
time_from[0],
time_from[1],
time_from[2],
0
);
var end = dates[day_string].setHours(
time_to[0],
time_to[1],
time_to[2],
0
);
if (event.end === "00:00:00") {
end = dates[day_names[keys_days_names[day_string] + 1]].setHours(
var end = dates[day_string].setHours(
time_to[0],
time_to[1],
time_to[2],
0
);
}
if (event.end === "00:00:00") {
end = dates[day_names[keys_days_names[day_string] + 1]].setHours(
time_to[0],
time_to[1],
time_to[2],
0
);
}
var title = "";
if (
time_format(start) === "00:00:00" &&
time_format(end) === "00:00:00"
) {
title = "All day";
}
var title = "";
if (
time_format(start) === "00:00:00" &&
time_format(end) === "00:00:00"
) {
title = "All day";
}
result.push({
title: title,
start: start,
end: end,
id: uniqId()
});
}
});
result.push({
title: title,
start: start,
end: end,
id: uniqId()
});
}
});
}
});
return result;