diff --git a/.idea/db-forest-config.xml b/.idea/db-forest-config.xml new file mode 100644 index 0000000..651867c --- /dev/null +++ b/.idea/db-forest-config.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/frontend/components/AbsenceFormDrawer.vue b/frontend/components/AbsenceFormDrawer.vue index b33cd73..8535acb 100644 --- a/frontend/components/AbsenceFormDrawer.vue +++ b/frontend/components/AbsenceFormDrawer.vue @@ -39,24 +39,44 @@

-
+
- - + +
+ + +
- - + +
+ + +
@@ -103,6 +123,8 @@ import { computed, reactive, toRef, watch } from 'vue' import type { Employee } from '~/services/dto/employee' import type { AbsenceType } from '~/services/dto/absence-type' import type { Absence } from '~/services/dto/absence' +import type { HalfDay } from '~/services/dto/half-day' +import { HALF_DAYS } from '~/services/dto/half-day' import AppDrawer from '~/components/AppDrawer.vue' const props = defineProps<{ @@ -113,7 +135,9 @@ const props = defineProps<{ employeeId: number | '' typeId: number | '' startDate: string + startHalf: HalfDay endDate: string + endHalf: HalfDay comment: string } editingAbsence: Absence | null diff --git a/frontend/components/CalendarGrid.vue b/frontend/components/CalendarGrid.vue index 7cdbf42..37d7497 100644 --- a/frontend/components/CalendarGrid.vue +++ b/frontend/components/CalendarGrid.vue @@ -28,18 +28,46 @@ :key="employee.id + '-' + day.date" class="border-b border-neutral-100 px-2 py-2 text-center text-xs text-neutral-800" > - + +
@@ -49,6 +77,7 @@