AmbulantBetreutesWohnenAstridPulm: Fehlkontakte in Quittierungsbeleg und Spitzabrechnung

ReportImp/AmbulantBetreutesWohnenAstridPulm/Quittierungsbeleg.cs

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

ReportImp/AmbulantBetreutesWohnenAstridPulm/QuittierungsbelegMitDatum.cs

@@ -27,16 +27,25 @@ namespace AmbulantBetreutesWohnenAstridPulm
 
                 foreach (var sd in pRO.Services)
                 {
-                    if (sd.IsBillable)
+                    if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
                     {
                         ServicesOverviewRO.CreateSignatureString(sd);
+                        sd.Notice5 = "E";
                         if (sd.IsGroup)
                         {
-                            //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+                            sd.Notice5 = "GR";
                             hatGruppen = true;
                         }
-                        if (sd.SignatureDate.HasValue && sd.SignatureDate.Value.Date == sd.StartDate.Date)
-                            sd.SignatureDate = null;
+                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                        {
+                            sd.Notice5 = "F";
+                        }
+
+                        if (sd.SignatureDate.HasValue && sd.SignatureDate.Value.Date == sd.StartDate.Date)
+                        {
+                            sd.SignatureDate = null;
+                        }
+
                         servicesBillable.Add(sd);
                     }
                 }

ReportImp/AmbulantBetreutesWohnenAstridPulm/SettlementReport2.cs

@@ -5,7 +5,8 @@ using System.ComponentModel;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
-
+using System.Text.RegularExpressions;
+
 namespace AmbulantBetreutesWohnenAstridPulm.Neu
 {
     public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
@@ -22,7 +23,7 @@ namespace AmbulantBetreutesWohnenAstridPulm.Neu
 				lblNotice.Visible = false;
 			}
 
-			decimal rateFactor = 1;
+			 decimal rateFactor = 1;
 
 			foreach (var ii in pRO.InvoiceItems)
 			{
@@ -30,7 +31,17 @@ namespace AmbulantBetreutesWohnenAstridPulm.Neu
 				{
 					rateFactor = (100 + ii.RateFactor.Value) / 100;
 				}
+				if (pRO.FehlkontakteString != null && ii.RateFactor == 0)
+				{
+					Zwischensumme.Visible = true;
+					if (ii.ItemDescription != null)
+					{
+						ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte");
+					}
+					ii.ItemDescription = "Fehlkontakte";
+				}
 			}
+
 			pRO.RateFactor = (double)rateFactor;
 
             this.bindingSource1.DataSource = pRO;