HausTheresia und SprungbrettTheresia/ServicesOverviewReport - vereinheitlicht, neuer Anbieter

ReportImp/HausTheresia/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ReportImp/HausTheresia/ServicesOverviewReport.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 17</value>
-  </metadata>
 </root>

ReportImp/SprungbrettTheresia/ServicesOverviewReport.cs

@@ -1,6 +1,10 @@
-using System.Collections.Generic;
-using BeWo.Report;
+using System;
+using System.Collections;
+using System.ComponentModel;
+using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
+using BeWo.Report;
+using System.Collections.Generic;
 
 namespace BeWo.SprungbrettTheresia
 {
@@ -17,22 +21,12 @@ namespace BeWo.SprungbrettTheresia
             {
                 List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
 
-                foreach (var sd in pRO.Services)
+                foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
                 {
-                    if (sd.IsBillable)
-                    {
-                        ServicesOverviewRO.CreateSignatureString(sd);
-                        sd.Notice5 = "";
-                        if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
-                        {
-                            sd.Notice5 = "Fehlkontakt";
-                        }
-                    }
-                    else
-                    {
-                        sd.Notice5 = "nicht abrechenbar";
-                    }
-                    servicesBillable.Add(sd);
+                    if (s.ServiceDescription.ToLower().Contains("fehlkontakt"))
+                        s.TimeRangeString += " (Fehlkontakt)";
+                    if (s.IsBillable)
+                        servicesBillable.Add(s);
                 }
 
                 pRO.Services = servicesBillable;