merge
This commit is contained in:
parent
6d1ac6c634
commit
fc323a393b
|
|
@ -17,16 +17,16 @@ export class Timesheet {
|
||||||
@IsInt() timesheet_id: number;
|
@IsInt() timesheet_id: number;
|
||||||
@IsBoolean() is_approved: boolean;
|
@IsBoolean() is_approved: boolean;
|
||||||
@Type(() => TimesheetDay) days: TimesheetDay[];
|
@Type(() => TimesheetDay) days: TimesheetDay[];
|
||||||
@Type(() => TotalHours) weekly_hours: TotalHours[];
|
@Type(() => TotalHours) weekly_hours: TotalHours;
|
||||||
@Type(() => TotalExpenses) weekly_expenses: TotalExpenses[];
|
@Type(() => TotalExpenses) weekly_expenses: TotalExpenses;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TimesheetDay {
|
export class TimesheetDay {
|
||||||
@IsString() date: string;
|
@IsString() date: string;
|
||||||
@Type(() => Shift) shifts: Shift[];
|
@Type(() => Shift) shifts: Shift[];
|
||||||
@Type(() => Expense) expenses: Expense[];
|
@Type(() => Expense) expenses: Expense[];
|
||||||
@Type(() => TotalHours) daily_hours: TotalHours[];
|
@Type(() => TotalHours) daily_hours: TotalHours;
|
||||||
@Type(() => TotalExpenses) daily_expenses: TotalExpenses[];
|
@Type(() => TotalExpenses) daily_expenses: TotalExpenses;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TotalHours {
|
export class TotalHours {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user