Umstellung der Stundenberechnung auf Sollarbeitszeit.
This commit is contained in:
@@ -171,17 +171,17 @@ function getCurrentOvertimeForUser(userId, db, callback) {
|
||||
}
|
||||
}
|
||||
|
||||
// Variante B: Soll immer vertraglich, Verbleibend ohne Abzug „genommen“
|
||||
const sollStunden = (wochenstunden / arbeitstage) * workdays;
|
||||
const weekTotalHoursWithVacation = weekTotalHours + weekVacationHours + holidayHours;
|
||||
const adjustedSollStunden = sollStunden - fullDayOvertimeDays * fullDayHours;
|
||||
const weekOvertimeHours = weekTotalHoursWithVacation - adjustedSollStunden;
|
||||
const weekOvertimeHours = weekTotalHoursWithVacation - sollStunden;
|
||||
|
||||
totalOvertimeHours += weekOvertimeHours;
|
||||
totalOvertimeTaken += weekOvertimeTaken;
|
||||
processedWeeks++;
|
||||
|
||||
if (processedWeeks === weeks.length && !hasError) {
|
||||
done(totalOvertimeHours - totalOvertimeTaken + overtimeOffsetHours);
|
||||
done(totalOvertimeHours + overtimeOffsetHours);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user