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

Merge branch 'main' of git.targo.ca:Targo/targo_backend

Browse Source
This commit is contained in:
Matthieu Haineault 2026-01-09 08:00:14 -05:00
commit c03ea4cb6f
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/time-and-attendance/pay-period/dtos/overview-pay-period.dto.ts
View File

@ -27,6 +27,7 @@ export class EmployeePeriodOverviewDto {
holiday_hours: number; holiday_hours: number;
vacation_hours: number; vacation_hours: number;
}; };
weekly_hours: number[];
total_hours: number; total_hours: number;
expenses: number; expenses: number;
mileage: number; mileage: number;

12
src/time-and-attendance/pay-period/services/pay-periods-build-overview.service.ts
View File

@ -116,6 +116,8 @@ export class GetOverviewService {
); );
for (const timesheet of employee.timesheet) { for (const timesheet of employee.timesheet) {
let total_weekly_hours: number = 0;
//totals by types for shifts //totals by types for shifts
for (const shift of timesheet.shift) { for (const shift of timesheet.shift) {
const hours = computeHours(shift.start_time, shift.end_time); const hours = computeHours(shift.start_time, shift.end_time);
@ -123,24 +125,27 @@ export class GetOverviewService {
switch (type) { switch (type) {
case "EVENING": record.other_hours.evening_hours += hours; case "EVENING": record.other_hours.evening_hours += hours;
record.total_hours += hours; record.total_hours += hours;
total_weekly_hours += hours;
break; break;
case "EMERGENCY": record.other_hours.emergency_hours += hours; case "EMERGENCY": record.other_hours.emergency_hours += hours;
record.total_hours += hours; record.total_hours += hours;
total_weekly_hours += hours;
break; break;
case "OVERTIME": record.other_hours.overtime_hours += hours; case "OVERTIME": record.other_hours.overtime_hours += hours;
record.total_hours += hours; record.total_hours += hours;
total_weekly_hours += hours;
break; break;
case "SICK": record.other_hours.sick_hours += hours; case "SICK": record.other_hours.sick_hours += hours;
record.total_hours += hours;
break; break;
case "HOLIDAY": record.other_hours.holiday_hours += hours; case "HOLIDAY": record.other_hours.holiday_hours += hours;
record.total_hours += hours; record.total_hours += hours;
total_weekly_hours += hours;
break; break;
case "VACATION": record.other_hours.vacation_hours += hours; case "VACATION": record.other_hours.vacation_hours += hours;
record.total_hours += hours;
break; break;
case "REGULAR": record.regular_hours += hours; case "REGULAR": record.regular_hours += hours;
record.total_hours += hours; record.total_hours += hours;
total_weekly_hours += hours;
break; break;
} }
} }
@ -155,6 +160,8 @@ export class GetOverviewService {
record.mileage = Number((record.mileage += Math.round(mileage)).toFixed(2)); record.mileage = Number((record.mileage += Math.round(mileage)).toFixed(2));
} }
} }
record.weekly_hours.push(total_weekly_hours);
} }
} }
@ -214,6 +221,7 @@ export class GetOverviewService {
holiday_hours: 0, holiday_hours: 0,
vacation_hours: 0, vacation_hours: 0,
}, },
weekly_hours: [],
total_hours: 0, total_hours: 0,
expenses: 0, expenses: 0,
mileage: 0, mileage: 0,

2
src/time-and-attendance/timesheets/services/timesheet-get-overview.service.ts
View File

@ -64,7 +64,7 @@ export class GetTimesheetsOverviewService {
const has_existing_timesheets = rows.some( const has_existing_timesheets = rows.some(
(row) => toDateFromString(row.start_date).getTime() === week_start.getTime() (row) => toDateFromString(row.start_date).getTime() === week_start.getTime()
); );
if (!has_existing_timesheets) this.ensureTimesheet(employee_id.data, week_start); if (!has_existing_timesheets) await this.ensureTimesheet(employee_id.data, week_start);
} }
rows = await this.loadTimesheets(employee_id.data, period.period_start, period.period_end); rows = await this.loadTimesheets(employee_id.data, period.period_start, period.period_end);