From adfb096977f6a0fb45904048864188b9cf3abc08 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 13 May 2025 12:04:56 +0200 Subject: [PATCH] =?UTF-8?q?FeidPartnerReports/Calculation/CustomCalculatio?= =?UTF-8?q?ns.cs=20-=20Vorbereitung=20f=C3=BCr=20Minuteneinheiten=20=20LWV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Calculation/CustomCalculations.cs | 11 +++-------- .../FeidPartnerReports/FeidPartnerReports.csproj | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs b/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs index 264f4a893..7a9034bf8 100644 --- a/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs +++ b/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs @@ -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; } - - - } - + } } diff --git a/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj b/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj index ce2668451..ab2841e98 100644 --- a/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj +++ b/ReportImp/FeidPartnerReports/FeidPartnerReports.csproj @@ -70,12 +70,14 @@ false + +