Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master
This commit is contained in:
@@ -51,6 +51,46 @@ namespace BeWo.BetreutesWohnenWoellReports
|
||||
|
||||
}
|
||||
|
||||
public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
|
||||
{
|
||||
var roList = new List<ServicesOverviewRO>();
|
||||
|
||||
foreach (var coid in customerOids)
|
||||
{
|
||||
var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid);
|
||||
|
||||
if (ro != null)
|
||||
{
|
||||
roList.Add(ro);
|
||||
}
|
||||
}
|
||||
|
||||
var sortedList = roList.OrderBy(r => r.CustomerLastName + ", " + r.CustomerFirstName).ToList();
|
||||
|
||||
if (sortedList.Count > 0)
|
||||
{
|
||||
var rootReport = CreateServicesOverviewReportForRo(sortedList[0], serviceCategoryOid);
|
||||
if (rootReport.Pages.Count == 0)
|
||||
{
|
||||
rootReport.CreateDocument();
|
||||
}
|
||||
|
||||
for (int i = 1; i < sortedList.Count; i++)
|
||||
{
|
||||
var lNext = CreateServicesOverviewReportForRo(sortedList[i], serviceCategoryOid);
|
||||
if (lNext.Pages.Count == 0)
|
||||
{
|
||||
lNext.CreateDocument();
|
||||
}
|
||||
|
||||
rootReport.Pages.AddRange(lNext.Pages);
|
||||
}
|
||||
|
||||
return rootReport;
|
||||
}
|
||||
return new XtraReport();
|
||||
}
|
||||
|
||||
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
|
||||
{
|
||||
XtraReport report = null;
|
||||
@@ -79,8 +119,7 @@ namespace BeWo.BetreutesWohnenWoellReports
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
report = AddReportToReport<QuittierungsbelegFLS>(report, flsRo);
|
||||
report = AddReportToReport<QuittierungsbelegASL>(report, aslRo);
|
||||
|
||||
Reference in New Issue
Block a user