louis/targo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(timesheet): remove lines that were interfering with weekly overtime calculations.

Browse Source
This commit is contained in:
Nic D 2026-01-15 09:37:52 -05:00
parent 9079cfceed
commit 7d492a2817
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/time-and-attendance/timesheets/timesheet.mapper.ts
View File

@ -92,6 +92,7 @@ export const mapOneTimesheet = async (timesheet: Prisma.TimesheetsGetPayload<{
daily_hours[subgroup] += hours; daily_hours[subgroup] += hours;
weekly_hours[subgroup] += hours; weekly_hours[subgroup] += hours;
} }
console.log('date: ', shift.date, ', hours worked: ', hours, ', type: ', subgroup, ', current weekly overtime: ', weekly_hours['overtime']);
} }
@ -126,9 +127,6 @@ export const mapOneTimesheet = async (timesheet: Prisma.TimesheetsGetPayload<{
}; };
}); });
weekly_hours['overtime'] = Math.max(weekly_hours['regular'] - 40, 0);
weekly_hours['regular'] = Math.min(weekly_hours['regular'], 40);
return { return {
timesheet_id: timesheet.id, timesheet_id: timesheet.id,
is_approved: timesheet.is_approved ?? false, is_approved: timesheet.is_approved ?? false,