diff --git a/ReportImp/HshCologne/CustomReportCreator.cs b/ReportImp/HshCologne/CustomReportCreator.cs index 9eb74e911..e98fb2d38 100644 --- a/ReportImp/HshCologne/CustomReportCreator.cs +++ b/ReportImp/HshCologne/CustomReportCreator.cs @@ -163,7 +163,8 @@ namespace HshCologne { foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) { - if (s.ServiceCategory.ToLower().Contains("familien") || s.ServiceCategory.ToLower().Contains("außerschulische") || s.ServiceCategory.ToLower() == "fam") + if (s.ServiceCategory.ToLower().Contains("familien") || s.ServiceCategory.ToLower().Contains("außerschulische") + || s.ServiceCategory.ToLower() == "fam" || s.ServiceCategory.ToLower().Contains("begleitet")) { spfhRo.Services.Add(s); } @@ -173,11 +174,11 @@ namespace HshCologne } else { - bewoRo.Services.Add(s); + spfhRo.Services.Add(s); // Auffangen von neuen Leistungskategorien } } } - report = AddReportToReport(report, new Quittierungsbeleg2(), bewoRo); + //report = AddReportToReport(report, new Quittierungsbeleg2(), bewoRo); report = AddReportToReport(report, new LeistungsnachweisFamilienhilfe(), spfhRo); report = AddReportToReport(report, new LeistungsnachweisSchulbegleitung(), sbdRo); diff --git a/ReportImp/HshCologne/ServiceInvoiceReportFLS.cs b/ReportImp/HshCologne/ServiceInvoiceReportFLS.cs index 92aae6445..658d23429 100644 --- a/ReportImp/HshCologne/ServiceInvoiceReportFLS.cs +++ b/ReportImp/HshCologne/ServiceInvoiceReportFLS.cs @@ -1,14 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report.ReportObjects; using BS.Shared; using BS.Shared.Extensions; using DevExpress.XtraReports.UI; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using static DevExpress.Utils.Drawing.Helpers.NativeMethods; namespace HshCologne { @@ -39,10 +40,10 @@ namespace HshCologne if (pRO.ServiceInvoicePeriods.All(sip => sip.ServiceInvoiceItems != null)) { - if (pRO.ServiceInvoicePeriods.Any(sip => sip.Notice == "Familienhilfe" || sip.Notice == "Schulbegleitung" || sip.Notice == "Fachleistungsstunden")) + if (pRO.ServiceInvoicePeriods.Any(sip => sip.Notice == "Familienhilfe" || sip.Notice == "Schulbegleitung" || sip.Notice == "Fachleistungsstunden" || sip.Notice.Trim() == "begleitete Umgänge")) { // Erste Tabelle enthält alle Einzeleinträge aus der Zeiterfassung - quasi 2. QB - pRO.ServiceInvoicePeriods = pRO.ServiceInvoicePeriods.Where(sip => sip.Notice == "Familienhilfe" || sip.Notice == "Schulbegleitung" || sip.Notice == "Fachleistungsstunden").ToList(); + pRO.ServiceInvoicePeriods = pRO.ServiceInvoicePeriods.Where(sip => sip.Notice == "Familienhilfe" || sip.Notice == "Schulbegleitung" || sip.Notice == "Fachleistungsstunden" || sip.Notice.Trim() == "begleitete Umgänge").ToList(); foreach (var sip in pRO.ServiceInvoicePeriods) { if (sip.ServiceInvoiceItems != null && sip.ServiceInvoiceItems.Count > 0)