diff --git a/src/modules/timesheets/dtos/timesheet-period.dto.ts b/src/modules/timesheets/dtos/timesheet-period.dto.ts index 6da4551..a084bad 100644 --- a/src/modules/timesheets/dtos/timesheet-period.dto.ts +++ b/src/modules/timesheets/dtos/timesheet-period.dto.ts @@ -59,7 +59,6 @@ export class WeekDto { } export class TimesheetPeriodDto { - week1: WeekDto; - week2: WeekDto; + weeks: WeekDto[]; employee_full_name: string; } diff --git a/src/modules/timesheets/utils/timesheet.helpers.ts b/src/modules/timesheets/utils/timesheet.helpers.ts index 05cfc38..7718f4c 100644 --- a/src/modules/timesheets/utils/timesheet.helpers.ts +++ b/src/modules/timesheets/utils/timesheet.helpers.ts @@ -127,7 +127,7 @@ export function makeEmptyWeek(week_start: Date): WeekDto { } 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( @@ -310,8 +310,10 @@ export function buildPeriod( const week2_end = endOfDayUTC(period_end); return { - week1: buildWeek(week1_start, week1_end, shifts, expenses), - week2: buildWeek(week2_start, week2_end, shifts, expenses), + weeks: [ + buildWeek(week1_start, week1_end, shifts, expenses), + buildWeek(week2_start, week2_end, shifts, expenses), + ], employee_full_name, }; }