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

fix(timesheet): add some quality of life to get required info, employee name, change pay period response from week 1 and 2 to array of weeks

Browse Source
This commit is contained in:
Nicolas Drolet 2025-10-06 16:06:26 -04:00
parent 1c797c348a
commit fa845cf6e6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/timesheets/dtos/timesheet-period.dto.ts
View File

@ -59,7 +59,6 @@ export class WeekDto {
} }
export class TimesheetPeriodDto { export class TimesheetPeriodDto {
week1: WeekDto; weeks: WeekDto[];
week2: WeekDto;
employee_full_name: string; employee_full_name: string;
} }

8
src/modules/timesheets/utils/timesheet.helpers.ts
View File

@ -127,7 +127,7 @@ export function makeEmptyWeek(week_start: Date): WeekDto {
} }
export function makeEmptyPeriod(): TimesheetPeriodDto { export function makeEmptyPeriod(): TimesheetPeriodDto {
return { week1: makeEmptyWeek(new Date()), week2: makeEmptyWeek(new Date()), employee_full_name: " " }; return { weeks: [ makeEmptyWeek(new Date()), makeEmptyWeek(new Date())], employee_full_name: " " };
} }
export function buildWeek( export function buildWeek(
@ -310,8 +310,10 @@ export function buildPeriod(
const week2_end = endOfDayUTC(period_end); const week2_end = endOfDayUTC(period_end);
return { return {
week1: buildWeek(week1_start, week1_end, shifts, expenses), weeks: [
week2: buildWeek(week2_start, week2_end, shifts, expenses), buildWeek(week1_start, week1_end, shifts, expenses),
buildWeek(week2_start, week2_end, shifts, expenses),
],
employee_full_name, employee_full_name,
}; };
} }