maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Date handling fixes for the unavailability modal

Browse source
This commit is contained in:
Alex Tselegidis 2021-11-24 09:23:36 +01:00
parent fca813e2fe
commit 965ac2fc96
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
assets/js/backend_calendar_unavailability_events_modal.js
View file

@ -32,21 +32,23 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
$dialog.find('.modal-message').addClass('d-none'); $dialog.find('.modal-message').addClass('d-none');
$dialog.find('.is-invalid').removeClass('is-invalid'); $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'); $dialog.find('#unavailable-start').addClass('is-invalid');
return; 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'); $dialog.find('#unavailable-end').addClass('is-invalid');
return; return;
} }
if (start > end) { if (startMoment.isAfter(endMoment)) {
// Start time is after end time - display message to user. // Start time is after end time - display message to user.
$dialog $dialog
.find('.modal-message') .find('.modal-message')
@ -55,15 +57,16 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
.removeClass('d-none'); .removeClass('d-none');
$dialog.find('#unavailable-start, #unavailable-end').addClass('is-invalid'); $dialog.find('#unavailable-start, #unavailable-end').addClass('is-invalid');
return; return;
} }
// Unavailable period records go to the appointments table. // Unavailable period records go to the appointments table.
var unavailable = { var unavailable = {
start_datetime: start.toString('yyyy-MM-dd HH:mm'), start_datetime: startMoment.format('YYYY-MM-DD HH:mm:ss'),
end_datetime: end.toString('yyyy-MM-dd HH:mm'), end_datetime: endMoment.format('YYYY-MM-DD HH:mm:ss'),
notes: $dialog.find('#unavailable-notes').val(), 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() !== '') { if ($dialog.find('#unavailable-id').val() !== '') {
@ -77,7 +80,9 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
// Close the modal dialog and refresh the calendar appointments. // Close the modal dialog and refresh the calendar appointments.
$dialog.find('.alert').addClass('d-none'); $dialog.find('.alert').addClass('d-none');
$dialog.modal('hide'); $dialog.modal('hide');
$('#select-filter-item').trigger('change'); $('#select-filter-item').trigger('change');
}; };
@ -95,9 +100,9 @@ window.BackendCalendarUnavailabilityEventsModal = window.BackendCalendarUnavaila
var $dialog = $('#manage-unavailable'); var $dialog = $('#manage-unavailable');
// Set the default datetime values. // 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) { if (currentMin > 0 && currentMin < 15) {
startMoment.set({minutes: 15}); startMoment.set({minutes: 15});