BeWoWalzPaiva: Fehlkontakte QB + SR2

ReportImp/BeWoWalzPaiva/QuittierungsbelegMitDatum.cs

@@ -22,13 +22,20 @@ namespace BeWoWalzPaiva
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable)
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
                     {
-                        if (sd.IsGroup)
-                        {
-                            //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                        sd.Notice5 = "E";
+
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                        {
+                            sd.Notice5 = "F";
+                        }
+                        else if (sd.IsGroup)
+                        {
+                            sd.Notice5 = "GR";
                             hatGruppen = true;
                         }
+
                         servicesBillable.Add(sd);
                     }
                 }

ReportImp/BeWoWalzPaiva/SettlementReport2.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
 using BS.Shared.DataContracts;
-
+using BS.Shared.Extensions;
+
 namespace BeWoWalzPaiva
 {
     public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
@@ -36,11 +38,23 @@ namespace BeWoWalzPaiva
             if (pRO.InvoiceItems != null)
             {
                 foreach (var ii in pRO.InvoiceItems)
-                {
-                    ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
-                        ii.PeriodStartDate, ii.PeriodEndDate,
-                        ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ",
-                        ii.AmountPerUnit);
+                {
+                    if (!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";
+                    }
+                    else
+                    {
+                        ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
+                            ii.PeriodStartDate, ii.PeriodEndDate,
+                            ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ",
+                            ii.AmountPerUnit);
+                    }
                 }
             }