From e794ad251465c173766268bb7c77b226bb7bac45 Mon Sep 17 00:00:00 2001
From: tristan <tristan@yuno.malio.fr>
Date: Fri, 6 Mar 2026 16:58:29 +0100
Subject: [PATCH] feat : ajout d'un champ commentaire sur les contrats +
 correction de plusieurs bugs

---
 .claude/settings.local.json                   |  3 +-
 doc/functional-rules.md                       | 15 +++-
 frontend/components/employees/ContractTab.vue | 14 ++++
 frontend/components/employees/LeaveTab.vue    | 69 ++++++++++---------
 frontend/components/hours/HoursDayView.vue    |  4 ++
 frontend/components/hours/types.ts            |  1 +
 frontend/components/ui/TimeSelect.vue         |  5 +-
 frontend/composables/useEmployeeDetailPage.ts | 19 +++--
 frontend/composables/useHoursPage.ts          | 15 +++-
 frontend/pages/employees/[id].vue             |  2 +
 frontend/pages/hours.vue                      |  2 +
 frontend/services/dto/employee.ts             |  1 +
 frontend/services/dto/work-hour.ts            |  1 +
 frontend/services/employees.ts                |  4 ++
 migrations/Version20260306140000.php          | 26 +++++++
 migrations/Version20260306160000.php          | 26 +++++++
 src/Dto/Employees/ContractHistoryItem.php     |  2 +
 src/Entity/Employee.php                       | 16 +++++
 src/Entity/EmployeeContractPeriod.php         | 15 ++++
 src/Entity/WorkHour.php                       | 17 +++++
 .../EmployeeContractChangeRequest.php         |  4 +-
 .../EmployeeContractChangeRequestFactory.php  |  1 +
 .../EmployeeContractPeriodManager.php         |  4 +-
 ...EmployeeContractPeriodManagerInterface.php |  3 +-
 .../WorkHours/WorkedHoursCreditPolicy.php     |  9 +--
 src/State/EmployeeWriteProcessor.php          |  3 +-
 src/State/WorkHourBulkUpsertProcessor.php     |  7 ++
 .../WorkHours/WorkedHoursCreditPolicyTest.php |  6 +-
 28 files changed, 235 insertions(+), 59 deletions(-)
 create mode 100644 migrations/Version20260306140000.php
 create mode 100644 migrations/Version20260306160000.php

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 7db35a3..502e17c 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -5,7 +5,8 @@
       "Bash(npx nuxi:*)",
       "Bash(php:*)",
       "Bash(docker compose:*)",
-      "Bash(make test:*)"
+      "Bash(make test:*)",
+      "Bash(grep:*)"
     ]
   }
 }
diff --git a/doc/functional-rules.md b/doc/functional-rules.md
index 3e31acc..ac5aae9 100644
--- a/doc/functional-rules.md
+++ b/doc/functional-rules.md
@@ -43,10 +43,17 @@ Documents complementaires:
 - Saisie par salarié et par date:
   - matin / après-midi / soir
   - pour `PRESENCE`: demi-journées matin/après-midi
+- Sélecteur de temps:
+  - créneaux de 15 minutes uniquement (00:00, 00:15, ..., 23:45)
+  - saisie libre possible mais valeur vidée au blur si hors options
 - Calculs affichés:
   - `Jour`, `Nuit`, `Total`
 - Heures de nuit:
   - fenêtres `00:00-06:00` et `21:00-24:00`
+- Date de modification (`updatedAt`):
+  - mise à jour uniquement quand un employé (`ROLE_SELF`) modifie ses propres heures
+  - non mise à jour lors de modifications admin ou chef de site
+  - affichée sous le nom de l'employé (visible admin uniquement)
 
 ## 4) Absences
 
@@ -57,8 +64,9 @@ Documents complementaires:
 - Colonne absence (vue jour):
   - affiche le libellé
   - fond coloré selon le type d'absence
-- Si plusieurs absences de couleurs différentes sur le même jour:
-  - fallback rouge
+- Calendrier congés: fond coloré selon la couleur du type d'absence (`AbsenceType.color`)
+  - demi-journée: dégradé diagonal
+  - journée complète: fond plein
 
 ### Effet absence sur les heures
 
@@ -73,7 +81,7 @@ Documents complementaires:
 
 - Si `countAsWorkedHours = true`:
   - `TIME`: crédit de minutes selon contrat actif du jour
-  - `PRESENCE`: crédit d'unités (0.5 / demi-journée)
+  - `PRESENCE` (forfait): aucun crédit de présence (seules les checkboxes cochées comptent)
 
 ## 5) Validations des lignes d'heures
 
