From 965ac2fc9698a857a81512bd90639e8d2daafbc8 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Wed, 24 Nov 2021 09:23:36 +0100
Subject: [PATCH] Date handling fixes for the unavailability modal

---
 ...nd_calendar_unavailability_events_modal.js | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/assets/js/backend_calendar_unavailability_events_modal.js b/assets/js/backend_calendar_unavailability_events_modal.js
index 29dd96e3..b9235510 100755
--- a/assets/js/backend_calendar_unavailability_events_modal.js
+++ b/assets/js/backend_calendar_unavailability_events_modal.js
@@ -32,21 +32,23 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
             $dialog.find('.modal-message').addClass('d-none');
             $dialog.find('.is-invalid').removeClass('is-invalid');
 
-            var start = $dialog.find('#unavailable-start').datetimepicker('getDate');
+            var startMoment = moment($dialog.find('#unavailable-start').datetimepicker('getDate'));
 
-            if (!start) {
+            if (!startMoment.isValid()) {
                 $dialog.find('#unavailable-start').addClass('is-invalid');
+
                 return;
             }
 
-            var end = moment($dialog.find('#unavailable-end').datetimepicker('getDate')).toDate();
+            var endMoment = moment($dialog.find('#unavailable-end').datetimepicker('getDate'));
 
-            if (!end) {
+            if (!endMoment.isValid()) {
                 $dialog.find('#unavailable-end').addClass('is-invalid');
+
                 return;
             }
 
-            if (start > end) {
+            if (startMoment.isAfter(endMoment)) {
                 // Start time is after end time - display message to user.
                 $dialog
                     .find('.modal-message')
@@ -55,15 +57,16 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
                     .removeClass('d-none');
 
                 $dialog.find('#unavailable-start, #unavailable-end').addClass('is-invalid');
+
                 return;
             }
 
             // Unavailable period records go to the appointments table.
             var unavailable = {
-                start_datetime: start.toString('yyyy-MM-dd HH:mm'),
-                end_datetime: end.toString('yyyy-MM-dd HH:mm'),
+                start_datetime: startMoment.format('YYYY-MM-DD HH:mm:ss'),
+                end_datetime: endMoment.format('YYYY-MM-DD HH:mm:ss'),
                 notes: $dialog.find('#unavailable-notes').val(),
-                id_users_provider: $('#unavailable-provider').val() // curr provider
+                id_users_provider: $('#unavailable-provider').val()
             };
 
             if ($dialog.find('#unavailable-id').val() !== '') {
@@ -77,7 +80,9 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
 
                 // Close the modal dialog and refresh the calendar appointments.
                 $dialog.find('.alert').addClass('d-none');
+
                 $dialog.modal('hide');
+
                 $('#select-filter-item').trigger('change');
             };
 
@@ -95,9 +100,9 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
             var $dialog = $('#manage-unavailable');
 
             // Set the default datetime values.
-            var startMoment = new Date();
+            var startMoment = moment();
 
-            var currentMin = parseInt(startMoment.toString('mm'));
+            var currentMin = parseInt(startMoment.format('mm'));
 
             if (currentMin > 0 && currentMin < 15) {
                 startMoment.set({minutes: 15});