fix(approvals): add total hours worked to employee timesheet cards
This commit is contained in:
parent
b7806f955b
commit
f5ec3025ef
|
|
@ -159,6 +159,8 @@
|
||||||
class="q-pa-sm text-weight-bold"
|
class="q-pa-sm text-weight-bold"
|
||||||
:class="props.initialState ? 'text-white bg-primary' : 'text-primary bg-white'"
|
:class="props.initialState ? 'text-white bg-primary' : 'text-primary bg-white'"
|
||||||
>
|
>
|
||||||
|
<q-item-label class="text-uppercase text-h6 q-ml-sm text-weight-bolder"> {{ props.row.total_hours + 'h' }} </q-item-label>
|
||||||
|
<q-item-label class="text-uppercase text-weight-bold q-ml-xs"> total </q-item-label>
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-checkbox
|
<q-checkbox
|
||||||
dense
|
dense
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ export interface PayPeriodOverviewEmployee {
|
||||||
evening_hours: number;
|
evening_hours: number;
|
||||||
emergency_hours: number;
|
emergency_hours: number;
|
||||||
overtime_hours: number;
|
overtime_hours: number;
|
||||||
|
total_hours: number;
|
||||||
expenses: number;
|
expenses: number;
|
||||||
mileage: number;
|
mileage: number;
|
||||||
is_approved: boolean;
|
is_approved: boolean;
|
||||||
|
|
@ -17,6 +18,7 @@ export const default_pay_period_overview_employee: PayPeriodOverviewEmployee = {
|
||||||
evening_hours: -1,
|
evening_hours: -1,
|
||||||
emergency_hours: -1,
|
emergency_hours: -1,
|
||||||
overtime_hours: -1,
|
overtime_hours: -1,
|
||||||
|
total_hours: -1,
|
||||||
expenses: -1,
|
expenses: -1,
|
||||||
mileage: -1,
|
mileage: -1,
|
||||||
is_approved: false
|
is_approved: false
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ export interface TimesheetDetailsDailySchedule {
|
||||||
evening_hours: number;
|
evening_hours: number;
|
||||||
emergency_hours: number;
|
emergency_hours: number;
|
||||||
overtime_hours: number;
|
overtime_hours: number;
|
||||||
|
total_hours: number;
|
||||||
short_date: string; // ex. 08/24
|
short_date: string; // ex. 08/24
|
||||||
break_duration?: number;
|
break_duration?: number;
|
||||||
}
|
}
|
||||||
|
|
@ -61,6 +62,7 @@ const emptyDailySchedule = (): TimesheetDetailsDailySchedule => ({
|
||||||
evening_hours: 0,
|
evening_hours: 0,
|
||||||
emergency_hours: 0,
|
emergency_hours: 0,
|
||||||
overtime_hours: 0,
|
overtime_hours: 0,
|
||||||
|
total_hours: 0,
|
||||||
short_date: "",
|
short_date: "",
|
||||||
break_duration: 0,
|
break_duration: 0,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user