diff --git a/ReportImp/SPZLeverkusen/CustomReportCreator.cs b/ReportImp/SPZLeverkusen/CustomReportCreator.cs index 178ecfc1e..7e0b42a06 100644 --- a/ReportImp/SPZLeverkusen/CustomReportCreator.cs +++ b/ReportImp/SPZLeverkusen/CustomReportCreator.cs @@ -10,40 +10,40 @@ using DevExpress.XtraReports.UI; namespace SPZLeverkusen { - public class CustomReportCreator : DefaultReportCreator - { - public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) - { - List lROs = ServicesOverviewRO.CreateAlt(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid, false); + public class CustomReportCreator : DefaultReportCreator + { + public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + List lROs = ServicesOverviewRO.CreateAlt(month, year, orgaOid, empOid, startDay, endDay); - if (lROs.Count > 0) - { + if (lROs.Count > 0) + { - var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); - rootReport.CreateDocument(); + var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); + rootReport.CreateDocument(); - for (int i = 1; i < lROs.Count; i++) - { - var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); - //lNext.CreateDocument(); - rootReport.Pages.AddRange(lNext.Pages); - } + for (int i = 1; i < lROs.Count; i++) + { + var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); + //lNext.CreateDocument(); + rootReport.Pages.AddRange(lNext.Pages); + } - return rootReport; - } - return new XtraReport(); - } + return rootReport; + } + return new XtraReport(); + } - public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) - { - var ro = ServicesOverviewRO.CreateAlt(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); + public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + var ro = ServicesOverviewRO.CreateAlt(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); - return CreateServicesOverviewReportForRo(ro, serviceCategoryOid); + return CreateServicesOverviewReportForRo(ro, serviceCategoryOid); - } + } - private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) - { + private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) + { XtraReport report = null; ServicesOverviewRO jugendamtRO = ServicesOverviewRO.CopyFromRO(ro); @@ -59,35 +59,26 @@ namespace SPZLeverkusen if (ro.Services != null) { - if (ro.Services.Count > 0) + foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) { - foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) + if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Jugendamt")) { - if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Jugendamt")) - { - jugendamtRO.Services.Add(s); - jugendamtRO.TotalFLMBillable += s.Minutes; - jugendamtRO.TotalFLS += s.Minutes / 60; - } - else if (!s.ServiceDescription.ToLower().Contains("fehlkontakt")) - { - ohneFehlkontaktenRO.Services.Add(s); - ohneFehlkontaktenRO.TotalFLMBillable += s.Minutes; - ohneFehlkontaktenRO.TotalFLS += s.Minutes / 60; - } - else if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) - { - mitFehlkontaktenRO.Services.Add(s); - mitFehlkontaktenRO.TotalFLMBillable += s.Minutes; - mitFehlkontaktenRO.TotalFLS += s.Minutes / 60; - } + jugendamtRO.Services.Add(s); + jugendamtRO.TotalFLMBillable += s.Minutes; + jugendamtRO.TotalFLS += s.Minutes / 60; + } + else if (!s.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + ohneFehlkontaktenRO.Services.Add(s); + ohneFehlkontaktenRO.TotalFLMBillable += s.Minutes; + ohneFehlkontaktenRO.TotalFLS += s.Minutes / 60; + } + else if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + mitFehlkontaktenRO.Services.Add(s); + mitFehlkontaktenRO.TotalFLMBillable += s.Minutes; + mitFehlkontaktenRO.TotalFLS += s.Minutes / 60; } - } - else - { - ohneFehlkontaktenRO.Services.Add(new ServicesOverviewRO.ServiceDetail()); - ohneFehlkontaktenRO.TotalFLMBillable += 0; - ohneFehlkontaktenRO.TotalFLS += 0; } } @@ -95,10 +86,10 @@ namespace SPZLeverkusen { if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Jugendamt")) { - report = AddReportToReport(report, jugendamtRO); + report = AddReportToReport(report, jugendamtRO); } else - { + { if (ro.StartDate < new DateTime(2019, 1, 1)) { report = AddReportToReport(report, ohneFehlkontaktenRO); @@ -117,7 +108,7 @@ namespace SPZLeverkusen if (report == null) report = new XtraReport(); return report; - } + } private XtraReport AddReportToReport(XtraReport report, ServicesOverviewRO ro) where T : XtraReport, IBeWoReport, new() {