diff --git a/ReportImp/LebenshilfeStade/CustomReportCreator.cs b/ReportImp/LebenshilfeStade/CustomReportCreator.cs index 7218030e2..9b6329799 100644 --- a/ReportImp/LebenshilfeStade/CustomReportCreator.cs +++ b/ReportImp/LebenshilfeStade/CustomReportCreator.cs @@ -111,25 +111,40 @@ namespace LebenshilfeStade reportId = organisation.Name; } - var rootReport = CreateServicesOverviewReportForRo(roList[0], serviceCategoryOid); - if (rootReport.Pages.Count == 0) + if (reportId != null && reportId.ToLower().Contains("neue fls ab 01/2024")) { - rootReport.CreateDocument(); - } + var rootReport = CreateServicesOverviewReportForRo(roList[0], serviceCategoryOid); + if (rootReport.Pages.Count == 0) + rootReport.CreateDocument(); - - for (int i = 1; i < roList.Count; i++) - { - var lNext = CreateServicesOverviewReportForRo(roList[i], serviceCategoryOid); - if (lNext.Pages.Count == 0) + for (int i = 1; i < roList.Count; i++) { - lNext.CreateDocument(); + var lNext = CreateServicesOverviewReportForRo(roList[i], serviceCategoryOid); + if (lNext.Pages.Count == 0) + lNext.CreateDocument(); + rootReport.Pages.AddRange(lNext.Pages); } - rootReport.Pages.AddRange(lNext.Pages); + return rootReport; } + else + { + IBeWoReport lServiceOverviewAllCustomersReport = new Stundenzettel(); - return rootReport; + lServiceOverviewAllCustomersReport.SetReportDataSource(roList[0]); + (lServiceOverviewAllCustomersReport as XtraReport).CreateDocument(); + var Report = lServiceOverviewAllCustomersReport as XtraReport; + + for (int i = 1; i < roList.Count; i++) + { + IBeWoReport lNext = new Stundenzettel(); + lNext.SetReportDataSource(roList[i]); + (lNext as XtraReport).CreateDocument(); + Report.Pages.AddRange((lNext as XtraReport).Pages); + } + + return lServiceOverviewAllCustomersReport as XtraReport; + } } return new XtraReport(); } diff --git a/ReportImp/LebenshilfeStade/Properties/licenses.licx b/ReportImp/LebenshilfeStade/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/LebenshilfeStade/Properties/licenses.licx +++ b/ReportImp/LebenshilfeStade/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a