From 6cbf37ed86a0db5a280ae1a0daeabde3b444f09a Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Wed, 7 Jan 2026 09:02:06 -0500 Subject: [PATCH] fix(csv): added real paid hours for csv download --- .../exports/csv-exports.utils.ts | 2 +- .../exports/services/csv-exports.service.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/time-and-attendance/exports/csv-exports.utils.ts b/src/time-and-attendance/exports/csv-exports.utils.ts index 6faab94..32a9399 100644 --- a/src/time-and-attendance/exports/csv-exports.utils.ts +++ b/src/time-and-attendance/exports/csv-exports.utils.ts @@ -36,6 +36,7 @@ export const applyHolidayRequalifications = async ( result.push(row); continue; } + const calculated = await holiday_service.calculateHolidayPay(row.email, new Date(row.holiday_date), 1); if (!calculated.success) { result.push({ ...row, quantity_hours: 0 }); @@ -45,7 +46,6 @@ export const applyHolidayRequalifications = async ( result.push({ ...row, quantity_hours: calculated.data }); } return result; - } export const applyOvertimeRequalifications = async ( diff --git a/src/time-and-attendance/exports/services/csv-exports.service.ts b/src/time-and-attendance/exports/services/csv-exports.service.ts index de7165e..85cd6af 100644 --- a/src/time-and-attendance/exports/services/csv-exports.service.ts +++ b/src/time-and-attendance/exports/services/csv-exports.service.ts @@ -183,7 +183,7 @@ export class CsvExportService { company_code: employee.company_code, external_payroll_id: employee.external_payroll_id, timesheet_id: shift.timesheet.id, - email: '', + email: shift.timesheet.employee.user.email, shift_date: shift.date, full_name: `${employee.user.first_name} ${employee.user.last_name}`, bank_code: shift.bank_code?.bank_code ?? '', @@ -230,14 +230,15 @@ export class CsvExportService { }); - //groups hours by bank_code - const consolidated_rows = await consolidateRowHoursAndAmountByType(rows); - //requalifies the real amount paid for holidays - const holiday_rows = await applyHolidayRequalifications(consolidated_rows, this.holiday_service); + const holiday_rows = await applyHolidayRequalifications(rows, this.holiday_service); + + //groups hours by bank_code + const consolidated_rows = await consolidateRowHoursAndAmountByType(holiday_rows); + //requalifies regular hours into overtime when needed - const requalified_rows = await applyOvertimeRequalifications(holiday_rows, this.overtime_service); + const requalified_rows = await applyOvertimeRequalifications(consolidated_rows, this.overtime_service); return requalified_rows; }