MH: ReportCreator von RatPlusTat gefixt
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,6 @@
|
||||
</Compile>
|
||||
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
|
||||
<Compile Include="CustomMitarbeiterstundenkontoBerechnungMonate.cs" />
|
||||
<Compile Include="CustomReportCreator.cs" />
|
||||
<Compile Include="Finanzauswertung.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
|
||||
@@ -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<ServicesOverviewRO> 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<ServiceCategory>(serviceCategoryOid.Value) : null;
|
||||
|
||||
XtraReport report = null;
|
||||
|
||||
ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro);
|
||||
@@ -115,14 +121,21 @@ namespace RatPlusTat
|
||||
}
|
||||
}
|
||||
}
|
||||
report = AddReportToReport<Quittierungsbeleg>(report, bewoRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, betreuungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, selbstRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, umwandlungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, verhinderungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, assistenzRo);
|
||||
//report = AddReportToReport<Quittierungsbeleg>(report, bewoRo);
|
||||
//report.Pages.AddRange(AddReportToReport<QuittierungsbelegPflegekasse>(report, betreuungRo).Pages);
|
||||
//report.Pages.AddRange(AddReportToReport<QuittierungsbelegPflegekasse>(report, selbstRo).Pages);
|
||||
//report.Pages.AddRange(AddReportToReport<QuittierungsbelegPflegekasse>(report, umwandlungRo).Pages);
|
||||
//report.Pages.AddRange(AddReportToReport<QuittierungsbelegPflegekasse>(report, verhinderungRo).Pages);
|
||||
//report.Pages.AddRange(AddReportToReport<QuittierungsbelegPflegekasse>(report, assistenzRo).Pages);
|
||||
|
||||
report = AddReportToReport<Quittierungsbeleg>(report, bewoRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, betreuungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, selbstRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, umwandlungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, verhinderungRo);
|
||||
report = AddReportToReport<QuittierungsbelegPflegekasse>(report, assistenzRo);
|
||||
|
||||
if (report == null)
|
||||
if (report == null)
|
||||
report = new XtraReport();
|
||||
return report;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user