From ffc7cb01ecf84a39ffba69ce0a21184f9132d17a Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Mon, 16 Jan 2023 14:55:13 +0100 Subject: [PATCH] =?UTF-8?q?Fehler=20behoben=20und=20QuittierungsbelegsResu?= =?UTF-8?q?ltPartial.cshtml=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWoPlanerMobil/Models/MainModel.cs | 4 +- .../QuittierungsbelegsResultPartial.cshtml | 207 ++++++++++++++++++ 2 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs index e056d3154..8d4513706 100644 --- a/BeWoPlanerMobil/Models/MainModel.cs +++ b/BeWoPlanerMobil/Models/MainModel.cs @@ -287,7 +287,7 @@ namespace BeWoPlanerMobil.Models public SupportConceptListObject SelectedSupportConceptListObject { get; set; } - public List SelectedConceptCostBearerRelations { get; set; } = new List(); + public List SelectedConceptCostBearerRelations { get; set; } public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids); @@ -676,7 +676,7 @@ namespace BeWoPlanerMobil.Models public List MultiBookingSelectedGroupOfPeopleOids { get; set; } = new List(); - public List MultiBookingSelectedConceptCostBearerRelations { get; set; } = new List(); + public List MultiBookingSelectedConceptCostBearerRelations { get; set; }; public GroupBookingSelectionObject MultiBookingSelectionObject => new GroupBookingSelectionObject(MultiBookingSelectedConceptCostBearerRelations, MultiBookingSelectedGroupOfPeopleOids); diff --git a/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml b/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml new file mode 100644 index 000000000..f34bef827 --- /dev/null +++ b/BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml @@ -0,0 +1,207 @@ +@using BeWoPlanerMobil.Util.ReportUtils +@model BeWoPlanerMobil.Models.ReportModel + +
+ + @if(TempData["HasWarningMessage"] != null) + { + + } + else if(Model?.ConfirmationReceiptObject?.ConfirmationReceiptResultList?.Count > 0) + { + + + + + + foreach(var result in Model.ConfirmationReceiptObject.ConfirmationReceiptResultList) + { +
+
+ @{ + var customerSignatureOidsString = ""; + + foreach(var signatureOid in result.CustomerSignatureOids) + { + customerSignatureOidsString += signatureOid + ","; + } + + var employeeSignatureOidsString = ""; + + foreach(var employeeSignatureOid in result.EmployeeSignatureOids) + { + employeeSignatureOidsString += employeeSignatureOid + ","; + } + + var employeeSignatureState = result.EmployeeSignatureState; + var customerSignatureState = result.CustomerSignatureState; + + var canCustomerSign = customerSignatureState != SignatureState.All; + var canEmployeeSign = employeeSignatureState != SignatureState.All; + + var employeeName = Model.Employee.ToString(); + + //overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature + var methodName = "showSignaturePad(" + + $"{result.HasCustomerSignature.ToString().ToLower()}, " + + $"'{customerSignatureOidsString}', " + + $"{canCustomerSign.ToString().ToLower()}, " + + $"'#collapse-result-{result.Identifier}', " + + $"{result.CustomerOid}, " + + $"{result.Items.Count}, " + + $"'{result.CustomerName}', " + + $"'{Model.ConfirmationReceiptObject.TimeSpanString}', " + + "false, " + + $"'{employeeName}')"; + + //overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature + var overwrite_ssp = (employeeSignatureState == SignatureState.All).ToString().ToLower(); + var signatureOidsString_ssp = employeeSignatureOidsString; + var canSign_ssp = canEmployeeSign.ToString().ToLower(); + var cardBodyId_ssp = $"#collapse-result-{result.Identifier}"; + var numberOfEntries_ssp = result.Items.Count; + var customerOid_ssp = result.CustomerOid; + var customerName_ssp = result.CustomerName; + var timeSpan_ssp = Model.ConfirmationReceiptObject.TimeSpanString; + + + + var employeeMethodName = $"showSignaturePad({overwrite_ssp}, '{signatureOidsString_ssp}', {canSign_ssp}, '{cardBodyId_ssp}', {customerOid_ssp}, {numberOfEntries_ssp}, '{customerName_ssp}', '{timeSpan_ssp}', true, '{employeeName}')"; + + var employeeBtnColor = "transparent"; + var customerBtnColor = "transparent"; + var employeeIcon = "check"; + var customerIcon = "check"; + + switch(employeeSignatureState) + { + case SignatureState.All: + employeeBtnColor = "greenyellow"; + employeeIcon = "check-double"; + break; + case SignatureState.Some: + employeeBtnColor = "yellow"; + break; + case SignatureState.None: + employeeBtnColor = "transparent"; + break; + } + + switch(customerSignatureState) + { + case SignatureState.All: + customerBtnColor = "greenyellow"; + customerIcon = "check-double"; + break; + case SignatureState.Some: + customerBtnColor = "yellow"; + break; + case SignatureState.None: + customerBtnColor = "transparent"; + break; + } + } + +
+
+ +
+

+ @result.CustomerName +

+
+ + +
+
+
+
+
+
+ @foreach(var item in result.Items) + { +
+
+
+ +
+
+ +
+ + @{ + var hasEmployeeSignatureTextColorClass = item.HasEmployeeSignature ? "text-bewo-employee" : "text-light"; + } + + + + m + + @if(item.HasCustomerSignature) + { + + } +
+
+
+
+
+
+ Kontaktart: +
+
+ @item.Kontaktart +
+
+
+
+ Anzahl Klienten: +
+
+ @item.CustomersCount +
+
+
+
+ FLS in Minuten (ohne 1,2): +
+
+ @item.Minutes +
+
+
+
+ Mitarbeiter: +
+
+ @item.Employees +
+
+
+
+
+
+ } +
+
+
+
+ } + } +
\ No newline at end of file