diff --git a/ReportImp/RatPlusTat/CustomReportCreator.cs b/ReportImp/RatPlusTat/CustomReportCreator.cs
deleted file mode 100644
index 364c82efb..000000000
--- a/ReportImp/RatPlusTat/CustomReportCreator.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
-using BeWo.Report;
-using BeWo.Report.ReportObjects;
-using DevExpress.XtraReports.Design;
-using DevExpress.XtraReports.UI;
-
-namespace RatPlusTat
-{
- public class CustomReportCreator : DefaultReportCreator
- {
- public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
- {
- return base.CreateSettlementReport(dcId, invoiceBaseOid, true);
- }
-
- }
-}
diff --git a/ReportImp/RatPlusTat/RatPlusTat.csproj b/ReportImp/RatPlusTat/RatPlusTat.csproj
index f32d13a5a..30f0e97bc 100644
--- a/ReportImp/RatPlusTat/RatPlusTat.csproj
+++ b/ReportImp/RatPlusTat/RatPlusTat.csproj
@@ -56,7 +56,6 @@
-
Component
diff --git a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs
index 641234e1c..c00c4bf9c 100644
--- a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs
+++ b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs
@@ -12,12 +12,16 @@ namespace RatPlusTat
{
public class RatPlusTatReportCreator : DefaultReportCreator
{
+ public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid)
+ {
+ return base.CreateSettlementReport(dcId, invoiceBaseOid, true);
+ }
//die meisten Klienten sind beim LVR und weiteren Kostenträgern - dort werden verschiedene QBelege pro Leistungskategorie benötigt
// -> es werden für jeden Kunden alle möglichen QBelege erstellt und hintereinandergefügt
- public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+ public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
{
List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
-
+
if (lROs.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid);
@@ -52,6 +56,8 @@ namespace RatPlusTat
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
+ ServiceCategory sc = serviceCategoryOid != null ? DAOFactory.GenericDAO.GetByID(serviceCategoryOid.Value) : null;
+
XtraReport report = null;
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
@@ -115,14 +121,21 @@ namespace RatPlusTat
}
}
}
- report = AddReportToReport(report, bewoRo);
- report = AddReportToReport(report, betreuungRo);
- report = AddReportToReport(report, selbstRo);
- report = AddReportToReport(report, umwandlungRo);
- report = AddReportToReport(report, verhinderungRo);
- report = AddReportToReport(report, assistenzRo);
+ //report = AddReportToReport(report, bewoRo);
+ //report.Pages.AddRange(AddReportToReport(report, betreuungRo).Pages);
+ //report.Pages.AddRange(AddReportToReport(report, selbstRo).Pages);
+ //report.Pages.AddRange(AddReportToReport(report, umwandlungRo).Pages);
+ //report.Pages.AddRange(AddReportToReport(report, verhinderungRo).Pages);
+ //report.Pages.AddRange(AddReportToReport(report, assistenzRo).Pages);
+
+ report = AddReportToReport(report, bewoRo);
+ report = AddReportToReport(report, betreuungRo);
+ report = AddReportToReport(report, selbstRo);
+ report = AddReportToReport(report, umwandlungRo);
+ report = AddReportToReport(report, verhinderungRo);
+ report = AddReportToReport(report, assistenzRo);
- if (report == null)
+ if (report == null)
report = new XtraReport();
return report;
}