From 3214d7d289aba6ce315f4a603375f7d06382fba0 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@ownsoft.de>
Date: Mon, 13 Nov 2023 16:40:39 +0100
Subject: [PATCH] =?UTF-8?q?MoK:=20QB:=20Eintr=C3=A4ge=20werden=20jetzt=20a?=
 =?UTF-8?q?lphabetisch=20sortiert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWoPlanerMobil/Controllers/ReportController.cs     |  8 ++++++--
 BeWoPlanerMobil/Views/Customer/Customer.cshtml      |  2 +-
 .../Customer/CustomerAbsenceTimeFormPartial.cshtml  | 13 -------------
 .../Customer/CustomerAbsenceTimePartial.cshtml      |  1 +
 4 files changed, 8 insertions(+), 16 deletions(-)

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<QuittierungsbelegResult>();
+
             reportObjects.DoForEach(reportObject =>
             {
                 var quittierungsbelegItems = new List<QuittierungsbelegItem>();
@@ -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)
         {
             <text>
                 showMessagePopupWithHtml("Fehler", "<div class='alert' role='alert'>@ViewData["Testmeldung"]</div>");
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
-*@
-
 <script type="text/javascript">
     $(function () {
         $("#customer-absence-time-start-date-picker, #customer-absence-time-end-date-picker").datetimepicker({
@@ -39,8 +28,6 @@
                     return;
                 }
 
-                logInfo2(`max width: ${getMaxWidth("customer-absence-time-prepend")}`);
-
                 $(".customer-absence-time-prepend").width(getMaxWidth("customer-absence-time-prepend"));
             });
         } catch(error) {
diff --git a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimePartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimePartial.cshtml
index aca0492e5..69380370e 100644
--- a/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimePartial.cshtml
+++ b/BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimePartial.cshtml
@@ -43,6 +43,7 @@
                     showMessagePopupWithHtml("Fehler", "<div class='alert alert-danger' role='alert'>" + result + "</div>");
                 } else if(result !== undefined && result !== null && result.length === 1) {
                     $("#customer-absence-time-modal-body").load('@Url.Action("LoadAbsenceTimeToForm", "Customer")', function () {
+                        calcAbsenceTimePrependWidth();
                         $("#customer-absence-times-form-popup").modal("show");
                     });
                 }