From aec87c8839b00f0533e1c3dd6c7a3b97c719254e Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Mon, 21 Mar 2022 13:28:53 +0100
Subject: [PATCH] fixed calendar templates alerts pandora_enterprise#8687

---
 .../include/javascript/pandora_fullcalendar.js       | 12 ++++++++----
 pandora_console/include/javascript/pandora_ui.js     | 10 ++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/javascript/pandora_fullcalendar.js b/pandora_console/include/javascript/pandora_fullcalendar.js
index 700feb3bdd..67e39f0e4c 100644
--- a/pandora_console/include/javascript/pandora_fullcalendar.js
+++ b/pandora_console/include/javascript/pandora_fullcalendar.js
@@ -102,7 +102,7 @@ function fullCalendarPandora(calendarEl, options, settings, initialEvents) {
 function select_alert_template(info, calendar) {
   var nextDay = info.start.getDay() === 6 ? 0 : info.start.getDay() + 1;
   if (
-    info.start.getDay() == info.end.getDay() ||
+    (info.start.getDay() == info.end.getDay() && info.start < info.end) ||
     (nextDay == info.end.getDay() && time_format(info.end) == "00:00:00")
   ) {
     recalculate_events(calendar, {}, info.start, info.end, true);
@@ -282,7 +282,6 @@ function eventClick_alert_template(info, calendar, settings) {
     onAccept: function() {
       var replace_day_from = $("#hidden-day_from").val();
       var replace_time_from = $("#text-time_from_event").val();
-
       var array_time_from = replace_time_from.split(":");
       var new_date_from = new Date(calendar_days[replace_day_from]);
       new_date_from.setHours(
@@ -294,8 +293,13 @@ function eventClick_alert_template(info, calendar, settings) {
       var replace_day_to = $("#hidden-day_to").val();
       var replace_time_to = $("#text-time_to_event").val();
       if (replace_time_to === "23:59:59") {
-        replace_day_to++;
-        replace_time_to = "00:00:00";
+        if (replace_day_to == 6) {
+          replace_day_to = 0;
+          replace_time_to = "00:00:00";
+        } else if (replace_day_to != 0) {
+          replace_day_to++;
+          replace_time_to = "00:00:00";
+        }
       }
 
       var array_time_to = replace_time_to.split(":");
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index ab65b8d4cd..eeeb5fcfd5 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -518,8 +518,8 @@ function confirmDialog(settings) {
         hideOkButton +
         "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
       click: function() {
-        $(this).dialog("close");
         if (typeof settings.onAccept == "function") settings.onAccept();
+        $(this).dialog("close");
         $(this).remove();
       }
     }
@@ -547,7 +547,13 @@ function confirmDialog(settings) {
     .dialog({
       open: settings.open,
       title: settings.title,
-      close: false,
+      close: function() {
+        if (typeof settings.notCloseOnDeny == "undefined") {
+          $(this).dialog("close");
+          $(this).remove();
+        }
+        if (typeof settings.onDeny == "function") settings.onDeny();
+      },
       width: settings.size,
       maxHeight: settings.maxHeight,
       modal: true,