@@ -112,6 +120,7 @@ Documents complementaires:
 ## 7) Fériés
 
 - Les jours fériés sont identifiés et affichés
+- Onglet congés: jours fériés affichés sur le calendrier avec fond `rgb(179, 229, 252)` et nom au survol
 - Règle courante:
   - absences bloquées sur jour férié
   - saisie d'heures autorisée
diff --git a/frontend/components/employees/ContractTab.vue b/frontend/components/employees/ContractTab.vue
index b464f26..a8255e8 100644
--- a/frontend/components/employees/ContractTab.vue
+++ b/frontend/components/employees/ContractTab.vue
@@ -86,6 +86,19 @@
           <p v-if="showContractEndDateError" class="mt-1 text-sm text-red-600">La date de fin est obligatoire.</p>
         </div>
 
+        <div>
+          <label class="text-md font-semibold text-neutral-700" for="contract-comment">
+            Commentaire
+          </label>
+          <textarea
+            id="contract-comment"
+            v-model="contractForm.comment"
+            rows="3"
+            class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
+            placeholder="Motif de la clôture..."
+          />
+        </div>
+
         <div class="rounded-md border border-neutral-200 bg-neutral-50 p-3">
           <label class="inline-flex items-center gap-2 text-md font-semibold text-neutral-700" for="contract-paid-leave-settled">
             <input
