diff --git a/services/overtime-service.js b/services/overtime-service.js index d01809a..8e5a9eb 100644 --- a/services/overtime-service.js +++ b/services/overtime-service.js @@ -123,14 +123,6 @@ function getCurrentOvertimeForUser(userId, db, callback) { } } - if (filledWorkdays < workdays) { - processedWeeks++; - if (processedWeeks === weeks.length && !hasError) { - done(totalOvertimeHours - totalOvertimeTaken + overtimeOffsetHours); - } - return; - } - const fullDayHours = wochenstunden > 0 && arbeitstage > 0 ? wochenstunden / arbeitstage : 8; let weekTotalHours = 0; let weekOvertimeTaken = 0; @@ -172,7 +164,8 @@ function getCurrentOvertimeForUser(userId, db, callback) { } // Variante B: Soll immer vertraglich, Verbleibend ohne Abzug „genommen“ - const sollStunden = (wochenstunden / arbeitstage) * workdays; + //const sollStunden = (wochenstunden / arbeitstage) * workdays; + const sollStunden = wochenstunden; const weekTotalHoursWithVacation = weekTotalHours + weekVacationHours + holidayHours; const weekOvertimeHours = weekTotalHoursWithVacation - sollStunden;