flfeders/FEDEO
2
1
Fork 0
Code Issues 63 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Fixed RecreationDays Compensation

Browse Source
This commit is contained in:
florianfederspiel
2025-11-10 13:50:30 +01:00
parent c1dc88cdd9
commit 8a88c6878e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/time/evaluation.service.ts
View File

@@ -39,7 +39,7 @@ export async function generateTimesEvaluation(
.select("date") .select("date")
.in("state_code", [profile.state_code, "DE"]) .in("state_code", [profile.state_code, "DE"])
.gte("date", startDate.format("YYYY-MM-DD")) .gte("date", startDate.format("YYYY-MM-DD"))
.lte("date", endDate.format("YYYY-MM-DD")) .lte("date", endDate.add(1,"day").format("YYYY-MM-DD"))
if (holidaysError) throw new Error("Fehler beim Laden der Feiertage: " + holidaysError.message) if (holidaysError) throw new Error("Fehler beim Laden der Feiertage: " + holidaysError.message)
@@ -70,7 +70,7 @@ export async function generateTimesEvaluation(
let sumWorkingMinutesRecreationDays = 0 let sumWorkingMinutesRecreationDays = 0
let sumRecreationDays = 0 let sumRecreationDays = 0
if (profile.recreationDaysCompensation && holidays?.length) { if (profile.recreation_days_compensation && holidays?.length) {
holidays.forEach(({ date }) => { holidays.forEach(({ date }) => {
const weekday = server.dayjs(date).day() const weekday = server.dayjs(date).day()
const hours = profile.weekly_regular_working_hours?.[weekday] || 0 const hours = profile.weekly_regular_working_hours?.[weekday] || 0