fix(timesheet): fix issue on mobile version where shifts cannot be deleted
This commit is contained in:
parent
6576177652
commit
985b8a7564
|
|
@ -10,11 +10,13 @@
|
||||||
import { useUiStore } from 'src/stores/ui-store';
|
import { useUiStore } from 'src/stores/ui-store';
|
||||||
import { useTimesheetStore } from 'src/stores/timesheet-store';
|
import { useTimesheetStore } from 'src/stores/timesheet-store';
|
||||||
import { Shift } from 'src/modules/timesheets/models/shift.models';
|
import { Shift } from 'src/modules/timesheets/models/shift.models';
|
||||||
|
import { useShiftApi } from 'src/modules/timesheets/composables/use-shift-api';
|
||||||
import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
|
import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
|
||||||
// import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
|
import { isShiftOverlap } from 'src/modules/timesheets/utils/shift.util';
|
||||||
|
|
||||||
const { locale } = useI18n();
|
const { locale } = useI18n();
|
||||||
const uiStore = useUiStore();
|
const uiStore = useUiStore();
|
||||||
|
const shiftApi = useShiftApi();
|
||||||
const timesheetStore = useTimesheetStore();
|
const timesheetStore = useTimesheetStore();
|
||||||
|
|
||||||
const day = defineModel<TimesheetDay>({ required: true });
|
const day = defineModel<TimesheetDay>({ required: true });
|
||||||
|
|
@ -44,6 +46,22 @@
|
||||||
else if (locale.value === 'en-CA')
|
else if (locale.value === 'en-CA')
|
||||||
return holiday.nameEn;
|
return holiday.nameEn;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onTimeFieldBlur = () => {
|
||||||
|
const is_error = isShiftOverlap(day.value.shifts);
|
||||||
|
day.value.shifts.map(shift => shift.has_error = is_error);
|
||||||
|
}
|
||||||
|
|
||||||
|
const deleteCurrentShift = async (shiftId: number, index: number) => {
|
||||||
|
if (shiftId <= 0)
|
||||||
|
day.value.shifts.splice(index, 1);
|
||||||
|
else
|
||||||
|
await shiftApi.deleteShiftById(shiftId);
|
||||||
|
|
||||||
|
if (day.value.shifts.length < 2) {
|
||||||
|
onTimeFieldBlur();
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|
@ -93,13 +111,14 @@
|
||||||
class="q-pa-none transparent"
|
class="q-pa-none transparent"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
v-for="_shift, shiftIndex in day.shifts"
|
v-for="shift, shiftIndex in day.shifts"
|
||||||
:key="shiftIndex"
|
:key="shiftIndex"
|
||||||
>
|
>
|
||||||
<ShiftListDayRowMobile
|
<ShiftListDayRowMobile
|
||||||
v-model:shift="day.shifts[shiftIndex]!"
|
v-model:shift="day.shifts[shiftIndex]!"
|
||||||
:current-shifts="day.shifts"
|
:current-shifts="day.shifts"
|
||||||
:has-shift-after="shiftIndex < day.shifts.length - 1"
|
:has-shift-after="shiftIndex < day.shifts.length - 1"
|
||||||
|
@request-delete="deleteCurrentShift(shift.id, shiftIndex)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user