diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs index 097e815e7..b63342419 100644 --- a/BeWoPlanerMobil/Controllers/ReportController.cs +++ b/BeWoPlanerMobil/Controllers/ReportController.cs @@ -931,6 +931,8 @@ namespace BeWoPlanerMobil.Controllers employeeSignatures.ToList(), employeeSignatureState); + var confirmationReceiptResults = new List(); + reportObjects.DoForEach(reportObject => { var quittierungsbelegItems = new List(); @@ -997,8 +999,8 @@ namespace BeWoPlanerMobil.Controllers quittierungsbelegItem.HasEmployeeSignature = employeeSignatureServiceRecordOids.Contains(serviceRecordOid); } - Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.Add( - item: new QuittierungsbelegResult + confirmationReceiptResults.Add( + item: new QuittierungsbelegResult ( $"{reportObject.CustomerLastName}, {reportObject.CustomerFirstName}", quittierungsbelegItems, @@ -1013,6 +1015,8 @@ namespace BeWoPlanerMobil.Controllers ); }); + Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.AddRangeIfElementsNotIn(confirmationReceiptResults.OrderBy(o => o.CustomerName)); + if(Model.ConfirmationReceiptObject.ConfirmationReceiptResultList.All(qbItem => qbItem.Items.Count == 0)) { TempData["HasWarningMessage"] = true; diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index 7e179ec50..d3092165f 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -130,7 +130,7 @@ } $(window).ready(function() { - @if(ViewData["Testmeldung"] is string testMessage) + @if(Html.IsInDebugMode() && ViewData["Testmeldung"] is string testMessage) { showMessagePopupWithHtml("Fehler", ""); diff --git a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml index 5b102c7e5..eb3fca01f 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml @@ -1,19 +1,8 @@ @using BeWoPlanerMobil.Models; -@using BeWoPlanerMobil.Util -@using BS.Shared @using BS.Shared.Extensions @model CustomerModel -@* - ToDos: - 1. Formularvalidierung - 2. Ganztagsfunktionalität einbauen - 3. Controller-Funktionen implementieren: - 1. Bearbeiten einer existierenden Abwesenheit - 2. Anlegen einer neuen Abwesenheit -*@ -