diff --git a/ReportImp/Mittelpunkt/CustomReportCreator.cs b/ReportImp/Mittelpunkt/CustomReportCreator.cs index 035309b5d..cc5f94653 100644 --- a/ReportImp/Mittelpunkt/CustomReportCreator.cs +++ b/ReportImp/Mittelpunkt/CustomReportCreator.cs @@ -401,25 +401,26 @@ namespace Mittelpunkt } return new XtraReport(); } - //public override XtraReport CreateAuslastungReport(long? employeeOid, IList teamOids, DateTime startDate, DateTime endDate) - //{ - // IBeWoReport report; - // if (teamOids != null && teamOids.Count > 0) - // report = FindReportImp("Teamauslastung"); - // else - // report = FindReportImp("Mitarbeiterauslastung"); - // IList employeeOids = new List(); + public override XtraReport CreateAuslastungReport(long? employeeOid, IList teamOids, DateTime startDate, DateTime endDate) + { + IBeWoReport report; + if (teamOids != null && teamOids.Count > 0) + report = FindReportImp("Teamauslastung"); + else + report = FindReportImp("Mitarbeiterauslastung"); - // if (employeeOid.HasValue) - // { - // employeeOids.Add(employeeOid.Value); - // } + IList employeeOids = new List(); - // var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false); - // report.SetReportDataSource(x); + if (employeeOid.HasValue) + { + employeeOids.Add(employeeOid.Value); + } - // return report as XtraReport; - //} + var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false); + report.SetReportDataSource(x); + + return report as XtraReport; + } } } diff --git a/ReportImp/Mittelpunkt/Mittelpunkt.csproj b/ReportImp/Mittelpunkt/Mittelpunkt.csproj index bed25ddb7..35bd1fe98 100644 --- a/ReportImp/Mittelpunkt/Mittelpunkt.csproj +++ b/ReportImp/Mittelpunkt/Mittelpunkt.csproj @@ -111,6 +111,12 @@ Lohnliste.cs + + Component + + + Teamauslastung.cs + Component @@ -229,6 +235,9 @@ Lohnliste.cs + + Teamauslastung.cs + ZuschlaegeArbeit.cs Designer