MH: Mittelpunkt Teamauslastung
This commit is contained in:
@@ -401,25 +401,26 @@ namespace Mittelpunkt
|
|||||||
}
|
}
|
||||||
return new XtraReport();
|
return new XtraReport();
|
||||||
}
|
}
|
||||||
//public override XtraReport CreateAuslastungReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate)
|
|
||||||
//{
|
|
||||||
// IBeWoReport<MitarbeiterauslastungRO> report;
|
|
||||||
// if (teamOids != null && teamOids.Count > 0)
|
|
||||||
// report = FindReportImp<MitarbeiterauslastungRO>("Teamauslastung");
|
|
||||||
// else
|
|
||||||
// report = FindReportImp<MitarbeiterauslastungRO>("Mitarbeiterauslastung");
|
|
||||||
|
|
||||||
// IList<long> employeeOids = new List<long>();
|
public override XtraReport CreateAuslastungReport(long? employeeOid, IList<long> teamOids, DateTime startDate, DateTime endDate)
|
||||||
|
{
|
||||||
|
IBeWoReport<MitarbeiterauslastungRO> report;
|
||||||
|
if (teamOids != null && teamOids.Count > 0)
|
||||||
|
report = FindReportImp<MitarbeiterauslastungRO>("Teamauslastung");
|
||||||
|
else
|
||||||
|
report = FindReportImp<MitarbeiterauslastungRO>("Mitarbeiterauslastung");
|
||||||
|
|
||||||
// if (employeeOid.HasValue)
|
IList<long> employeeOids = new List<long>();
|
||||||
// {
|
|
||||||
// employeeOids.Add(employeeOid.Value);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false);
|
if (employeeOid.HasValue)
|
||||||
// report.SetReportDataSource(x);
|
{
|
||||||
|
employeeOids.Add(employeeOid.Value);
|
||||||
|
}
|
||||||
|
|
||||||
// return report as XtraReport;
|
var x = MitarbeiterauslastungRO.Create(employeeOids, teamOids, startDate, endDate, false);
|
||||||
//}
|
report.SetReportDataSource(x);
|
||||||
|
|
||||||
|
return report as XtraReport;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,6 +111,12 @@
|
|||||||
<DependentUpon>Lohnliste.cs</DependentUpon>
|
<DependentUpon>Lohnliste.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Service\CustomEmployeeService.cs" />
|
<Compile Include="Service\CustomEmployeeService.cs" />
|
||||||
|
<Compile Include="Teamauslastung.cs">
|
||||||
|
<SubType>Component</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="Teamauslastung.designer.cs">
|
||||||
|
<DependentUpon>Teamauslastung.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="ZuschlaegeArbeit.cs">
|
<Compile Include="ZuschlaegeArbeit.cs">
|
||||||
<SubType>Component</SubType>
|
<SubType>Component</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -229,6 +235,9 @@
|
|||||||
<EmbeddedResource Include="Lohnliste.resx">
|
<EmbeddedResource Include="Lohnliste.resx">
|
||||||
<DependentUpon>Lohnliste.cs</DependentUpon>
|
<DependentUpon>Lohnliste.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Teamauslastung.resx">
|
||||||
|
<DependentUpon>Teamauslastung.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="ZuschlaegeArbeit.resx">
|
<EmbeddedResource Include="ZuschlaegeArbeit.resx">
|
||||||
<DependentUpon>ZuschlaegeArbeit.cs</DependentUpon>
|
<DependentUpon>ZuschlaegeArbeit.cs</DependentUpon>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
|
|||||||
Reference in New Issue
Block a user