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

fix(csv): added real paid hours for csv download

Browse Source
This commit is contained in:
Matthieu Haineault 2026-01-07 09:02:06 -05:00
parent e10a7da1e4
commit 6cbf37ed86
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/time-and-attendance/exports/csv-exports.utils.ts
View File

@ -36,6 +36,7 @@ export const applyHolidayRequalifications = async (
result.push(row); result.push(row);
continue; continue;
} }
const calculated = await holiday_service.calculateHolidayPay(row.email, new Date(row.holiday_date), 1); const calculated = await holiday_service.calculateHolidayPay(row.email, new Date(row.holiday_date), 1);
if (!calculated.success) { if (!calculated.success) {
result.push({ ...row, quantity_hours: 0 }); result.push({ ...row, quantity_hours: 0 });
@ -45,7 +46,6 @@ export const applyHolidayRequalifications = async (
result.push({ ...row, quantity_hours: calculated.data }); result.push({ ...row, quantity_hours: calculated.data });
} }
return result; return result;
} }
export const applyOvertimeRequalifications = async ( export const applyOvertimeRequalifications = async (

13
src/time-and-attendance/exports/services/csv-exports.service.ts
View File

@ -183,7 +183,7 @@ export class CsvExportService {
company_code: employee.company_code, company_code: employee.company_code,
external_payroll_id: employee.external_payroll_id, external_payroll_id: employee.external_payroll_id,
timesheet_id: shift.timesheet.id, timesheet_id: shift.timesheet.id,
email: '', email: shift.timesheet.employee.user.email,
shift_date: shift.date, shift_date: shift.date,
full_name: `${employee.user.first_name} ${employee.user.last_name}`, full_name: `${employee.user.first_name} ${employee.user.last_name}`,
bank_code: shift.bank_code?.bank_code ?? '', 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 //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 //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; return requalified_rows;
} }