Verbesserungen in der Mobilversion:
Termine werden beim Anlegen und Bearbeiten auf Überschneidungen geprüft und es wird gewarnt, wenn dem so ist. Das Unterschriftenfeld hat jetzt eine Breite von 90% des Browsers.
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
function resetInsertAppointmentForm() {
|
||||
$.get(getResetSelectedAppointmentUrl());
|
||||
|
||||
$("#insert-appointment-form").trigger("reset");
|
||||
$("#scheduler-start-time, #scheduler-end-time, #subject, #location, #notice").val("");
|
||||
|
||||
$("#scheduler-start-date, #scheduler-end-date").val(moment().format("DD.MM.YYYY"));
|
||||
}
|
||||
|
||||
function submitInsertAppointmentForm() {
|
||||
@@ -20,6 +22,23 @@ function validateAppointmentForm() {
|
||||
var endTimePicker = $("#scheduler-end-time-picker");
|
||||
var endDatePicker = $("#scheduler-end-date-picker");
|
||||
|
||||
var isStartTimeInputEmpty = isEmptyOrSpaces($("#scheduler-start-time").val());
|
||||
var isEndTimeInputEmpty = isEmptyOrSpaces($("#scheduler-end-time").val());
|
||||
var isStartDateInputEmpty = isEmptyOrSpaces($("#scheduler-start-date").val());
|
||||
var isEndDateInputEmpty = isEmptyOrSpaces($("#scheduler-end-date").val());
|
||||
|
||||
startTimePicker.datetimepicker("show");
|
||||
startTimePicker.datetimepicker("hide");
|
||||
|
||||
startDatePicker.datetimepicker("show");
|
||||
startDatePicker.datetimepicker("hide");
|
||||
|
||||
endTimePicker.datetimepicker("show");
|
||||
endTimePicker.datetimepicker("hide");
|
||||
|
||||
endDatePicker.datetimepicker("show");
|
||||
endDatePicker.datetimepicker("hide");
|
||||
|
||||
var startTime = startTimePicker.datetimepicker("date");
|
||||
var endTime = endTimePicker.datetimepicker("date");
|
||||
var startDate = startDatePicker.datetimepicker("date");
|
||||
@@ -30,10 +49,12 @@ function validateAppointmentForm() {
|
||||
var c = startTime === undefined || startTime === null || !startTime.isValid();
|
||||
var d = endTime === undefined || endTime === null || !endTime.isValid();
|
||||
|
||||
if(a || b || c || d) {
|
||||
if(a || b || c || d || isStartDateInputEmpty || isStartTimeInputEmpty || isEndTimeInputEmpty || isEndDateInputEmpty) {
|
||||
|
||||
hideSpinner();
|
||||
$("#messagePopup .modal-body").html('<div class="alert alert-danger" role="alert">Die Zeit- und/oder Datumsangaben sind nicht korrekt.</div>');
|
||||
showMessagePopup("Fehler");
|
||||
$("#scheduler-start-time, #scheduler-end-time").val("");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -54,5 +75,55 @@ function validateAppointmentForm() {
|
||||
return;
|
||||
}
|
||||
|
||||
$("#insert-appointment-form").submit();
|
||||
$.get(
|
||||
getCheckForOverlappingAppointmentsUrl(),
|
||||
{
|
||||
startDateRaw: startDate.format("DD.MM.YYYY"),
|
||||
endDateRaw: endDate.format("DD.MM.YYYY"),
|
||||
startTimeRaw: startDate.format("HH:mm"),
|
||||
endTimeRaw: endDate.format("HH:mm")
|
||||
}
|
||||
).done(function(result) {
|
||||
var isOverlapping = $.parseJSON(result);
|
||||
|
||||
if(isOverlapping === true) {
|
||||
hideSpinner();
|
||||
$("#messagePopup .modal-body").html('<div class="alert alert-warning" role="alert">Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.<br/> Möchten Sie ihn wirklich speichern?</div>');
|
||||
showMessagePopupWithCallback("Überschneidung",
|
||||
null,
|
||||
function() {
|
||||
$("#messagePopup .modal-body").html();
|
||||
showSpinner();
|
||||
$("#insert-appointment-form").submit();
|
||||
});
|
||||
} else {
|
||||
$("#insert-appointment-form").submit();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function toggleFormVisibility() {
|
||||
if($("#form-toggle-button").css("display") === "none") {
|
||||
showAppointmentForm();
|
||||
} else {
|
||||
hideAppointmentForm();
|
||||
}
|
||||
}
|
||||
|
||||
function hideAppointmentForm() {
|
||||
$("#form-container").collapse("hide");
|
||||
}
|
||||
|
||||
function showAppointmentForm() {
|
||||
$("#form-container").collapse("show");
|
||||
}
|
||||
|
||||
function toggleAppointmentForm() {
|
||||
var isVisible = $("#form-container").css("display") === "block";
|
||||
|
||||
if (isVisible) {
|
||||
hideAppointmentForm();
|
||||
} else {
|
||||
showAppointmentForm();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user