@@ -191,6 +204,7 @@ type ContractForm = {
   startDate: string
   endDate: string
   paidLeaveSettled: boolean
+  comment: string
 }
 
 type CreateContractForm = {
diff --git a/frontend/components/employees/LeaveTab.vue b/frontend/components/employees/LeaveTab.vue
index 0addee5..294ccc9 100644
--- a/frontend/components/employees/LeaveTab.vue
+++ b/frontend/components/employees/LeaveTab.vue
@@ -41,9 +41,9 @@
                             >
                                 <div
                                     class="h-6 w-6"
-                                    :class="getDayClass(day.leave)"
-                                    :style="getDayStyle(day.leave)"
-                                    :title="getDayTitle(day.leave)"
+                                    :class="getDayClass(day)"
+                                    :style="getDayStyle(day)"
+                                    :title="getDayTitle(day)"
                                 >
                                     {{ getDayText(day) }}
                                 </div>
@@ -65,13 +65,13 @@ type DayLeaveState = {
     am: boolean
     pm: boolean
     labels: string[]
-    hasCongeTypeC: boolean
-    hasOtherTypes: boolean
+    colors: string[]
 }
 
 const props = defineProps<{
     absences: Absence[]
     summary: EmployeeLeaveSummary | null
+    publicHolidays: Record<string, string>
 }>()
 
 const monthLabels = [
@@ -124,8 +124,7 @@ const dayLeaveMap = computed(() => {
                 am: false,
                 pm: false,
                 labels: [] as string[],
-                hasCongeTypeC: false,
-                hasOtherTypes: false
+                colors: [] as string[]
             }
 
             const isStart = ymd === startYmd
@@ -150,18 +149,21 @@ const dayLeaveMap = computed(() => {
             }
 
             const typeLabel = absence.type?.label ?? absence.type?.code ?? 'Absence'
-            const typeCode = (absence.type?.code ?? '').toUpperCase()
+            const typeColor = absence.type?.color ?? '#222783'
             const halfSuffix = am && !pm ? ' (Matin)' : (!am && pm ? ' (Apres-midi)' : '')
             const hoverLabel = `${typeLabel}${halfSuffix}`
 
+            const colors = existing.colors.includes(typeColor)
+                ? existing.colors
+                : [...existing.colors, typeColor]
+
             map.set(ymd, {
                 am: existing.am || am,
                 pm: existing.pm || pm,
                 labels: existing.labels.includes(hoverLabel)
                     ? existing.labels
                     : [...existing.labels, hoverLabel],
-                hasCongeTypeC: existing.hasCongeTypeC || typeCode === 'C',
-                hasOtherTypes: existing.hasOtherTypes || typeCode !== 'C'
+                colors
             })
         }
     }
@@ -180,7 +182,7 @@ const months = computed(() => {
         const daysInMonth = new Date(monthYear, monthIndex + 1, 0).getDate()
         const mondayBasedFirstDay = (first.getDay() + 6) % 7
 
-        const cells: Array<{ ymd: string; label: string; leave: DayLeaveState | null } | null> = []
+        const cells: Array<{ ymd: string; label: string; leave: DayLeaveState | null; isHoliday: boolean } | null> = []
 
         for (let i = 0; i < mondayBasedFirstDay; i += 1) {
             cells.push(null)
@@ -191,7 +193,8 @@ const months = computed(() => {
             cells.push({
                 ymd,
                 label: String(day),
-                leave: dayLeaveMap.value.get(ymd) ?? null
+                leave: dayLeaveMap.value.get(ymd) ?? null,
+                isHoliday: ymd in props.publicHolidays
             })
         }
 
@@ -206,37 +209,37 @@ const months = computed(() => {
     })
 })
 
-const getDayClass = (leave: DayLeaveState | null) => {
-    if (!leave) return 'text-primary-500'
-    if (leave.am && leave.pm) {
-        return leave.hasOtherTypes
-            ? 'bg-red-600 text-white rounded font-semibold'
-            : 'bg-primary-500 text-white rounded font-semibold'
+const getDayClass = (day: { leave: DayLeaveState | null; isHoliday: boolean }) => {
+    if (day.leave) {
+        return 'rounded font-semibold text-white'
     }
-    return 'rounded text-primary-700 font-semibold text-white'
+    if (day.isHoliday) return 'text-primary-500 rounded font-semibold'
+    return 'text-primary-500'
 }
 
-const getDayStyle = (leave: DayLeaveState | null) => {
-    if (!leave || (leave.am && leave.pm)) return undefined
-
-    const color = leave.hasOtherTypes ? '#dc2626' : '#222783'
-    const backgroundImage = leave.am
-        ? `linear-gradient(135deg, ${color} 0 50%, transparent 50% 100%)`
-        : `linear-gradient(135deg, transparent 0 50%, ${color} 50% 100%)`
-
-    return {
-        backgroundImage,
-        backgroundColor: 'transparent'
+const getDayStyle = (day: { leave: DayLeaveState | null; isHoliday: boolean }) => {
+    if (day.leave) {
+        const color = day.leave.colors[0] ?? '#222783'
+        if (day.leave.am && day.leave.pm) {
+            return { backgroundColor: color }
+        }
+        const backgroundImage = day.leave.am
+            ? `linear-gradient(135deg, ${color} 0 50%, transparent 50% 100%)`
+            : `linear-gradient(135deg, transparent 0 50%, ${color} 50% 100%)`
+        return { backgroundImage, backgroundColor: 'transparent' }
     }
+    if (day.isHoliday) return { backgroundColor: 'rgb(179, 229, 252)' }
+    return undefined
 }
 
 const getDayText = (day: { label: string; leave: DayLeaveState | null }) => {
     return day.label
 }
 
-const getDayTitle = (leave: DayLeaveState | null) => {
-    if (!leave || leave.labels.length === 0) return ''
-    return leave.labels.join(' / ')
+const getDayTitle = (day: { leave: DayLeaveState | null; isHoliday: boolean; ymd: string }) => {
+    if (day.leave && day.leave.labels.length > 0) return day.leave.labels.join(' / ')
+    if (day.isHoliday) return props.publicHolidays[day.ymd] ?? 'Jour férié'
+    return ''
 }
 
 const formatCount = (value: number | null | undefined) => {
diff --git a/frontend/components/hours/HoursDayView.vue b/frontend/components/hours/HoursDayView.vue
index 384e49f..f48376c 100644
--- a/frontend/components/hours/HoursDayView.vue
+++ b/frontend/components/hours/HoursDayView.vue
@@ -63,6 +63,9 @@
                 <Icon name="mdi:check"/>
             </span>
           </p>
+          <p v-if="isAdmin && getRowUpdatedAt(employee.id)" class="text-neutral-400 text-xs truncate">
+            Modifié le {{ getRowUpdatedAt(employee.id) }}
+          </p>
         </div>
           <div class="pl-2 min-w-0 self-stretch flex flex-col gap-1 justify-between py-0.5">
                 <p
@@ -216,6 +219,7 @@ const props = defineProps<{
   getRowMetrics: (employeeId: number) => { dayMinutes: number; nightMinutes: number; totalMinutes: number }
   getRowAbsenceLabel: (employeeId: number) => string
   getRowAbsenceStyle: (employeeId: number) => { backgroundColor: string } | undefined
+  getRowUpdatedAt: (employeeId: number) => string
   getPresenceDayValue: (employeeId: number) => string
   onAbsenceClick: (employeeId: number) => void
   formatMinutes: (minutes: number) => string
diff --git a/frontend/components/hours/types.ts b/frontend/components/hours/types.ts
index 086413c..d273f88 100644
--- a/frontend/components/hours/types.ts
+++ b/frontend/components/hours/types.ts
@@ -10,4 +10,5 @@ export type HourRow = {
   isPresentAfternoon: boolean
   isSiteValid: boolean
   isValid: boolean
+  updatedAt: string | null
 }
diff --git a/frontend/components/ui/TimeSelect.vue b/frontend/components/ui/TimeSelect.vue
index 6ffec40..ef1db23 100644
--- a/frontend/components/ui/TimeSelect.vue
+++ b/frontend/components/ui/TimeSelect.vue
@@ -167,8 +167,9 @@ const closeMenu = () => {
 
 const commitInput = () => {
   const normalized = normalizeTypedTime(inputValue.value)
-  if (normalized === null) {
-    inputValue.value = props.modelValue
+  if (normalized === null || (normalized !== '' && !timeSlots.value.includes(normalized))) {
+    emit('update:modelValue', '')
+    inputValue.value = ''
     closeMenu()
     return
   }
diff --git a/frontend/composables/useEmployeeDetailPage.ts b/frontend/composables/useEmployeeDetailPage.ts
index 4f6e3f6..e44a56a 100644
--- a/frontend/composables/useEmployeeDetailPage.ts
+++ b/frontend/composables/useEmployeeDetailPage.ts
@@ -9,6 +9,7 @@ import { listContracts } from '~/services/contracts'
 import { getEmployeeLeaveSummary } from '~/services/employee-leave-summary'
 import { getEmployeeRttSummary } from '~/services/employee-rtt-summary'
 import { getEmployee, updateEmployee } from '~/services/employees'
+import { listPublicHolidays } from '~/services/public-holidays'
 import { formatNullableYmdToFr, getTodayYmd, shiftYmd } from '~/utils/date'
 import { contractNatureLabel, isContractNature, requiresContractEndDate } from '~/utils/contract'
 
@@ -22,6 +23,7 @@ export const useEmployeeDetailPage = () => {
   const employeeAbsences = ref<Absence[]>([])
   const leaveSummary = ref<EmployeeLeaveSummary | null>(null)
   const rttSummary = ref<EmployeeRttSummary | null>(null)
+  const publicHolidays = ref<Record<string, string>>({})
   const isContractDrawerOpen = ref(false)
   const isContractSubmitting = ref(false)
   const isCreateContractDrawerOpen = ref(false)
@@ -34,7 +36,8 @@ export const useEmployeeDetailPage = () => {
     contractNature: 'CDI' as 'CDI' | 'CDD' | 'INTERIM',
     startDate: '',
     endDate: '',
-    paidLeaveSettled: false
+    paidLeaveSettled: false,
+    comment: ''
   })
 
   const validationTouched = reactive({
@@ -138,6 +141,7 @@ export const useEmployeeDetailPage = () => {
     contractForm.startDate = active.startDate
     contractForm.endDate = getTodayYmd()
     contractForm.paidLeaveSettled = false
+    contractForm.comment = ''
   }
 
   const openCloseContractDrawer = () => {
@@ -198,7 +202,10 @@ export const useEmployeeDetailPage = () => {
       const to = isForfait
         ? `${leaveYear}-12-31`
         : `${leaveYear}-05-31`
-      const [absences, summary, rtt] = await Promise.all([
+      const holidayYears = isForfait
+        ? [leaveYear]
+        : [leaveYear - 1, leaveYear]
+      const [absences, summary, rtt, ...holidayResults] = await Promise.all([
         listAbsences({
           from,
           to,
@@ -207,11 +214,13 @@ export const useEmployeeDetailPage = () => {
         showLeaveTab.value
           ? getEmployeeLeaveSummary(loadedEmployee.id, leaveYear)
           : Promise.resolve(null),
-        getEmployeeRttSummary(loadedEmployee.id, rttYear)
+        getEmployeeRttSummary(loadedEmployee.id, rttYear),
+        ...holidayYears.map((y) => listPublicHolidays('metropole', y))
       ])
       employeeAbsences.value = absences
       leaveSummary.value = summary
       rttSummary.value = rtt
+      publicHolidays.value = Object.assign({}, ...holidayResults)
       if (!showLeaveTab.value && activeTab.value === 'leave') {
         activeTab.value = 'contract'
       }
@@ -242,7 +251,8 @@ export const useEmployeeDetailPage = () => {
         siteId: employee.value.site?.id ?? null,
         contractId: Number(contractForm.contractId),
         contractEndDate: contractForm.endDate || null,
-        contractPaidLeaveSettled: contractForm.paidLeaveSettled
+        contractPaidLeaveSettled: contractForm.paidLeaveSettled,
+        contractComment: contractForm.comment || null
       })
 
       isContractDrawerOpen.value = false
@@ -309,6 +319,7 @@ export const useEmployeeDetailPage = () => {
     employeeAbsences,
     leaveSummary,
     rttSummary,
+    publicHolidays,
     showLeaveTab,
     contractHistory,
     employeeContractWorkLabel,
diff --git a/frontend/composables/useHoursPage.ts b/frontend/composables/useHoursPage.ts
index 864291a..e5f2e47 100644
--- a/frontend/composables/useHoursPage.ts
+++ b/frontend/composables/useHoursPage.ts
@@ -341,7 +341,8 @@ export const useHoursPage = () => {
     isPresentMorning: false,
     isPresentAfternoon: false,
     isSiteValid: false,
-    isValid: false
+    isValid: false,
+    updatedAt: null
   })
 
   const isPresenceTracking = (employee: Employee) => employee.contract?.trackingMode === TRACKING_MODES.PRESENCE
@@ -463,6 +464,14 @@ export const useHoursPage = () => {
     return { backgroundColor: dayRow.absenceColor || '#dc2626' }
   }
 
+  const getRowUpdatedAt = (employeeId: number): string => {
+    const raw = rows.value[employeeId]?.updatedAt
+    if (!raw) return ''
+    const date = new Date(raw)
+    if (Number.isNaN(date.getTime())) return ''
+    return date.toLocaleDateString('fr-FR', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })
+  }
+
   const getPresenceDayValue = (employeeId: number) => {
     const row = rows.value[employeeId]
     const dayRow = dayContextByEmployeeId.value.get(employeeId)
@@ -521,7 +530,8 @@ export const useHoursPage = () => {
         isPresentMorning: workHour?.isPresentMorning ?? false,
         isPresentAfternoon: workHour?.isPresentAfternoon ?? false,
         isSiteValid: workHour?.isSiteValid ?? false,
-        isValid: workHour?.isValid ?? false
+        isValid: workHour?.isValid ?? false,
+        updatedAt: workHour?.updatedAt ?? null
       }
     }
 
@@ -1140,6 +1150,7 @@ export const useHoursPage = () => {
     getRowMetrics,
     getRowAbsenceLabel,
     getRowAbsenceStyle,
+    getRowUpdatedAt,
     getPresenceDayValue,
     openAbsenceDrawer,
     submitAbsence,
diff --git a/frontend/pages/employees/[id].vue b/frontend/pages/employees/[id].vue
index 8dc8407..16d7389 100644
--- a/frontend/pages/employees/[id].vue
+++ b/frontend/pages/employees/[id].vue
@@ -93,6 +93,7 @@
                     class="h-full"
                     :absences="employeeAbsences"
                     :summary="leaveSummary"
+                    :public-holidays="publicHolidays"
                 />
                 <EmployeesRttTab v-else class="h-full" :summary="rttSummary" />
             </div>
@@ -109,6 +110,7 @@ const {
     employeeAbsences,
     leaveSummary,
     rttSummary,
+    publicHolidays,
     showLeaveTab,
     contractHistory,
     employeeContractWorkLabel,
diff --git a/frontend/pages/hours.vue b/frontend/pages/hours.vue
index 9245760..a37d02a 100644
--- a/frontend/pages/hours.vue
+++ b/frontend/pages/hours.vue
@@ -66,6 +66,7 @@
                 :get-row-metrics="getRowMetrics"
                 :get-row-absence-label="getRowAbsenceLabel"
                 :get-row-absence-style="getRowAbsenceStyle"
+                :get-row-updated-at="getRowUpdatedAt"
                 :get-presence-day-value="getPresenceDayValue"
                 :on-absence-click="openAbsenceDrawer"
                 :format-minutes="formatMinutes"
@@ -173,6 +174,7 @@ const {
   getRowMetrics,
   getRowAbsenceLabel,
   getRowAbsenceStyle,
+  getRowUpdatedAt,
   getPresenceDayValue,
   openAbsenceDrawer,
   submitAbsence,
diff --git a/frontend/services/dto/employee.ts b/frontend/services/dto/employee.ts
index d1b1056..ceaac93 100644
--- a/frontend/services/dto/employee.ts
+++ b/frontend/services/dto/employee.ts
@@ -8,6 +8,7 @@ export type ContractHistoryItem = {
   contractNature: 'CDI' | 'CDD' | 'INTERIM'
   startDate: string
   endDate?: string | null
+  comment?: string | null
 }
 
 export type Employee = {
diff --git a/frontend/services/dto/work-hour.ts b/frontend/services/dto/work-hour.ts
index 7f4dbac..953eada 100644
--- a/frontend/services/dto/work-hour.ts
+++ b/frontend/services/dto/work-hour.ts
@@ -15,6 +15,7 @@ export type WorkHour = {
   isPresentAfternoon?: boolean
   isSiteValid?: boolean
   isValid?: boolean
+  updatedAt?: string | null
 }
 
 export type WorkHourEntryPayload = {
diff --git a/frontend/services/employees.ts b/frontend/services/employees.ts
index 00d470c..19dd6e6 100644
--- a/frontend/services/employees.ts
+++ b/frontend/services/employees.ts
@@ -61,6 +61,7 @@ export const updateEmployee = async (
     contractStartDate?: string
     contractEndDate?: string | null
     contractPaidLeaveSettled?: boolean
+    contractComment?: string | null
     displayOrder?: number
   }
 ) => {
@@ -87,6 +88,9 @@ export const updateEmployee = async (
   if (payload.contractPaidLeaveSettled !== undefined) {
     body.contractPaidLeaveSettled = payload.contractPaidLeaveSettled
   }
+  if (payload.contractComment !== undefined) {
+    body.contractComment = payload.contractComment ?? null
+  }
 
   return api.patch<Employee>(`/employees/${id}`, body, {
     toastSuccessKey: 'success.employee.update',
diff --git a/migrations/Version20260306140000.php b/migrations/Version20260306140000.php
new file mode 100644
index 0000000..7ccd060
--- /dev/null
+++ b/migrations/Version20260306140000.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260306140000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add updated_at column to work_hours table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours ADD COLUMN updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours DROP COLUMN updated_at');
+    }
+}
diff --git a/migrations/Version20260306160000.php b/migrations/Version20260306160000.php
new file mode 100644
index 0000000..cd981bd
--- /dev/null
+++ b/migrations/Version20260306160000.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260306160000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add comment column to employee_contract_periods table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE employee_contract_periods ADD COLUMN comment TEXT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE employee_contract_periods DROP COLUMN comment');
+    }
+}
diff --git a/src/Dto/Employees/ContractHistoryItem.php b/src/Dto/Employees/ContractHistoryItem.php
index 0a7d485..d6fc7ff 100644
--- a/src/Dto/Employees/ContractHistoryItem.php
+++ b/src/Dto/Employees/ContractHistoryItem.php
@@ -21,5 +21,7 @@ final class ContractHistoryItem
         public string $startDate,
         #[Groups(['employee:read'])]
         public ?string $endDate,
+        #[Groups(['employee:read'])]
+        public ?string $comment = null,
     ) {}
 }
diff --git a/src/Entity/Employee.php b/src/Entity/Employee.php
index 9f473e3..b5e63f6 100644
--- a/src/Entity/Employee.php
+++ b/src/Entity/Employee.php
@@ -78,6 +78,9 @@ class Employee
     #[Groups(['employee:write'])]
     private ?bool $contractPaidLeaveSettled = null;
 
+    #[Groups(['employee:write'])]
+    private ?string $contractComment = null;
+
     public function __construct()
     {
         $this->createdAt       = new DateTimeImmutable();
@@ -202,6 +205,18 @@ class Employee
         return $this;
     }
 
+    public function getContractComment(): ?string
+    {
+        return $this->contractComment;
+    }
+
+    public function setContractComment(?string $contractComment): self
+    {
+        $this->contractComment = $contractComment;
+
+        return $this;
+    }
+
     #[Groups(['employee:read'])]
     public function getCurrentContractNature(): string
     {
@@ -243,6 +258,7 @@ class Employee
                     contractNature: $period->getContractNatureEnum()->value,
                     startDate: $period->getStartDate()->format('Y-m-d'),
                     endDate: $period->getEndDate()?->format('Y-m-d'),
+                    comment: $period->getComment(),
                 );
             },
             $periods
diff --git a/src/Entity/EmployeeContractPeriod.php b/src/Entity/EmployeeContractPeriod.php
index 2aadf8e..a01f63a 100644
--- a/src/Entity/EmployeeContractPeriod.php
+++ b/src/Entity/EmployeeContractPeriod.php
@@ -40,6 +40,9 @@ class EmployeeContractPeriod
     #[ORM\Column(type: 'boolean', options: ['default' => false])]
     private bool $paidLeaveSettled = false;
 
+    #[ORM\Column(type: 'text', nullable: true)]
+    private ?string $comment = null;
+
     #[ORM\Column(type: 'datetime_immutable')]
     private DateTimeImmutable $createdAt;
 
@@ -136,4 +139,16 @@ class EmployeeContractPeriod
 
         return $this;
     }
+
+    public function getComment(): ?string
+    {
+        return $this->comment;
+    }
+
+    public function setComment(?string $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
 }
diff --git a/src/Entity/WorkHour.php b/src/Entity/WorkHour.php
index f80681e..6a3dfb2 100644
--- a/src/Entity/WorkHour.php
+++ b/src/Entity/WorkHour.php
@@ -14,6 +14,7 @@ use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
 use App\Repository\WorkHourRepository;
 use App\State\WorkHourSiteValidationProcessor;
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
@@ -106,6 +107,10 @@ class WorkHour
     #[Groups(['work_hour:read', 'work_hour:site_validate'])]
     private bool $isSiteValid = false;
 
+    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
+    #[Groups(['work_hour:read'])]
+    private ?DateTimeImmutable $updatedAt = null;
+
     public function getId(): ?int
     {
         return $this->id;
@@ -274,4 +279,16 @@ class WorkHour
 
         return $this;
     }
+
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function setUpdatedAt(?DateTimeImmutable $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
 }
diff --git a/src/Service/Contracts/EmployeeContractChangeRequest.php b/src/Service/Contracts/EmployeeContractChangeRequest.php
index 1151f62..e1e0e68 100644
--- a/src/Service/Contracts/EmployeeContractChangeRequest.php
+++ b/src/Service/Contracts/EmployeeContractChangeRequest.php
@@ -14,6 +14,7 @@ final readonly class EmployeeContractChangeRequest
         public ?DateTimeImmutable $contractStartDate,
         public ?DateTimeImmutable $contractEndDate,
         public ?bool $contractPaidLeaveSettled,
+        public ?string $contractComment,
     ) {}
 
     public function hasPeriodChangeRequest(): bool
@@ -21,7 +22,8 @@ final readonly class EmployeeContractChangeRequest
         return null !== $this->contractNature
             || null !== $this->contractStartDate
             || null !== $this->contractEndDate
-            || null !== $this->contractPaidLeaveSettled;
+            || null !== $this->contractPaidLeaveSettled
+            || null !== $this->contractComment;
     }
 
     public function isCloseOnlyRequest(bool $contractChanged): bool
diff --git a/src/Service/Contracts/EmployeeContractChangeRequestFactory.php b/src/Service/Contracts/EmployeeContractChangeRequestFactory.php
index 5ff7682..57ea84e 100644
--- a/src/Service/Contracts/EmployeeContractChangeRequestFactory.php
+++ b/src/Service/Contracts/EmployeeContractChangeRequestFactory.php
@@ -18,6 +18,7 @@ final class EmployeeContractChangeRequestFactory
             contractStartDate: $this->parseOptionalYmd($employee->getContractStartDate(), 'contractStartDate'),
             contractEndDate: $this->parseOptionalYmd($employee->getContractEndDate(), 'contractEndDate'),
             contractPaidLeaveSettled: $employee->getContractPaidLeaveSettled(),
+            contractComment: $employee->getContractComment(),
         );
     }
 
diff --git a/src/Service/Contracts/EmployeeContractPeriodManager.php b/src/Service/Contracts/EmployeeContractPeriodManager.php
index d9d18c6..afe029c 100644
--- a/src/Service/Contracts/EmployeeContractPeriodManager.php
+++ b/src/Service/Contracts/EmployeeContractPeriodManager.php
@@ -43,7 +43,8 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
     public function closeCurrentPeriod(
         ?EmployeeContractPeriod $todayPeriod,
         DateTimeImmutable $requestedEndDate,
-        bool $paidLeaveSettled
+        bool $paidLeaveSettled,
+        ?string $comment = null
     ): void {
         if (null === $todayPeriod) {
             throw new UnprocessableEntityHttpException('No active contract period to close.');
@@ -58,6 +59,7 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
 
         $todayPeriod->setEndDate($requestedEndDate);
         $todayPeriod->setPaidLeaveSettled($paidLeaveSettled);
+        $todayPeriod->setComment($comment);
         $this->entityManager->flush();
     }
 
diff --git a/src/Service/Contracts/EmployeeContractPeriodManagerInterface.php b/src/Service/Contracts/EmployeeContractPeriodManagerInterface.php
index a0995ad..c93d350 100644
--- a/src/Service/Contracts/EmployeeContractPeriodManagerInterface.php
+++ b/src/Service/Contracts/EmployeeContractPeriodManagerInterface.php
@@ -23,7 +23,8 @@ interface EmployeeContractPeriodManagerInterface
     public function closeCurrentPeriod(
         ?EmployeeContractPeriod $todayPeriod,
         DateTimeImmutable $requestedEndDate,
-        bool $paidLeaveSettled
+        bool $paidLeaveSettled,
+        ?string $comment = null
     ): void;
 
     public function createNextPeriod(
diff --git a/src/Service/WorkHours/WorkedHoursCreditPolicy.php b/src/Service/WorkHours/WorkedHoursCreditPolicy.php
index 7a4f72f..69ea800 100644
--- a/src/Service/WorkHours/WorkedHoursCreditPolicy.php
+++ b/src/Service/WorkHours/WorkedHoursCreditPolicy.php
@@ -69,13 +69,8 @@ final readonly class WorkedHoursCreditPolicy
             return 0.0;
         }
 
-        // Règle forfait:
-        // - demi-journée d'absence => 0.5 travaillé
-        // - journée complète d'absence => 0 travaillé
-        if ($absentMorning xor $absentAfternoon) {
-            return 0.5;
-        }
-
+        // Règle forfait: les absences ne créditent jamais de présence.
+        // Seules les checkboxes cochées par l'employé comptent.
         return 0.0;
     }
 
diff --git a/src/State/EmployeeWriteProcessor.php b/src/State/EmployeeWriteProcessor.php
index 1979dcc..56a320e 100644
--- a/src/State/EmployeeWriteProcessor.php
+++ b/src/State/EmployeeWriteProcessor.php
@@ -90,7 +90,8 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
             $this->periodManager->closeCurrentPeriod(
                 $todayPeriod,
                 $requestedEndDate,
-                $changeRequest->contractPaidLeaveSettled ?? false
+                $changeRequest->contractPaidLeaveSettled ?? false,
+                $changeRequest->contractComment
             );
 
             return $result;
diff --git a/src/State/WorkHourBulkUpsertProcessor.php b/src/State/WorkHourBulkUpsertProcessor.php
index 3bd9551..5c6f9ec 100644
--- a/src/State/WorkHourBulkUpsertProcessor.php
+++ b/src/State/WorkHourBulkUpsertProcessor.php
@@ -98,6 +98,7 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
             $normalized         = $this->normalizeEntry($entry, $employeeId, $isPresenceTracking);
             $existing           = $existingByEmployeeId[$employeeId] ?? null;
             $isAdmin            = in_array('ROLE_ADMIN', $user->getRoles(), true);
+            $isSelf             = in_array('ROLE_SELF', $user->getRoles(), true);
 
             if ($existing?->isValid()) {
                 if (!$this->isSameAsExisting($existing, $normalized)) {
@@ -145,6 +146,9 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
                         ->setWorkDate($workDate)
                     ;
                     $this->hydrateWorkHour($workHour, $normalized);
+                    if ($isSelf) {
+                        $workHour->setUpdatedAt(new DateTimeImmutable());
+                    }
                     $this->entityManager->persist($workHour);
                     $existingByEmployeeId[$employeeId] = $workHour;
                     ++$result->created;
@@ -169,6 +173,9 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
             }
 
             $this->hydrateWorkHour($workHour, $normalized);
+            if (!$isAdmin) {
+                $workHour->setUpdatedAt(new DateTimeImmutable());
+            }
             ++$result->processed;
         }
 
diff --git a/tests/Service/WorkHours/WorkedHoursCreditPolicyTest.php b/tests/Service/WorkHours/WorkedHoursCreditPolicyTest.php
index e79de91..bab2324 100644
--- a/tests/Service/WorkHours/WorkedHoursCreditPolicyTest.php
+++ b/tests/Service/WorkHours/WorkedHoursCreditPolicyTest.php
@@ -43,9 +43,9 @@ final class WorkedHoursCreditPolicyTest extends TestCase
         $policy  = new WorkedHoursCreditPolicy($this->buildResolverStub());
         $absence = $this->buildAbsence(trackMode: Contract::TRACKING_PRESENCE, weeklyHours: null, countAsWorked: true);
 
-        $units = $policy->computeCreditedPresenceUnits($absence, '2026-02-16', true, false);
-
-        self::assertSame(0.5, $units);
+        // Forfait : les absences ne créditent jamais de présence, seules les checkboxes comptent.
+        self::assertSame(0.0, $policy->computeCreditedPresenceUnits($absence, '2026-02-16', true, false));
+        self::assertSame(0.0, $policy->computeCreditedPresenceUnits($absence, '2026-02-16', true, true));
     }
 
     public function testNoCreditWhenAbsenceTypeDoesNotCount(): void