From 2a8c874985c2aba0cbe1b9246e52070224a04a7b Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 10 Feb 2026 16:11:09 +0100 Subject: [PATCH] =?UTF-8?q?feat=20:=20ajout=20des=20demi-journ=C3=A9es=20d?= =?UTF-8?q?'absence=20dans=20le=20calendrier=20et=20l'export=20pdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/db-forest-config.xml | 6 + frontend/components/AbsenceFormDrawer.vue | 54 ++++++-- frontend/components/CalendarGrid.vue | 55 ++++++-- frontend/pages/calendar.vue | 159 ++++++++++++++++++++-- frontend/services/absences.ts | 9 ++ frontend/services/dto/absence.ts | 3 + frontend/services/dto/half-day.ts | 6 + migrations/Version20260210120000.php | 28 ++++ src/Entity/Absence.php | 32 +++++ src/State/AbsencePrintProvider.php | 27 +++- templates/absence/print.html.twig | 71 +++++++++- 11 files changed, 404 insertions(+), 46 deletions(-) create mode 100644 .idea/db-forest-config.xml create mode 100644 frontend/services/dto/half-day.ts create mode 100644 migrations/Version20260210120000.php 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 @@