From d44a743fd05fc4ec35f5c9a4152726bd006e68c9 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 30 Jul 2025 12:19:29 +0200 Subject: [PATCH] LebenshilfeDorsten/SettlementReport2.cs - Spezifizierung wenn Beschriftung Fehlkontakte --- .../LebenshilfeDorsten/SettlementReport2.cs | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/ReportImp/LebenshilfeDorsten/SettlementReport2.cs b/ReportImp/LebenshilfeDorsten/SettlementReport2.cs index 68d0b128b..ffdd98df3 100644 --- a/ReportImp/LebenshilfeDorsten/SettlementReport2.cs +++ b/ReportImp/LebenshilfeDorsten/SettlementReport2.cs @@ -7,6 +7,7 @@ using BeWo.Report.ReportObjects; using BeWo.Report; using System.Text.RegularExpressions; using BS.Shared.Extensions; +using System.Linq; namespace LebenshilfeDorsten { @@ -25,22 +26,29 @@ namespace LebenshilfeDorsten } decimal rateFactor = 1; - - foreach (var ii in pRO.InvoiceItems) + bool factor = false; + if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count > 0) { - if (ii.RateFactor.HasValue) + if (pRO.InvoiceItems.Any(i => i.RateFactor.HasValue && i.RateFactor.Value > 0)) + { + factor = true; + } + foreach (var ii in pRO.InvoiceItems) { - rateFactor = (100 + ii.RateFactor.Value) / 100; - } - - if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) - { - Zwischensumme.Visible = true; - if (!ii.ItemDescription.IsNullOrEmpty()) + if (ii.RateFactor.HasValue) { - ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + + if (factor && !pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (!ii.ItemDescription.IsNullOrEmpty()) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; } - ii.ItemDescription = "Fehlkontakte"; } } pRO.RateFactor = (double)rateFactor;