From a94d24392ecd0b52db14bf4aed6884ed825e0f0d Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@ownsoft.de>
Date: Wed, 18 Jan 2023 17:13:42 +0100
Subject: [PATCH] =?UTF-8?q?MoK:=20Korrekte=20Costbearer2SupportConceptOid?=
 =?UTF-8?q?=20wird=20in=20der=20Gruppenbuchung=20ausgew=C3=A4hlt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWoPlanerMobil/BeWoPlanerMobil.csproj.user   |  2 +-
 BeWoPlanerMobil/Controllers/MainController.cs | 12 ++++---
 .../QuittierungsbelegsResultPartial.cshtml    | 32 +++++++++++++++++--
 BeWoPlanerMobil/Views/Report/Report.cshtml    | 26 +--------------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index d9a15ae1d..53a731655 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 5a340ea30..4000a1844 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -1108,10 +1108,14 @@ namespace BeWoPlanerMobil.Controllers
         {
             var employeeCount = Model.GroupBookingSelectedEmployees.Count;
             var personCount = Model.GroupBookingSelectedSupportConcepts.Count;
-            
-            var cb2ScOids = (from scDc in Model.GroupBookingSelectedSupportConcepts 
-                                where scDc.CostBearerRelations != null && scDc.CostBearerRelations.Count > 0 let costBearer2SupportConceptOid = scDc.CostBearerRelations[0].CostBearer2SupportConceptOid 
-                                    where costBearer2SupportConceptOid != null select costBearer2SupportConceptOid.Value).ToList();
+
+            // ToDo: Genaue Oid raussuchen! Bisher wird immer nur die erste genommen!
+
+            //var cb2ScOids = (from scDc in Model.GroupBookingSelectedSupportConcepts 
+            //                    where scDc.CostBearerRelations != null && scDc.CostBearerRelations.Count > 0 let costBearer2SupportConceptOid = scDc.CostBearerRelations[0].CostBearer2SupportConceptOid 
+            //                        where costBearer2SupportConceptOid != null select costBearer2SupportConceptOid.Value).ToList();
+
+            var cb2ScOids = Model.GroupBookingSelectedCostbearerRelOids;
 
             var list = CalculateGroupBookingDuration(employeeCount, personCount, cb2ScOids);
 
diff --git a/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml b/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml
index dfb69fc32..010368fee 100644
--- a/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml
@@ -1,6 +1,32 @@
 @using BeWoPlanerMobil.Util.ReportUtils
 @model BeWoPlanerMobil.Models.ReportModel
     
+<script>
+    function deleteCustomerSignatures(cardBodyId, resultIdentifier, customerName, timeSpan) {
+        try {
+            cardHeaderButtonClick(cardBodyId);
+
+            showMessagePopupWithCallback("Unterschriften löschen", "Sind Sie sicher, die Unterschriften von " + customerName + " im Zeitraum von " + timeSpan + " zu löschen?", function () {
+
+            }, false);
+        } catch(error) {
+            logError(error);
+        }
+    }
+
+    function deleteEmployeeSignature(cardBodyId, resultIdentifier, employeeName, customerName, timeSpan) {
+        try {
+            cardHeaderButtonClick(cardBodyId);
+
+            showMessagePopupWithCallback("Unterschrift löschen", "Sind Sie sicher, die Unterschrift von " + employeeName + " für " + customerName + " im Zeitraum von " + timeSpan + " zu löschen?", function () {
+
+            }, false);
+        } catch(error) {
+            logError(error);
+        }
+    }
+</script>
+
 <div class="mt-3">
     <div class="alert alert-primary d-none" role="alert" id="warning-message-container">
 
@@ -132,7 +158,7 @@
 
                     -->
                     
-                    @* Todo: Löschfunktionen implementieren *@
+                    @* Todo: Löschfunktionen implementieren (in Formulare umbauen!) *@
                     <div class="row">
                         <div class="col-sm-auto mr-auto">
                             <div class="input-group">
@@ -147,7 +173,7 @@
                         <div class="col-sm-auto">
                             <div class="btn-toolbar justify-content-between">
                                 <div class="btn-group pr-1" role="group">
-                                    @*<button class="btn btn-danger" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier')">
+                                    @*<button class="btn btn-danger" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier', '@result.Identifier', '@result.CustomerName', '@timeSpan_ssp')">
                                         <span class="fas fa-trash"></span>
                                     </button>*@
                                     <button class="btn btn-bewo-customers" type="button" onclick="@methodName">
@@ -157,7 +183,7 @@
                                     </button>
                                 </div>
                                 <div class="btn-group" role="group">
-                                    @*<button class="btn btn-danger" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier')">
+                                    @*<button class="btn btn-danger" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier', '@result.Identifier', '@employeeName', '@result.CustomerName', '@timeSpan_ssp')">
                                         <span class="fas fa-trash"></span>
                                     </button>*@
                                     <button class="btn btn-bewo-employee" type="button" onclick="@employeeMethodName">
diff --git a/BeWoPlanerMobil/Views/Report/Report.cshtml b/BeWoPlanerMobil/Views/Report/Report.cshtml
index bdf98a2d6..b7bea9aa5 100644
--- a/BeWoPlanerMobil/Views/Report/Report.cshtml
+++ b/BeWoPlanerMobil/Views/Report/Report.cshtml
@@ -159,31 +159,7 @@
         }
     }
 
-    function deleteCustomerSignatures(cardBodyId) {
-        try {
-            cardHeaderButtonClick(cardBodyId);
-
-            // ToDo: Nachfragen, ob die Unterschriften wirklich gelöscht werden sollen
-            showMessagePopupWithCallback("Unterschriften löschen", "", function() {
-
-            }, false);
-        } catch (error) {
-            logError(error);
-        }
-    }
-
-    function deleteEmployeeSignature(cardBodyId) {
-        try {
-            cardHeaderButtonClick(cardBodyId);
-
-            // ToDo: Nachfragen, ob die Unterschrift wirklich gelöscht werden soll
-            showMessagePopupWithCallback("Unterschrift löschen", "", function () {
-
-            }, false);
-        } catch(error) {
-            logError(error);
-        }
-    }
+    
 </script>
 
 <div class="container-fluid my-3" id="report-form-container">