diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index df17b2a31..7554110bd 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -1617,7 +1617,7 @@ namespace BeWoPlanerMobil.Controllers long? oldCatOid = null; long? oldDescOid = null; - if (!Model.IsInEditingMode) + if(!Model.IsInEditingMode) { oldCatOid = Model.SelectedServiceCategoryOid; oldDescOid = Model.SelectedServiceDescriptionOid; @@ -1627,7 +1627,7 @@ namespace BeWoPlanerMobil.Controllers var result = ResetEditingMode(); - if (oldCatOid.HasValue && oldDescOid.HasValue) + if(oldCatOid.HasValue && oldDescOid.HasValue) { Model.SelectedServiceCategoryOid = oldCatOid; Model.SelectedServiceDescriptionOid = oldDescOid; @@ -4314,7 +4314,7 @@ namespace BeWoPlanerMobil.Controllers return View("Main", Model); } - private ServiceRecordDC CreateServiceRecordFromScratch(DateTime start, DateTime end, CompactCustomerDC customer, CompactEmployeeDC employee, string notice) + private ServiceRecordDC CreateServiceRecordFromScratch(DateTime start, DateTime end, CompactCustomerDC customer, CompactEmployeeDC employee, string notice) { var serviceRecord = new ServiceRecordDC { @@ -4820,6 +4820,11 @@ namespace BeWoPlanerMobil.Controllers private void LoadPaginatedServiceRecordsToModel(int selectedPage) { + if(Model.IsInGroupBookingMode || Model.IsInMultiBookingMode) + { + return; + } + var records = new List(); if(selectedPage < 1) diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs index 5f58abc99..fe073823c 100644 --- a/BeWoPlanerMobil/Models/MainModel.cs +++ b/BeWoPlanerMobil/Models/MainModel.cs @@ -854,7 +854,28 @@ namespace BeWoPlanerMobil.Models } } - + public string BookingModePrefix + { + get + { + var result = "sb"; + + switch(CurrentBookingMode) + { + case BookingMode.GroupBookingMode: + result = "gb"; + break; + case BookingMode.MultiBookingMode: + result = "mb"; + break; + default: + result = "sb"; + break; + } + + return result; + } + } } public class CustomSelectListItem diff --git a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js index b73f5ba0d..06e27086d 100644 --- a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js +++ b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js @@ -1,20 +1,20 @@ function showPieChart() { - var cb2ScRelOid = parseInt($("#CostBearer2SupportConceptOid").val(), 10); + const cb2ScRelOid = parseInt($("#sb-cb2ScRelOid").val(), 10); - if (cb2ScRelOid === null || cb2ScRelOid === undefined) { + if(cb2ScRelOid === null || cb2ScRelOid === undefined) { showMessagePopup("Hilfeplanstatistik", "Es wurde kein Hilfeplan ausgewählt"); return; } - var customerInfo = $("#selectedSupportConceptCustomerInfo").html(); - var selectedSupportConceptInfo = $("#selectedSupportConceptInfo").html(); + const customerInfo = $("#selectedSupportConceptCustomerInfo").html(); + const selectedSupportConceptInfo = $("#selectedSupportConceptInfo").html(); - $("#statistics-header").html("Hilfeplanstatistik: " + customerInfo + " | " + selectedSupportConceptInfo); + $("#statistics-header").html(`Hilfeplanstatistik: ${customerInfo} | ${selectedSupportConceptInfo}`); getSupportConceptStatistics(cb2ScRelOid); } function getSupportConceptStatistics(cb2ScRRelOid) { - var url = getLoadStatisticsUrl(); + const url = getLoadStatisticsUrl(); $.get(url, { oid: cb2ScRRelOid }).done(function(jsonObject) { try { @@ -31,10 +31,7 @@ function getSupportConceptStatistics(cb2ScRRelOid) { $.each(scStatistics.statisticPeriods, function(index, period) { $.each(period.header2values, function(index, header2Values) { $("#period-statistics-container").append( - '
' + - '
' + header2Values.header + "
" + - '
' + header2Values.value + "
" + - "
"); + `
${header2Values.header}
${header2Values.value}
`); }); if(index < (scStatistics.statisticPeriods.length - 1)) { @@ -58,7 +55,7 @@ function getSupportConceptStatistics(cb2ScRRelOid) { } function drawPieChart(v1, v2, free, used) { - var data = [ + const data = [ { value: v1, color: "#00FF00", @@ -73,7 +70,7 @@ function drawPieChart(v1, v2, free, used) { } ]; - var options = { + const options = { scaleShowLabelBackdrop: true, scaleBackdropColor: "rgba(255,255,255,0.75)", scaleBeginAtZero: true, @@ -97,7 +94,7 @@ function drawPieChart(v1, v2, free, used) { "" }; - var context = $("#statistic-canvas").get(0).getContext("2d"); + const context = $("#statistic-canvas").get(0).getContext("2d"); new Chart(context).Pie(data, options); } \ No newline at end of file diff --git a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js index 952f259ae..086d72f22 100644 --- a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js +++ b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/dateUtils.js @@ -6,59 +6,6 @@ return [hours, minutes]; } -function getDateFromPicker(pickerId) { - try { - const picker = $(`#${pickerId}`); - - if(picker.length > 0) { - picker.datetimepicker("show"); - picker.datetimepicker("hide"); - - const unixTime = picker.datetimepicker("date"); - const targetDate = new Date(unixTime); - - if(isValidDate(targetDate)) { - return targetDate; - } - } - - return new Date(); - } catch(error) { - window.showErrorPopup(error); - } finally { - return new Date(); - } -} - -function getTimeFromPicker(pickerId) { - const result = new Date(); - - try { - const picker = $(`#${pickerId}`); - - if (picker.length > 0) { - const timeString = picker.val(); - if (timeString.length === 5) { - const hours = timeString.substring(0, 2); - const minutes = timeString.substring(3); - - result.setHours(hours); - result.setMinutes(minutes); - - const date = result.getDate(); - const month = result.getMonth(); - const year = result.getYear(); - - return new Date(year, month, date, hours, minutes, 0, 0); - } - } - } catch (error) { - window.showErrorPopup(error); - } finally { - return result; - } -} - function dateToShortDateString(date) { try { logInfo2(`Konvertiere Datum zu kurzem Datum: ${date}`); diff --git a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/logging.js b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/logging.js index 802eede7d..c3997d000 100644 --- a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/logging.js +++ b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/logging.js @@ -7,7 +7,7 @@ function logWarning(message) { } function logError(message) { - console.error("%c" + message, "font-size: 14px; font-family: monospace; color: red"); + console.error(`%c${message}`, "font-size: 14px; font-family: monospace; color: red"); } function logDebug(message) { @@ -15,7 +15,7 @@ function logDebug(message) { } function logColorfulMessage(message, color) { - console.log("%c" + message, "font-size: 14px; font-family: monospace; color: " + color); + console.log(`%c${message}`, `font-size: 14px; font-family: monospace; color: ${color}`); } function logInfo2(message) { diff --git a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js index b04de8adb..876bdba6d 100644 --- a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js +++ b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js @@ -1,220 +1,11 @@ -function calculateTimeWithDuration(timeInputValue, timeElement, startDate, duration, hoursMinutesDropdownBtnId) { - var isInMin = window.getIsZeiterfassungseinheitInMinutes(); - - const hoursToMinutes = parseTimeInputToIntegerArray(timeInputValue); - const hours = parseInt(hoursToMinutes[0]); - const minutes = parseInt(hoursToMinutes[1]); - const stdMinDropdown = $(`#${hoursMinutesDropdownBtnId}`); - - startDate.hours(hours); - startDate.minutes(minutes); - - if(stdMinDropdown.length) { - isInMin = stdMinDropdown.text().replaceAll(/\s/g, "") === "Minuten"; - } - - const durationFormat = isInMin ? "m" : "h"; - - startDate.add(duration, durationFormat); - - timeInputValue = startDate.format("HH:mm"); - - timeElement.val(timeInputValue); -} - -function onDurationChange(startTimeId, endTimeId, startDateId, endDateId, durationId, hoursMinutesDropdownBtnId, startDatePickerId, endDatePickerId) { - try { - var isInMin = getIsZeiterfassungseinheitInMinutes(); - - var startTime = $(`#${startTimeId}`).val(); - var endTime = $(`#${endTimeId}`).val(); - var duration = $(`#${durationId}`).val(); - var hoursMinutesDropdownButton = $(`#${hoursMinutesDropdownBtnId}`); - - var startTimeCondition = startTime !== undefined && startTime !== null && startTime.length > 0; - var endTimeCondition = endTime !== undefined && endTime !== null && endTime.length > 0; - var durationNumber = parseFloat(duration.replace(",", ".")); - var durationCondition = !isNaN(durationNumber); - - if((false === startTimeCondition && false === endTimeCondition) || durationCondition === false) { - return; - } - - var startDateString = $(`#${startDatePickerId}`).datetimepicker("date"); - var endDate = moment(new Date()); - var startDate = moment(new Date()); - - if(startDateString.length !== 0) { - startDate = moment(startDateString); - endDate = startDate.clone(); - } - - if($(`#${endDatePickerId}`).length !== 0) { - var endDateString = $(`#${endDatePickerId}`).datetimepicker("date"); - endDate = moment(endDateString); - } - - var h2m = [0, 0]; - - if(hoursMinutesDropdownButton.length) { - isInMin = hoursMinutesDropdownButton.text().replaceAll(/\s/g, "") === "Minuten"; - } - - var durationFormat = isInMin ? "m" : "h"; - - if(startTimeCondition === true) { - h2m = parseTimeInputToIntegerArray(startTime); - - startDate = startDate.hours(h2m[0]).minutes(h2m[1]); - endDate = startDate.clone().add(durationNumber, durationFormat); - - $(`#${endTimeId}`).val(endDate.format("HH:mm")); - $(`#${endDateId}`).val(endDate.format("DD.MM.yyyy")); - } else { - h2m = parseTimeInputToIntegerArray(endTime); - - endDate = endDate.hours(h2m[0]).minutes(h2m[1]); - startDate = endDate.clone().add(durationNumber * -1, durationFormat); - - $(`#${startTimeId}`).val(startDate.format("HH:mm")); - $(`#${startDateId}`).val(startDate.format("DD.MM.yyyy")); - } - } catch(error) { - window.showErrorPopup(error); - } -} - -// ToDo: VERALTET (14.05.2025); Erst Dauer, dann Start- oder Endzeit führt dazu, dass die Dauer in Stunden benutzt wird! -function calculateDuration(isInvocatedByHoursMinutesButton, startTimeId, endTimeId, durationId, hoursMinutesDropdownBtnId, startDatePickerId, endDatePickerId, isInvokedByStartElement, isInvokedByEndElement) { - var startTime = $(`#${startTimeId}`).val(); - var endTime = $(`#${endTimeId}`).val(); - var duration = $(`#${durationId}`).val(); - - var hoursMinutesDropdownButton = $(`#${hoursMinutesDropdownBtnId}`); - - var isInMin = window.getIsZeiterfassungseinheitInMinutes(); - - if(hoursMinutesDropdownButton.length) { - isInMin = hoursMinutesDropdownButton.text().replaceAll(/\s/g, "") === "Minuten"; - } - - var durationFormat = isInMin ? "m" : "h"; - - if((startTime.length > 0 && startTime.length < 5) || (endTime.length > 0 && endTime.length < 5)) { - return; - } - - var isStartTimeValid = startTime !== undefined && startTime !== null && startTime.length > 0; - var isEndTimeValid = endTime !== undefined && endTime !== null && endTime.length > 0; - - var durationNumber = parseFloat(duration.replace(",", ".")); - var isDurationValid = !isNaN(durationNumber); - - var startDateString = $("#" + startDatePickerId).datetimepicker("date"); - - var endDate = moment(new Date()); - var startDate = moment(new Date()); - - // Das Startdatum hat einen Wert - if(startDateString !== null && startDateString.length !== 0) { - startDate = moment(startDateString); - endDate = startDate.clone(); - } - - // Es gibt ein Enddatumsfeld - if($(`#${endDatePickerId}`).length !== 0) { - var endDateString = $(`#${endDatePickerId}`).datetimepicker("date"); - // Das Enddatum hat einen Wert - if(endDateString !== null && endDateString.length !== 0) { - endDate = moment(endDateString); - } - } - - var newDurationValue = 0; - - // Start- und Enddatum sind vorhanden und das Event wurde nicht vom Stunden/Minuten-Dropdown aufgerufen - if(isStartTimeValid && isEndTimeValid && isInvocatedByHoursMinutesButton === false) { - var startHHmm = parseTimeInputToIntegerArray(startTime); - var endHHmm = parseTimeInputToIntegerArray(endTime); - - startDate.hours(startHHmm[0]); - startDate.minutes(startHHmm[1]); - endDate.hours(endHHmm[0]); - endDate.minutes(endHHmm[1]); - - var momentDuration = moment.duration(endDate.diff(startDate)); - - if(durationNumber > 0 && isInvokedByStartElement && startDate >= endDate) { - endDate = startDate.clone().add(durationNumber, durationFormat); - - $(`#${endTimeId}`).val(endDate.format("HH:mm")); - $(`#${endDatePickerId}`).val(endDate.format("DD.MM.yyyy")); - - momentDuration = moment.duration(endDate.diff(startDate)); - } - - if(durationNumber > 0 && isInvokedByEndElement && startDate >= endDate) { - startDate = endDate.clone().subtract(durationNumber, durationFormat); - - $(`#${startTimeId}`).val(startDate.format("HH:mm")); - $(`#${startDatePickerId}`).val(startDate.format("DD.MM.yyyy")); - - momentDuration = moment.duration(endDate.diff(startDate)); - } - - newDurationValue = isInMin ? momentDuration.asMinutes() : momentDuration.asHours(); - - $(`#${durationId}`).val(newDurationValue); - // Startdatum und Dauer sind vorhanden - } else if(isStartTimeValid && isDurationValid) { - if(isInvocatedByHoursMinutesButton) { - durationNumber = isInMin ? durationNumber *= 60 : durationNumber /= 60; - $(`#${durationId}`).val(durationNumber); - } - - calculateTimeWithDuration(startTime, $(`#${endTimeId}`), startDate, durationNumber, hoursMinutesDropdownBtnId); - // Enddatum und Dauer sind vorhanden - } else if(isEndTimeValid && isDurationValid) { - if(isInvocatedByHoursMinutesButton) { - durationNumber = isInMin ? durationNumber *= 60 : durationNumber /= 60; - $(`#${durationId}`).val(durationNumber); - } - - calculateTimeWithDuration(endTime, $(`#${startTimeId}`), startDate, durationNumber * -1, hoursMinutesDropdownBtnId); - } else if(isInvocatedByHoursMinutesButton) { - // Wurde von Min zu Std oder Std zu Min - if(isInvocatedByHoursMinutesButton && isDurationValid) { - durationNumber = isInMin ? durationNumber * 60 : durationNumber / 60; - $(`#${durationId}`).val(durationNumber); - } - } -} - - - - - - - - - - - - - - - - - - - -function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd) { +function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd) { const endDateInput = $(`#${idPrefix}-end-date-input`); const startDateInput = $(`#${idPrefix}-start-date-input`); const endTimeInput = $(`#${idPrefix}-end-time-input`); const startTimeInput = $(`#${idPrefix}-start-time-input`); const durationInput = $(`#${idPrefix}-duration-input`); const hoursMinutesBtn = $(`#${idPrefix}-hours-minutes-dropdown-btn`); + const durationLabel = $(`#${idPrefix}-duration-label`); const startDateValue = startDateInput.val(); const startTimeValue = startTimeInput.val(); @@ -222,12 +13,14 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd const endTimeValue = endTimeInput.val(); const durationValue = durationInput.val(); - //alert(hoursMinutesBtn.text()); - const isInMin = hoursMinutesBtn.length === 0 || hoursMinutesBtn.length > 0 && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten"; - //alert(isInMin); + const hasMinutesHoursDropdown = hoursMinutesBtn.length > 0; + + const isInMin = (false === hasMinutesHoursDropdown && false === durationLabel.text().includes("(h)")) || + hasMinutesHoursDropdown === true && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten"; + const hasEndDate = endDateInput.length; - if (startDateValue.length === 0) { + if(startDateValue.length === 0) { return; } @@ -239,46 +32,39 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd let start = new Date(startDateValue); let end = hasEndDate ? new Date(endDateValue) : start; - if (true === isStartTimeValid && true === isEndTimeValid && false === isFormatChange) { + if(true === isStartTimeValid && true === isEndTimeValid && false === isFormatChange) { start = combineDateAndTime(start, startTimeValue); end = combineDateAndTime(end, endTimeValue); let dauer = (end.getTime() - start.getTime()) / 60000; - if (duration > 0 && start >= end) { + if(duration > 0 && start >= end) { dauer = (false === isInMin ? duration * 60 : duration); - if (true === isInvokedByStart) { + if(true === isInvokedByStart) { end = new Date(start.getTime() + dauer * 60000); endTimeInput.val(getTimeAsString(end)); endDateInput.val(getDateAsString(end)); } - else if (true === isInvokedByEnd) { + else if(true === isInvokedByEnd) { end.setDate(end.getDate() + 1); - var test = new Date(2025, 1, 31); - test.setDate(test.getDate() + 1); - //start = new Date(end.getTime() - dauer * 60000); - endTimeInput.val(getTimeAsString(end)); endDateInput.val(getDateAsString(end)); - - //startTimeInput.val(getTimeAsString(start)); - //startDateInput.val(getDateAsString(start)); } dauer = (end.getTime() - start.getTime()) / 60000; } - if (false === isInMin) { + if(false === isInMin) { dauer /= 60.0; } durationInput.val(dauer); - } else if (true === isStartTimeValid && true === isDurationValid) { + } else if(true === isStartTimeValid && true === isDurationValid) { var newDuration = duration; - if (true === isFormatChange) { + if(true === isFormatChange) { let newDurationValue = true === isInMin ? duration * 60.0 : duration / 60.0; if(isNaN(newDurationValue)) { @@ -286,7 +72,7 @@ function calcDuration(idPrefix, isFormatChange, isInvokedByStart, isInvokedByEnd } else { durationInput.val(newDurationValue); } - if (true === isInMin) + if(true === isInMin) { newDuration = newDurationValue; } @@ -334,7 +120,7 @@ function calcTimeWithDuration(timeAsString, timeElement, start, duration, isForm start = combineDateAndTime(start, timeAsString); const x = new Date(start.getTime() + duration * 60000); - var timeString = `${x.getHours().toString().padStart(2, "0")}:${x.getMinutes().toString().padStart(2, "0")}`; + const timeString = `${x.getHours().toString().padStart(2, "0")}:${x.getMinutes().toString().padStart(2, "0")}`; timeElement.val(timeString); } @@ -346,7 +132,11 @@ function beiDaueraenderung(idPrefix) { const durationInput = $(`#${idPrefix}-duration-input`); const startDateInput = $(`#${idPrefix}-start-date-input`); const endDateInput = $(`#${idPrefix}-end-date-input`); - const isInMin = hoursMinutesDropdown.length === 0 || hoursMinutesDropdown.length > 0 && hoursMinutesDropdown.text().replaceAll(/\s/g, "") === "Minuten"; + const hoursMinutesBtn = $(`#${idPrefix}-hours-minutes-dropdown-btn`); + const durationLabel = $(`#${idPrefix}-duration-label`); + const hasMinutesHoursDropdown = hoursMinutesDropdown.length > 0; + const isInMin = (false === hasMinutesHoursDropdown && false === durationLabel.text().includes("(h)")) || + hasMinutesHoursDropdown === true && hoursMinutesBtn.text().replaceAll(/\s/g, "") === "Minuten"; const startTimeCondition = startTimeInput.val().length > 0; const endTimeCondition = endTimeInput.val().length > 0; @@ -417,12 +207,4 @@ function getDateAsString(dateObject) { const month = (dateObject.getMonth() + 1).toString().padStart(2, "0"); return `${year}-${month}-${date}`; -} - -function dateToDateMonthFullYearStr(date) { - const dayOfMonth = date.getDate(); - const month = date.getMonth() + 1; - const fullYear = date.getFullYear(); - - return `${dayOfMonth}.${month}.${fullYear}`; } \ No newline at end of file diff --git a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js index cd5b52d50..7f52a77f5 100644 --- a/BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js +++ b/BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js @@ -509,7 +509,11 @@ function setServiceDescription(id) { try { const url = window.getSetServiceDescriptionUrl(); - const selectedServiceDescription = $(`#${id}`).find(":selected").val(); + const selectedOption = $(`#${id}`).find(":selected"); + + const selectedServiceDescription = selectedOption.val(); + + window.saveServiceDescriptionLocally(selectedServiceDescription); $.get(url, {pServiceDescriptionOid: selectedServiceDescription}); } catch(error) { diff --git a/BeWoPlanerMobil/Util/FormCollectionConstants.cs b/BeWoPlanerMobil/Util/FormCollectionConstants.cs index 4c88ddf31..c5a31022d 100644 --- a/BeWoPlanerMobil/Util/FormCollectionConstants.cs +++ b/BeWoPlanerMobil/Util/FormCollectionConstants.cs @@ -40,6 +40,7 @@ public static string SelectedGoalOids => "service-record-selected-goal-oids"; public static string GroupBookingSelectedGroupOidsKey => "service-record-group-booking-employee-oids"; public static string MultiBookingSelectedGroupOidsKey => "service-record-multi-booking-employee-oids"; + public static string BookingModeKey => "BookingMode"; // Kalender @@ -95,5 +96,6 @@ public static string AppointmentOidKey => "AppointmentOid"; public static string AfterRestoreKey => "AfterRestore"; public static string SaveSupportConceptDependenciesKey => "SaveSupportConceptDependencies"; + public static string DeleteLocalInputsKey => "DeleteLocalInputsKey"; } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index a5c000378..5e6f51a56 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -18,13 +18,6 @@ }); }); - $(function () { - $("#date-of-birth-picker").datetimepicker({ - locale: "de", - format: "L" - }); - }); - function resizeCustomerPrependElements() { try { let width = window.getMaxWidth("customer-prepend-text-eigenschaften"); diff --git a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml index c87e02b45..cde0bceb9 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml @@ -4,18 +4,6 @@ @model CustomerModel @using(Html.BeginForm("RestoreServiceRecordForm", "Main", FormMethod.Post, new {id="restore-service-record-form"})) @@ -368,7 +460,6 @@ - @@ -384,6 +475,8 @@ + + diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index 1924660e4..0ca9db2fc 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -282,7 +282,6 @@ @* ----- Einzelbuchung: Ziele ----- *@ @if(Model.SelectedSupportConcept != null && Model.SelectedSupportConcept.Goals.Any()) { -