FeidPartnerReports/Calculation/CustomCalculations.cs - Vorbereitung für Minuteneinheiten LWV
This commit is contained in:
@@ -91,6 +91,8 @@ namespace FeidPartnerReports.Calculation
|
||||
foreach (var scap in relDC.ApprovalPeriodList)
|
||||
{
|
||||
var approvedPerMonth = GetApprovedHoursPerMonth(scap);
|
||||
// Anpassung auf Minuten noch nötig!!!
|
||||
// var approvedPerMonth = GetApprovedHoursPerMonth(scap, relDC);
|
||||
var approved = GetApprovedHoursForPeriod(scap.StartDate.Value, scap.EndDate.Value, approvedPerMonth);
|
||||
|
||||
total += approved;
|
||||
@@ -125,11 +127,7 @@ namespace FeidPartnerReports.Calculation
|
||||
foreach (var scap in c2s.ApprovalPeriodList)
|
||||
{
|
||||
total += GetApprovedHoursPerMonth(scap);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
return total;
|
||||
}
|
||||
|
||||
@@ -159,8 +157,5 @@ namespace FeidPartnerReports.Calculation
|
||||
|
||||
return flsProWoche * 4.34m;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,12 +70,14 @@
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v23.2.Wizard, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
|
||||
Reference in New Issue
Block a user