chore: bump version to v0.1.65

| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [ ] Pas de régression
- [ ] TU/TI/TF rédigée
- [ ] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: #8
Co-authored-by: tristan <tristan@yuno.malio.fr>
Co-committed-by: tristan <tristan@yuno.malio.fr>

.claude/settings.local.json

@@ -23,7 +23,8 @@
       "Bash(sudo apt-get:*)",
       "Bash(npx xlsx-cli:*)",
       "Bash(cat /home/m-tristan/.claude/projects/-home-m-tristan-workspace-SIRH/4b53d9d7-d8ae-451f-a5cc-5d4fd55f2eef/tool-results/toolu_019hng9Cu2m9wiNACuC2Wm3F.json | python3 -c \"import json,sys; data=json.load\\(sys.stdin\\); print\\(data[0]['text']\\)\" 2>/dev/null | head -2000)",
-      "Bash(pip3 install:*)"
+      "Bash(pip3 install:*)",
+      "Bash(find:*)"
     ]
   }
 }

.env

@@ -36,6 +36,10 @@ DEFAULT_URI=http://localhost
 DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
+###> app ###
+RTT_START_DATE=2026-02-23
+###< app ###
+
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###

CLAUDE.md

@@ -43,8 +43,15 @@
 ## Overtime Rules
 - Contracts <= 35h: +25% from 35h to 43h, +50% beyond
 - Contracts >= 39h: +25% from 39h to 43h, +50% beyond
+- CUSTOM contracts (weeklyHours ≠ 35 and ≠ 39, not INTERIM/FORFAIT): reference = actual contractual hours, no 25%/50% bonuses (1h overtime = 1h recovery), deficit doesn't impact balance
 - INTERIM: no overtime bonuses, no recovery time
-- Driver contracts: no overtime calculation
+- Driver contracts: RTT uses `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` instead of morning/afternoon/evening time ranges
+- FORFAIT weekend/holiday bonus: each weekend or public holiday day worked gives bonus leave (full day if morning+afternoon, 0.5 if only one). Added to acquired days, no cap. PRESENCE mode only.
+
+## Frais (MileageAllowance)
+- Onglet "Frais" (anciennement "Frais Kms") sur la fiche employé
+- Validation: mois obligatoire + au moins `kilometers > 0` ou `amount > 0`
+- Les deux champs km et montant sont optionnels individuellement mais au moins un requis
 
 ## Frontend Patterns
 

config/packages/security.yaml

@@ -19,6 +19,7 @@ security:
             pattern: ^/login_check
             stateless: true
             provider: app_user_provider
+            user_checker: App\Security\UserChecker
             json_login:
                 check_path: /login_check
                 username_path: username
@@ -29,6 +30,7 @@ security:
             pattern: ^/api
             stateless: true
             provider: app_user_provider
+            user_checker: App\Security\UserChecker
             jwt: ~
             logout:
                 path: /api/logout

config/services.yaml

@@ -26,6 +26,14 @@ services:
         arguments:
             $holidayUrl: '%env(HOLIDAY_URL)%'
 
+    App\Service\Rtt\RttRecoveryComputationService:
+        arguments:
+            $rttStartDate: '%env(RTT_START_DATE)%'
+
+    App\State\EmployeeRttSummaryProvider:
+        arguments:
+            $rttStartDate: '%env(RTT_START_DATE)%'
+
     App\Repository\Contract\AbsenceReadRepositoryInterface: '@App\Repository\AbsenceRepository'
     App\Repository\Contract\EmployeeContractPeriodReadRepositoryInterface: '@App\Repository\EmployeeContractPeriodRepository'
     App\Repository\Contract\EmployeeScopedRepositoryInterface: '@App\Repository\EmployeeRepository'

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.42'
+    app.version: '0.1.65'

doc/functional-rules.md

@@ -116,6 +116,16 @@ Documents complementaires:
   - contrats >= 39h: de 39h à 43h
 - Tranche 50%:
   - au-delà de 43h
+- Date de début RTT (`RTT_START_DATE` dans `.env`):
+  - les semaines dont la fin est antérieure à cette date sont ignorées dans le calcul de récupération
+  - permet d'éviter les déficits fictifs avant la mise en service du logiciel
+- Semaine en déficit (heures travaillées < heures contrat):
+  - le déficit est déduit du cumul RTT : d'abord des heures à 50%, puis des heures à 25%
+  - si aucun solde 50% ni 25%, les heures à 25% deviennent négatives
+- Contrats CUSTOM (heures hebdo ≠ 35h et ≠ 39h, hors INTERIM/FORFAIT):
+  - référence heures sup = heures contractuelles réelles (ex: 4h → référence 4h)
+  - pas de bonus 25% ni 50% : 1 heure sup = 1 heure de récupération
+  - le déficit (travail < contrat) ne génère pas de récup mais n'impacte pas le solde
 - Nature `INTERIM`:
   - pas de bonus 25%
   - pas de bonus 50%
@@ -142,9 +152,9 @@ Documents complementaires:
 - Validation: même logique que les heures classiques (`isValid`, `isSiteValid`, bulk)
 - Vue semaine:
   - jour/nuit/atelier par jour + indicateurs repas/dîner/nuitée
-  - panier de nuit (PN): affiché par jour si nightMinutes > dayMinutes, et total hebdo dans la colonne Jour/Nuit sem.
+  - panier de nuit (PN): affiché par jour si (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit au moins 4h de travail entre 21h et 6h), et total hebdo dans la colonne Jour/Nuit sem.
   - totaux hebdo: jour, nuit, atelier, total, compteurs petit déj/déjeuner/dîner/nuitée
-  - pas de calcul d'heures supplémentaires pour les conducteurs
+  - les conducteurs utilisent `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` pour le calcul RTT (au lieu des créneaux morning/afternoon/evening)
 - Le flag `isDriver` est sur `EmployeeContractPeriod` (un employé peut changer de statut chauffeur selon la période)
 - Exposé en API via un getter virtuel sur `Employee` (`employee:read`) qui résout depuis la période active
 
@@ -184,13 +194,14 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 - Détail employé:
   - onglet `Suivi contrat` avec affichage de l'historique des périodes de contrat
   - chaque ligne expose: nature (`CDI`/`CDD`/`INTERIM`), contrat/temps de travail, date de début, date de fin (ou "En cours")
-  - action `Clôturer`:
-    - bouton actif uniquement s'il existe un contrat en cours non déjà clôturé à la date du jour
+  - action `Modifier` (clôture/solde de tout compte):
+    - bouton actif s'il existe un contrat en cours non clôturé, ou si le dernier contrat est terminé (sans contrat actif après)
     - ouvre un drawer en lecture seule (type/temps de travail/date de début)
     - champs saisissables:
-      - `contractEndDate` (prérempli à aujourd'hui)
+      - `contractEndDate` (prérempli à aujourd'hui si contrat en cours, à la date de fin existante si contrat terminé)
       - `contractPaidLeaveSettled` (checkbox "Soldé dans le solde de tout compte")
     - backend: en mode clôture, le flag `contractPaidLeaveSettled` est persisté sur la période clôturée
+    - cas du contrat déjà terminé: permet de modifier `paidLeaveSettled` et le commentaire sur le dernier contrat terminé (ex: solde de tout compte CDD)
   - action `Ajouter`:
     - conserve le flux d'ajout d'un nouveau contrat via drawer dédié
     - disponible uniquement s'il n'y a pas de contrat en cours, ou si le contrat en cours a déjà une date de fin
@@ -206,14 +217,22 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
         - en cours d'acquisition jours: `25/12 = 2,08` jours/mois
         - en cours d'acquisition samedis: `5/12 = 0,42` samedi/mois (non detaille en UI)
         - en cas de début/fin en cours de mois, l'acquisition est proratisée au nombre de jours calendaires couverts dans le mois
+        - en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22 (standard mensuel)
+        - arrêt maladie long (absences continues de type `M` > 1 mois):
+          - premier mois de maladie (date début + 1 mois calendaire): acquisition normale (`2,50`/mois)
+          - après le premier mois: acquisition réduite à `2,00`/mois (facteur `0,80` appliqué aux deux taux jours et samedis)
+          - en cas de mois partiellement couvert par la période réduite, le prorata est calculé en jours calendaires (jours normaux × taux normal + jours réduits × taux réduit)
+          - la détection est automatique à partir des absences MALADIE consécutives en base (tolérance de gap ≤ 3 jours)
         - samedis acquis affiches: uniquement `opening_saturdays` (report N-1)
       - contrat `4h`:
         - acquis annuel CP: `10`
         - acquis annuel samedi: `0`
         - en cours d'acquisition: `0.83` jour/mois
         - en cas de début/fin en cours de mois, l'acquisition est proratisée au nombre de jours calendaires couverts dans le mois
+        - en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22
       - contrat `FORFAIT`:
         - base annuelle: `jours ouvrés de l'exercice (lundi-vendredi, hors jours fériés métropole) - 218`
+        - bonus weekend/férié: chaque jour travaillé un weekend ou jour férié donne 1 jour de congé supplémentaire (journée ≥ 5h = 1.0 jour, demi-journée > 0h et < 5h = 0.5 jour), sans plafond
         - prorata: en cas de démarrage/fin de contrat en cours d'année civile, le calcul ne couvre que l'intervalle actif du contrat dans l'année
         - reste à prendre: `acquis - absences` (toutes absences, demi-journées incluses)
         - pas de samedi (`0`)
@@ -261,6 +280,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
       - base identique aux calculs d'heures supplémentaires de la vue semaine Heures
       - minutes de récupération hebdomadaires = `HS totales + bonus 25% + bonus 50%`
       - contrats `INTERIM` et suivi `PRESENCE`: récupération à `0`
+      - date limite de calcul: uniquement les semaines terminées (jusqu'au dernier dimanche), **ou** la semaine en cours si tous les jours existants sont validés RH (`isValid = true`). En cas de fin de contrat en milieu de semaine, seuls les jours jusqu'à la date de fin sont vérifiés.
     - compteur global:
       - affiché en **jours** (1 jour = 7h = 420 minutes)
     - report:
@@ -278,10 +298,33 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
       - `rate`: taux de majoration, valeurs `25` ou `50`
       - les heures payées sont soustraites du disponible RTT (`availableMinutes -= totalPaidMinutes`)
       - affichage: 2 lignes par mois dans le tableau (25% et 50%)
+    - colonnes Total 25% et Total 50%: somme base + bonus de chaque tranche
+    - ligne Report N-1 (carry rollover): affichée en juin uniquement si carry > 0
+    - ligne Report mois précédent: solde cumulé (carry N-1 + semaines antérieures − paiements antérieurs), affichée à partir de juillet (masquée si nul)
+    - Reste = Report cumulé + Total du mois − Payé du mois (balance courante en fin de mois)
     - affichage:
       - le compteur global RTT est affiché en **heures** (format `Xh00`)
 
-## 10) Récapitulatif Salaire (PDF mensuel)
+## 10) Export récap. congés & RTT (PDF)
+
+- Accessible depuis la page Employés via le bouton "Export récap. congés" (réservé `ROLE_ADMIN`)
+- Clic direct (pas de drawer), génère un PDF A4 portrait à la date du jour
+- Endpoint: `GET /api/leave-recap/print`
+- Seuls les employés avec contrat actif sont inclus
+- Données groupées par site
+
+### Colonnes du tableau
+
+| Colonne | Logique |
+|---------|---------|
+| Nom | lastName + firstName |
+| Contrat | Contract.name |
+| CP N-1 restant | CDI/CDD: acquis N-1 − pris sur N-1. Forfait: report N-1 restant |
+| Samedi restant | CDI/CDD: samedis acquis N-1 − pris. Forfait: `-` |
+| CP N | Forfait: jours acquis année civile. Non-forfait: en cours d'acquisition |
+| RTT | Minutes disponibles (report N-1 + acquis N - payés). Format `X h Y m`. Forfait et INTERIM: `-` |
+
+## 11) Récapitulatif Salaire (PDF mensuel)
 
 - Accessible depuis la page Employés via le bouton "Récap. Salaire" (réservé `ROLE_ADMIN`)
 - Sélecteur de mois (défaut = mois courant), génère un PDF A3 paysage
@@ -296,7 +339,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 | Base | Contract.name | Via EmployeeContractResolver pour le mois |
 | Jour de présence Cadre | WorkHour | Uniquement FORFAIT (PRESENCE). Somme isPresentMorning (0.5) + isPresentAfternoon (0.5) |
 | Heures de nuit | WorkHour | Non-chauffeurs: calcul intervalles nuit (00:00-06:00, 21:00-24:00). Chauffeurs: somme nightHoursMinutes |
-| Panier de nuit | WorkHour | Nombre de jours où nightMinutes > dayMinutes |
+| Panier de nuit | WorkHour | Nombre de jours où (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit 4h entre 21h-6h) |
 | Heures payés | EmployeeRttPayment | Somme base25Minutes + base50Minutes du mois, convertie en heures |
 | Congés - Nombre | Absence code 'C' | Jours (demi-journées = 0.5) |
 | Congés - Date | Absence code 'C' | Dates formatées dd/mm |
@@ -308,7 +351,47 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 | CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
 | Observations | — | Colonne vide pour saisie manuelle |
 
-## 11) Notifications
+## 12) Frais
+
+- Onglet "Frais" sur la fiche employé (icône `mdi:account-cash-outline`)
+- Entité `MileageAllowance` (table `mileage_allowances`)
+- Champs:
+  - `month` (mois, obligatoire)
+  - `kilometers` (nombre de km, optionnel)
+  - `amount` (montant en €, optionnel)
+  - `comment` (commentaire, optionnel)
+  - `receiptPath` / `receiptName` (justificatif Km, PDF)
+  - `amountReceiptPath` / `amountReceiptName` (justificatif Montant, PDF)
+- Règle de validation:
+  - le mois est obligatoire
+  - au moins un des deux champs `kilometers` ou `amount` doit être > 0
+  - les deux peuvent être remplis simultanément
+- Tableau: colonnes Mois, Nombre de Km, Montant €, Commentaire, Justif. Km, Justif. Montant
+- Deux justificatifs distincts (upload PDF uniquement):
+  - Justificatif Km : upload via `/mileage_allowances/{id}/receipt`, téléchargement via GET même URL
+  - Justificatif Montant : upload via `/mileage_allowances/{id}/amount-receipt`, téléchargement via GET même URL
+- La suppression d'un frais supprime les deux fichiers justificatifs du disque
+
+## 13) Observations
+
+- Onglet "Observation" sur la fiche employé (icône `mdi:note-text-outline`)
+- Entité `Observation` (table `observations`)
+- Champs:
+  - `month` (mois, obligatoire)
+  - `content` (texte d'observation, obligatoire)
+- Contrainte: une seule observation par mois par employé (unique sur `employee_id + month`)
+- Tableau: colonnes Mois | Observation
+- Drawer avec champs mois (`type="month"`) et textarea "Observation"
+- CRUD standard: création, modification, suppression avec confirmation
+
+## 14) Verrouillage utilisateur
+
+- Champ `isLocked` (boolean, default false) sur l'entité `User`
+- Un admin peut verrouiller/déverrouiller un utilisateur depuis la page Utilisateurs (checkbox dans le drawer)
+- Un utilisateur verrouillé ne peut plus se connecter (vérification via `UserChecker` sur les firewalls `login` et `api`)
+- Colonne "Statut" dans le tableau utilisateurs avec label "Actif" (vert) ou "Verrouillé" (rouge)
+
+## 15) Notifications
 
 - Icône cloche en topbar:
   - badge = nombre de notifications non lues
@@ -321,3 +404,31 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 - Une notification est créée uniquement quand un chef de site termine la validation complète:
   - condition: plus aucune ligne `work_hours` du site à la date concernée avec `isSiteValid = false`
   - destinataires: utilisateurs `ROLE_ADMIN`
+
+## 16) Export PDF des heures annuelles
+
+- Accessible depuis la fiche employé (bouton imprimante à droite du nom)
+- Ouvre un drawer pour choisir l'année (civile, Jan-Déc)
+- Génère un PDF avec le détail jour par jour des heures de l'employé
+- Seuls les jours avec heures saisies ou absence sont affichés
+
+### Colonnes selon le mode de suivi
+
+- **TIME (non-chauffeur)**: Date | Absence | Début matin | Fin matin | Début après-midi | Fin après-midi | Début soir | Fin soir | Total
+- **PRESENCE (forfait)**: Date | Absence | Présence matin | Présence après-midi | Total
+- **Chauffeur**: Date | Absence | Heures jour | Heures nuit | Heures atelier | Total
+
+### Changement de contrat en cours d'année
+
+- Si l'employé change de mode de suivi (TIME/PRESENCE) ou de statut chauffeur en cours d'année, le PDF affiche des sections séparées avec les colonnes adaptées à chaque période
+- Le nom du contrat est affiché en sous-titre de chaque section
+
+### Calcul du total
+
+- TIME non-chauffeur: somme des créneaux matin + après-midi + soir, plus minutes créditées des absences `countAsWorkedHours`
+- Chauffeur: `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` + minutes créditées
+- PRESENCE: 0.5 par demi-journée présente (matin/après-midi), max 1.0
+
+### Nom du fichier
+
+- Format: `{nom}_{prenom}_{annee}.pdf`

frontend/components/EmployeeYearlyHoursDrawer.vue

@@ -0,0 +1,67 @@
+<template>
+    <AppDrawer v-model="drawerOpen" title="Export heures annuelles">
+        <form class="space-y-4" @submit.prevent="handleSubmit">
+            <div>
+                <label class="text-md font-semibold text-neutral-700" for="yearly-hours-year">
+                    Année <span class="text-red-600">*</span>
+                </label>
+                <select
+                    id="yearly-hours-year"
+                    v-model="selectedYear"
+                    :class="selectFieldClass"
+                >
+                    <option v-for="y in years" :key="y" :value="y">{{ y }}</option>
+                </select>
+            </div>
+
+            <div class="flex justify-center pt-2">
+                <button
+                    type="submit"
+                    class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                >
+                    Imprimer
+                </button>
+            </div>
+        </form>
+    </AppDrawer>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import AppDrawer from '~/components/AppDrawer.vue'
+
+const props = defineProps<{
+    modelValue: boolean
+    employeeId: number
+}>()
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: boolean): void
+    (event: 'submit', year: number): void
+}>()
+
+const drawerOpen = computed({
+    get: () => props.modelValue,
+    set: (value: boolean) => emit('update:modelValue', value)
+})
+
+const currentYear = new Date().getFullYear()
+const years = Array.from({ length: 6 }, (_, i) => currentYear - i)
+const selectedYear = ref(currentYear)
+
+const baseInputClass = 'mt-2 w-full rounded-md border px-3 py-2 text-md text-neutral-900'
+const selectFieldClass = computed(() => `${baseInputClass} border-neutral-300`)
+
+const handleSubmit = () => {
+    emit('submit', selectedYear.value)
+}
+
+watch(
+    () => props.modelValue,
+    (isOpen) => {
+        if (!isOpen) {
+            selectedYear.value = currentYear
+        }
+    }
+)
+</script>

frontend/components/employees/LeaveTab.vue

@@ -1,35 +1,35 @@
 <template>
     <section class="flex h-full min-h-0 flex-col overflow-hidden pt-8">
         <div class="grid grid-cols-4 rounded-md bg-tertiary-500 text-primary-500 text-[18px] border border-primary-500">
-            <p class="col-start-1 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Année acquis :</strong> {{
+            <p class="col-start-1 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Année acquis :</strong> {{
                     formatCount(summary?.acquiredDays)
                 }} Jours
             </p>
-            <p class="col-start-2 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Pris :</strong>
+            <p class="col-start-2 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Pris :</strong>
                 {{ formatCount(isForfaitRule ? currentYearTakenDays : summary?.takenDays) }} Jours
             </p>
-            <p class="col-start-3 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Reste à prendre :</strong>
+            <p class="col-start-3 p-[10px] border-b border-r border-b-white border-r-primary-500 bg-primary-500 text-white"><strong class="uppercase font-semibold">Reste à prendre :</strong>
                 {{ formatCount(summary?.remainingDays) }} Jours
             </p>
-            <p class="col-start-4 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
+            <p class="col-start-4 p-[10px] border-b border-primary-500"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
                 {{ formatCount(summary?.accruingDays) }} Jours
             </p>
-            <p v-if="!isForfaitRule" class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Samedi acquis :</span>
+            <p v-if="!isForfaitRule" class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Samedi acquis :</span>
                 {{ formatCount(summary?.acquiredSaturdays) }} Jours
             </p>
-            <p v-else class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Année N-1 acquis :</span>
+            <p v-else class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Année N-1 acquis :</span>
                 {{ formatCount(summary?.previousYearAcquiredDays) }} Jours
             </p>
-            <p v-if="!isForfaitRule" class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
+            <p v-if="!isForfaitRule" class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
                 {{ formatCount(summary?.takenSaturdays) }} Jours
             </p>
-            <p v-if="!isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
+            <p v-if="!isForfaitRule" class="col-start-3 p-[10px] border-r border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
                 {{ formatCount(summary?.remainingSaturdays) }} Jours
             </p>
-            <p v-else class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
+            <p v-else class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
                 {{ formatCount(summary?.previousYearTakenDays) }} Jours
             </p>
-            <p v-if="isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
+            <p v-if="isForfaitRule" class="col-start-3 p-[10px] border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
                 {{ formatCount(summary?.previousYearRemainingDays) }} Jours
             </p>
             <div v-if="!isForfaitRule" class="col-start-4 p-[10px] flex gap-7 items-center">

frontend/components/employees/MileageTab.vue

@@ -2,11 +2,13 @@
     <section class="mt-8">
         <div class="overflow-hidden bg-white">
             <div
-                class="grid grid-cols-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
+                class="grid grid-cols-6 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
                 <p>Mois</p>
                 <p>Nombre de Km</p>
+                <p>Montant €</p>
                 <p>Commentaire</p>
-                <p>Justificatif</p>
+                <p>Justif. Km</p>
+                <p>Justif. Montant</p>
             </div>
             <div v-if="allowances.length === 0" class="px-6 py-4 text-[20px] font-bold text-primary-500 border-x border-b border-primary-500 rounded-b-md">
                 Aucun frais kilométrique.
@@ -15,22 +17,36 @@
                 <div
                     v-for="item in allowances"
                     :key="item.id"
-                    class="grid grid-cols-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
+                    class="grid grid-cols-6 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
                     @click="onOpenEditDrawer(item)"
                 >
                     <p>{{ formatMonth(item.month) }}</p>
                     <p>{{ item.kilometers }}</p>
+                    <p>{{ item.amount ? item.amount + ' €' : '-' }}</p>
                     <p>{{ item.comment ?? '-' }}</p>
-                    <p>
+                    <p class="min-w-0">
                         <a
                             v-if="item.receiptPath"
-                            :href="getReceiptUrl(props.apiBase, item.id)"
+                            :href="getKmReceiptUrl(props.apiBase, item.id)"
                             target="_blank"
                             class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
                             @click.stop
                         >
-                            <Icon name="mdi:file-download-outline" size="20"/>
-                            <span>{{ item.receiptName ?? 'Télécharger' }}</span>
+                            <Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
+                            <span class="truncate">{{ item.receiptName ?? 'Télécharger' }}</span>
+                        </a>
+                        <span v-else>-</span>
+                    </p>
+                    <p class="min-w-0">
+                        <a
+                            v-if="item.amountReceiptPath"
+                            :href="getAmountReceiptUrl(props.apiBase, item.id)"
+                            target="_blank"
+                            class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
+                            @click.stop
+                        >
+                            <Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
+                            <span class="truncate">{{ item.amountReceiptName ?? 'Télécharger' }}</span>
                         </a>
                         <span v-else>-</span>
                     </p>
@@ -48,7 +64,7 @@
         </div>
 
 
-        <AppDrawer v-model="isDrawerOpen" title="Frais Kms">
+        <AppDrawer v-model="isDrawerOpen" title="Frais">
             <form class="space-y-4" @submit.prevent="onSubmit">
                 <div>
                     <label class="text-md font-semibold text-neutral-700" for="mileage-month">
@@ -64,7 +80,7 @@
 
                 <div>
                     <label class="text-md font-semibold text-neutral-700" for="mileage-kilometers">
-                        Nombre de Km <span class="text-red-600">*</span>
+                        Nombre de Km
                     </label>
                     <input
                         id="mileage-kilometers"
@@ -77,20 +93,53 @@
                 </div>
 
                 <div>
-                    <label class="text-md font-semibold text-neutral-700" for="mileage-receipt">
-                        Justificatif
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-amount">
+                        Montant (€)
+                    </label>
+                    <input
+                        id="mileage-amount"
+                        v-model.number="form.amount"
+                        type="number"
+                        step="0.01"
+                        min="0"
+                        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"
+                    />
+                    <p class="mt-1 text-sm text-neutral-500">Au moins un des deux champs doit être rempli</p>
+                </div>
+
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-km-receipt">
+                        Justificatif Km
                     </label>
                     <div v-if="isEditing && editingItem?.receiptName" class="mt-1 text-sm text-neutral-500">
                         Fichier actuel : {{ editingItem.receiptName }}
                     </div>
                     <input
-                        id="mileage-receipt"
-                        ref="fileInput"
+                        id="mileage-km-receipt"
+                        ref="kmFileInput"
                         type="file"
                         class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
-                        @change="onFileChange"
+                        @change="onKmFileChange"
                     />
-                    <p v-if="fileError" class="mt-1 text-sm text-red-600">{{ fileError }}</p>
+                    <p v-if="kmFileError" class="mt-1 text-sm text-red-600">{{ kmFileError }}</p>
+                    <p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
+                </div>
+
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-amount-receipt">
+                        Justificatif Montant
+                    </label>
+                    <div v-if="isEditing && editingItem?.amountReceiptName" class="mt-1 text-sm text-neutral-500">
+                        Fichier actuel : {{ editingItem.amountReceiptName }}
+                    </div>
+                    <input
+                        id="mileage-amount-receipt"
+                        ref="amountFileInput"
+                        type="file"
+                        class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
+                        @change="onAmountFileChange"
+                    />
+                    <p v-if="amountFileError" class="mt-1 text-sm text-red-600">{{ amountFileError }}</p>
                     <p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
                 </div>
 
@@ -139,7 +188,7 @@
 
 <script setup lang="ts">
 import type {MileageAllowance} from '~/services/dto/mileage-allowance'
-import {getReceiptUrl} from '~/services/mileage-allowances'
+import {getKmReceiptUrl, getAmountReceiptUrl} from '~/services/mileage-allowances'
 import AppDrawer from '~/components/AppDrawer.vue'
 
 const props = defineProps<{
@@ -148,17 +197,20 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-    (event: 'create', data: { month: string; kilometers: number; comment?: string }, file?: File): void
-    (event: 'update', id: number, data: { month: string; kilometers: number; comment?: string }, file?: File): void
+    (event: 'create', data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
+    (event: 'update', id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
     (event: 'delete', id: number): void
 }>()
 
 const isDrawerOpen = ref(false)
 const isEditing = ref(false)
 const editingItem = ref<MileageAllowance | null>(null)
-const selectedFile = ref<File | undefined>(undefined)
-const fileInput = ref<HTMLInputElement | null>(null)
-const fileError = ref('')
+const selectedKmFile = ref<File | undefined>(undefined)
+const selectedAmountFile = ref<File | undefined>(undefined)
+const kmFileInput = ref<HTMLInputElement | null>(null)
+const amountFileInput = ref<HTMLInputElement | null>(null)
+const kmFileError = ref('')
+const amountFileError = ref('')
 
 const currentYearMonth = () => {
     const now = new Date()
@@ -168,11 +220,12 @@ const currentYearMonth = () => {
 const form = reactive({
     month: currentYearMonth(),
     kilometers: 0,
+    amount: 0,
     comment: ''
 })
 
 const isFormValid = computed(() => {
-    return form.month && form.kilometers > 0 && !fileError.value
+    return form.month && (form.kilometers > 0 || form.amount > 0) && !kmFileError.value && !amountFileError.value
 })
 
 const monthLabels: Record<number, string> = {
@@ -201,11 +254,17 @@ const formatMonth = (dateStr: string): string => {
 const resetForm = () => {
     form.month = currentYearMonth()
     form.kilometers = 0
+    form.amount = 0
     form.comment = ''
-    selectedFile.value = undefined
-    fileError.value = ''
-    if (fileInput.value) {
-        fileInput.value.value = ''
+    selectedKmFile.value = undefined
+    selectedAmountFile.value = undefined
+    kmFileError.value = ''
+    amountFileError.value = ''
+    if (kmFileInput.value) {
+        kmFileInput.value.value = ''
+    }
+    if (amountFileInput.value) {
+        amountFileInput.value.value = ''
     }
 }
 
@@ -222,38 +281,57 @@ const onOpenEditDrawer = (item: MileageAllowance) => {
     // Extract YYYY-MM from YYYY-MM-DD
     form.month = item.month.substring(0, 7)
     form.kilometers = item.kilometers
+    form.amount = item.amount
     form.comment = item.comment ?? ''
-    selectedFile.value = undefined
-    if (fileInput.value) {
-        fileInput.value.value = ''
+    selectedKmFile.value = undefined
+    selectedAmountFile.value = undefined
+    if (kmFileInput.value) {
+        kmFileInput.value.value = ''
+    }
+    if (amountFileInput.value) {
+        amountFileInput.value.value = ''
     }
     isDrawerOpen.value = true
 }
 
-const onFileChange = (event: Event) => {
+const onKmFileChange = (event: Event) => {
     const target = event.target as HTMLInputElement
     const file = target.files?.[0]
     if (file && file.type !== 'application/pdf') {
-        fileError.value = 'Seuls les fichiers PDF sont acceptés.'
-        selectedFile.value = undefined
+        kmFileError.value = 'Seuls les fichiers PDF sont acceptés.'
+        selectedKmFile.value = undefined
         target.value = ''
         return
     }
-    fileError.value = ''
-    selectedFile.value = file ?? undefined
+    kmFileError.value = ''
+    selectedKmFile.value = file ?? undefined
+}
+
+const onAmountFileChange = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    const file = target.files?.[0]
+    if (file && file.type !== 'application/pdf') {
+        amountFileError.value = 'Seuls les fichiers PDF sont acceptés.'
+        selectedAmountFile.value = undefined
+        target.value = ''
+        return
+    }
+    amountFileError.value = ''
+    selectedAmountFile.value = file ?? undefined
 }
 
 const onSubmit = () => {
     const data = {
         month: `${form.month}-01`,
         kilometers: form.kilometers,
+        amount: form.amount,
         comment: form.comment || undefined
     }
 
     if (isEditing.value && editingItem.value) {
-        emit('update', editingItem.value.id, data, selectedFile.value)
+        emit('update', editingItem.value.id, data, selectedKmFile.value, selectedAmountFile.value)
     } else {
-        emit('create', data, selectedFile.value)
+        emit('create', data, selectedKmFile.value, selectedAmountFile.value)
     }
     isDrawerOpen.value = false
 }

frontend/components/employees/ObservationTab.vue

@@ -0,0 +1,187 @@
+<template>
+    <section class="mt-8">
+        <div class="overflow-hidden bg-white">
+            <div
+                class="grid grid-cols-2 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
+                <p>Mois</p>
+                <p>Observation</p>
+            </div>
+            <div v-if="observations.length === 0" class="px-6 py-4 text-[20px] font-bold text-primary-500 border-x border-b border-primary-500 rounded-b-md">
+                Aucune observation.
+            </div>
+            <div v-else class="border-x border-b border-primary-500 rounded-b-md">
+                <div
+                    v-for="item in observations"
+                    :key="item.id"
+                    class="grid grid-cols-2 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
+                    @click="onOpenEditDrawer(item)"
+                >
+                    <p>{{ formatMonth(item.month) }}</p>
+                    <p class="truncate">{{ item.content }}</p>
+                </div>
+            </div>
+        </div>
+        <div class="flex justify-center mb-4 mt-8">
+            <button
+                type="button"
+                class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md text-white disabled:cursor-not-allowed disabled:opacity-50"
+                @click="onOpenCreateDrawer"
+            >
+                + Ajouter
+            </button>
+        </div>
+
+        <AppDrawer v-model="isDrawerOpen" :title="isEditing ? 'Modification observation' : 'Nouvelle observation'">
+            <form class="space-y-4" @submit.prevent="onSubmit">
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="observation-month">
+                        Mois <span class="text-red-600">*</span>
+                    </label>
+                    <input
+                        id="observation-month"
+                        v-model="form.month"
+                        type="month"
+                        class="capitalize 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"
+                    />
+                </div>
+
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="observation-content">
+                        Observation <span class="text-red-600">*</span>
+                    </label>
+                    <textarea
+                        id="observation-content"
+                        v-model="form.content"
+                        rows="5"
+                        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="Observation..."
+                    />
+                </div>
+
+                <div v-if="isEditing" class="grid grid-cols-2 gap-3 pt-2">
+                    <button
+                        type="button"
+                        class="flex items-center justify-center rounded-md bg-red-500 px-4 py-2 text-md font-semibold text-white hover:bg-red-600"
+                        @click="onDelete"
+                    >
+                        Supprimer
+                    </button>
+                    <button
+                        type="submit"
+                        class="flex items-center justify-center rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500 disabled:cursor-not-allowed disabled:opacity-50"
+                        :disabled="!isFormValid"
+                    >
+                        Modifier
+                    </button>
+                </div>
+                <div v-else class="flex justify-center pt-2">
+                    <button
+                        type="submit"
+                        class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500 disabled:cursor-not-allowed disabled:opacity-50"
+                        :disabled="!isFormValid"
+                    >
+                        + Ajouter
+                    </button>
+                </div>
+            </form>
+        </AppDrawer>
+    </section>
+</template>
+
+<script setup lang="ts">
+import type { Observation } from '~/services/dto/observation'
+import AppDrawer from '~/components/AppDrawer.vue'
+
+const props = defineProps<{
+    observations: Observation[]
+}>()
+
+const emit = defineEmits<{
+    (event: 'create', data: { month: string; content: string }): void
+    (event: 'update', id: number, data: { month: string; content: string }): void
+    (event: 'delete', id: number): void
+}>()
+
+const isDrawerOpen = ref(false)
+const isEditing = ref(false)
+const editingItem = ref<Observation | null>(null)
+
+const currentYearMonth = () => {
+    const now = new Date()
+    return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
+}
+
+const form = reactive({
+    month: currentYearMonth(),
+    content: ''
+})
+
+const isFormValid = computed(() => {
+    return form.month && form.content.trim().length > 0
+})
+
+const monthLabels: Record<number, string> = {
+    1: 'Janvier',
+    2: 'Février',
+    3: 'Mars',
+    4: 'Avril',
+    5: 'Mai',
+    6: 'Juin',
+    7: 'Juillet',
+    8: 'Août',
+    9: 'Septembre',
+    10: 'Octobre',
+    11: 'Novembre',
+    12: 'Décembre'
+}
+
+const formatMonth = (dateStr: string): string => {
+    const date = new Date(dateStr)
+    if (Number.isNaN(date.getTime())) return dateStr
+    const month = date.getMonth() + 1
+    const year = date.getFullYear()
+    return `${monthLabels[month]} ${year}`
+}
+
+const resetForm = () => {
+    form.month = currentYearMonth()
+    form.content = ''
+}
+
+const onOpenCreateDrawer = () => {
+    isEditing.value = false
+    editingItem.value = null
+    resetForm()
+    isDrawerOpen.value = true
+}
+
+const onOpenEditDrawer = (item: Observation) => {
+    isEditing.value = true
+    editingItem.value = item
+    form.month = item.month.substring(0, 7)
+    form.content = item.content
+    isDrawerOpen.value = true
+}
+
+const onSubmit = () => {
+    const data = {
+        month: `${form.month}-01`,
+        content: form.content
+    }
+
+    if (isEditing.value && editingItem.value) {
+        emit('update', editingItem.value.id, data)
+    } else {
+        emit('create', data)
+    }
+    isDrawerOpen.value = false
+}
+
+const onDelete = () => {
+    if (!editingItem.value) return
+    const ok = window.confirm('Supprimer cette observation ?')
+    if (!ok) return
+    emit('delete', editingItem.value.id)
+    isDrawerOpen.value = false
+}
+</script>

frontend/components/employees/RttTab.vue

@@ -22,8 +22,8 @@
         </button>
       </div>
       <p class="text-[16px]">
-        <span class="font-bold">RTT À LA DATE DU JOUR :</span>
-        {{ formatMinutes(summary?.availableMinutes ?? 0) }}
+        <span class="font-bold">RTT À LA SEMAINE {{ lastCompleteWeek }} : </span>
+        <span class="font-bold">{{ formatMinutes(summary?.availableMinutes ?? 0) }}</span>
       </p>
         <div class="flex justify-center">
             <button
@@ -40,34 +40,53 @@
       <table class="w-full table-fixed border-collapse text-[18px]">
         <colgroup>
           <col />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
         </colgroup>
         <thead>
           <tr>
             <th class="px-5 py-[10px] text-left font-bold text-primary-500 border border-primary-500">Semaine</th>
             <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Heure</th>
             <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Base</th>
-            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">25%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">25%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Total 25%</th>
             <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Base</th>
-            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">50%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">50%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Total 50%</th>
             <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Total</th>
           </tr>
         </thead>
         <tbody>
-          <!-- Report row (only on June when carry > 0) -->
-          <tr v-if="showReportRow">
+          <!-- Report N-1 row (RTT rollover carry, June only) -->
+          <tr v-if="showCarryRow" class="bg-tertiary-500">
             <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
             <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBonus25Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBonus50Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryFromPreviousYearMinutes) }}</span></td>
+          </tr>
+
+          <!-- Report mois précédent (cumulated balance from previous months, July+) -->
+          <tr v-if="showMonthReportRow" class="bg-tertiary-500">
+            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
+            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total) }}</span></td>
           </tr>
 
           <!-- Week rows (always 5) -->
@@ -84,19 +103,27 @@
               <span v-else>0 h</span>
             </td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
-              <span v-if="week">{{ formatMinutes(week.base25Minutes) }}</span>
-              <span v-else>0 h</span>
-            </td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
-              <span v-if="week">{{ formatMinutes(week.bonus25Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.base25Minutes : 0) }}</span>
               <span v-else>0 h</span>
             </td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
-              <span v-if="week">{{ formatMinutes(week.base50Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.bonus25Minutes : 0) }}</span>
               <span v-else>0 h</span>
             </td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
-              <span v-if="week">{{ formatMinutes(week.bonus50Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.base25Minutes + week.bonus25Minutes) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.base50Minutes : 0) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.bonus50Minutes : 0) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
+              <span v-if="week">{{ formatMinutes(week.base50Minutes + week.bonus50Minutes) }}</span>
               <span v-else>0 h</span>
             </td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
@@ -110,9 +137,11 @@
             <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500 border-t-2">Total</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.overtime) }}</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.base25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.bonus25) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.bonus25) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.total25) }}</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.base50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.bonus50) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.bonus50) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.total50) }}</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.total) }}</td>
           </tr>
 
@@ -121,9 +150,11 @@
             <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Payé</td>
             <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBase25Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus25Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus25Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase25Minutes + currentPayment.paidBonus25Minutes)) : '0 h' }}</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBase50Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase50Minutes + currentPayment.paidBonus50Minutes)) : '0 h' }}</td>
             <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(paidTotal) }}</td>
           </tr>
 
@@ -131,11 +162,13 @@
           <tr>
             <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Reste</td>
             <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(totals.base25 - (currentPayment?.paidBase25Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(totals.bonus25 - (currentPayment?.paidBonus25Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(totals.base50 - (currentPayment?.paidBase50Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(totals.bonus50 - (currentPayment?.paidBonus50Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(resteTotal) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total) }}</span></td>
           </tr>
         </tbody>
       </table>
@@ -225,6 +258,17 @@ const emit = defineEmits<{
   (event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
 }>()
 
+// --- Last complete week number ---
+
+const lastCompleteWeek = computed(() => {
+  const now = new Date()
+  const startOfYear = new Date(now.getFullYear(), 0, 1)
+  const dayOfYear = Math.floor((now.getTime() - startOfYear.getTime()) / 86400000) + 1
+  const dayOfWeek = now.getDay() || 7 // Monday = 1, Sunday = 7
+  const currentWeek = Math.ceil((dayOfYear - dayOfWeek + 10) / 7)
+  return currentWeek - 1
+})
+
 // --- Month navigation ---
 
 const orderedMonths = [6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5] as const
@@ -290,44 +334,113 @@ const paddedWeeks = computed((): (EmployeeRttWeekSummary | null)[] => {
   return padded
 })
 
-// --- Report row ---
+// --- Carry row (RTT rollover from previous year, June only) ---
 
-const reportMonth = computed(() => {
+const carryMonth = computed(() => {
   if (!props.summary) return 6
-  const carryMonth = props.summary.carryMonth
-  // Report appears in the month AFTER carryMonth (wrapping 12 -> 1)
-  return carryMonth >= 12 ? 1 : carryMonth + 1
+  const cm = props.summary.carryMonth
+  return cm >= 12 ? 1 : cm + 1
 })
 
-const showReportRow = computed(() => {
-  return (
-    currentMonth.value === reportMonth.value &&
-    (props.summary?.carryFromPreviousYearMinutes ?? 0) > 0
-  )
+const showCarryRow = computed(() => {
+  if (currentMonth.value !== carryMonth.value) return false
+  if ((props.summary?.carryFromPreviousYearMinutes ?? 0) === 0) return false
+
+  // On the first exercise, hide carry if carry month is before rttStartDate
+  if (props.summary?.rttStartDate) {
+    const startDate = new Date(props.summary.rttStartDate)
+    const viewYear = currentMonth.value >= 6 ? props.summary.year - 1 : props.summary.year
+    const viewDate = new Date(viewYear, currentMonth.value - 1, 1)
+    const startMonthDate = new Date(startDate.getFullYear(), startDate.getMonth(), 1)
+    if (viewDate < startMonthDate) return false
+  }
+
+  return true
 })
 
-// --- Totals ---
+// --- Month report row (cumulated balance from previous months) ---
+
+// Months of the exercise in order, starting from the carry month
+const exerciseMonths = computed((): number[] => {
+  const start = carryMonth.value
+  const startIdx = orderedMonths.indexOf(start as (typeof orderedMonths)[number])
+  if (startIdx === -1) return [...orderedMonths]
+  return [...orderedMonths.slice(startIdx), ...orderedMonths.slice(0, startIdx)]
+})
+
+const monthReport = computed(() => {
+  if (!props.summary) return { base25: 0, bonus25: 0, total25: 0, base50: 0, bonus50: 0, total50: 0, total: 0 }
+
+  const cm = currentMonth.value
+  const cmIdx = exerciseMonths.value.indexOf(cm)
+  const previousMonths = exerciseMonths.value.slice(0, cmIdx)
+
+  // Start from carry (included in the cumulation)
+  let base25 = props.summary.carryBase25Minutes
+  let bonus25 = props.summary.carryBonus25Minutes
+  let base50 = props.summary.carryBase50Minutes
+  let bonus50 = props.summary.carryBonus50Minutes
+  let total = props.summary.carryFromPreviousYearMinutes
+
+  // Add weeks from previous months
+  for (const w of props.summary.weeks) {
+    if (previousMonths.includes(w.month)) {
+      base25 += w.base25Minutes
+      bonus25 += w.bonus25Minutes
+      base50 += w.base50Minutes
+      bonus50 += w.bonus50Minutes
+      total += w.totalMinutes
+    }
+  }
+
+  // Subtract payments from previous months
+  for (const p of props.summary.monthPayments) {
+    if (previousMonths.includes(p.month)) {
+      base25 -= p.paidBase25Minutes
+      bonus25 -= p.paidBonus25Minutes
+      base50 -= p.paidBase50Minutes
+      bonus50 -= p.paidBonus50Minutes
+      total -= (p.paidBase25Minutes + p.paidBonus25Minutes + p.paidBase50Minutes + p.paidBonus50Minutes)
+    }
+  }
+
+  return { base25, bonus25, total25: base25 + bonus25, base50, bonus50, total50: base50 + bonus50, total }
+})
+
+const showMonthReportRow = computed(() => {
+  // Not on the carry month — carry row handles that
+  if (currentMonth.value === carryMonth.value) return false
+
+  // On the first exercise (containing rttStartDate), hide report for months before the start date
+  if (props.summary?.rttStartDate) {
+    const startDate = new Date(props.summary.rttStartDate)
+    const startYear = startDate.getFullYear()
+    const startMonth = startDate.getMonth() + 1
+    const viewYear = currentMonth.value >= 6 ? props.summary.year - 1 : props.summary.year
+    const viewDate = new Date(viewYear, currentMonth.value - 1, 1)
+    const startMonthDate = new Date(startYear, startMonth - 1, 1)
+    if (viewDate < startMonthDate) return false
+  }
+
+  const r = monthReport.value
+  return r.total !== 0
+})
+
+// --- Totals (current month weeks only) ---
 
 const totals = computed(() => {
   const weeks = weeksForCurrentMonth.value
-  const base = {
+  const positive = weeks.filter((w) => w.totalMinutes >= 0)
+  return {
     overtime: weeks.reduce((s, w) => s + w.overtimeMinutes, 0),
-    base25: weeks.reduce((s, w) => s + w.base25Minutes, 0),
-    bonus25: weeks.reduce((s, w) => s + w.bonus25Minutes, 0),
-    base50: weeks.reduce((s, w) => s + w.base50Minutes, 0),
-    bonus50: weeks.reduce((s, w) => s + w.bonus50Minutes, 0),
+    base25: positive.reduce((s, w) => s + w.base25Minutes, 0),
+    bonus25: positive.reduce((s, w) => s + w.bonus25Minutes, 0),
+    total25: weeks.reduce((s, w) => s + w.base25Minutes + w.bonus25Minutes, 0),
+    base50: positive.reduce((s, w) => s + w.base50Minutes, 0),
+    bonus50: positive.reduce((s, w) => s + w.bonus50Minutes, 0),
+    total50: weeks.reduce((s, w) => s + w.base50Minutes + w.bonus50Minutes, 0),
     total: weeks.reduce((s, w) => s + w.totalMinutes, 0),
   }
-
-  if (showReportRow.value && props.summary) {
-    base.base25 += props.summary.carryBase25Minutes
-    base.bonus25 += props.summary.carryBonus25Minutes
-    base.base50 += props.summary.carryBase50Minutes
-    base.bonus50 += props.summary.carryBonus50Minutes
-    base.total += props.summary.carryFromPreviousYearMinutes
-  }
-
-  return base
 })
 
 const currentPayment = computed(() => {
@@ -341,8 +454,19 @@ const paidTotal = computed(() => {
   return -(p.paidBase25Minutes + p.paidBonus25Minutes + p.paidBase50Minutes + p.paidBonus50Minutes)
 })
 
-const resteTotal = computed(() => {
-  return totals.value.total + paidTotal.value
+const reste = computed(() => {
+  const total25 = monthReport.value.total25 + totals.value.total25
+    - (currentPayment.value?.paidBase25Minutes ?? 0) - (currentPayment.value?.paidBonus25Minutes ?? 0)
+  const total50 = monthReport.value.total50 + totals.value.total50
+    - (currentPayment.value?.paidBase50Minutes ?? 0) - (currentPayment.value?.paidBonus50Minutes ?? 0)
+
+  const base25 = Math.round(total25 / 1.25)
+  const bonus25 = total25 - base25
+  const base50 = Math.round(total50 / 1.5)
+  const bonus50 = total50 - base50
+  const total = monthReport.value.total + totals.value.total + paidTotal.value
+
+  return { base25, bonus25, total25, base50, bonus50, total50, total }
 })
 
 // --- Format ---
@@ -357,6 +481,11 @@ const formatMinutes = (minutes: number): string => {
   return `${sign}${hours} h ${rest} m`
 }
 
+const formatCentiemes = (minutes: number): string => {
+  const value = minutes / 60
+  return value.toFixed(2).replace('.', ',')
+}
+
 // --- Payment drawer ---
 
 const isPaymentDrawerOpen = ref(false)

frontend/composables/useEmployeeContract.ts

@@ -71,6 +71,17 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     return history.find((item) => item.startDate <= today && (!item.endDate || item.endDate >= today)) ?? null
   })
 
+  const lastEndedContractPeriod = computed(() => {
+    if (currentActiveContractPeriod.value) return null
+    const today = getTodayYmd()
+    const history = employee.value?.contractHistory ?? []
+    const ended = history.filter((item) => item.endDate && item.endDate < today)
+    if (ended.length === 0) return null
+    return ended.reduce((latest, item) => (item.endDate! > latest.endDate! ? item : latest))
+  })
+
+  const editableContractPeriod = computed(() => currentActiveContractPeriod.value ?? lastEndedContractPeriod.value)
+
   const currentActiveContractPeriodId = computed<number | null>(() => {
     const period = currentActiveContractPeriod.value
     return period?.periodId ?? null
@@ -78,13 +89,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
 
   const canCloseCurrentContract = computed(() => {
     const active = currentActiveContractPeriod.value
-    if (!active) return false
-    if (!active.endDate) return true
-    return active.endDate > getTodayYmd()
+    if (active) {
+      if (!active.endDate) return true
+      return active.endDate > getTodayYmd()
+    }
+    return !!lastEndedContractPeriod.value
   })
 
   const canCreateContract = computed(() => {
-    const active = currentActiveContractPeriod.value
+    const active = editableContractPeriod.value
     if (!active) return true
     return !!active.endDate
   })
@@ -135,15 +148,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
 
   const hydrateContractFormFromCurrent = () => {
     const current = employee.value
-    const active = currentActiveContractPeriod.value
-    if (!current || !active) return
+    const period = editableContractPeriod.value
+    if (!current || !period) return
 
-    contractForm.contractId = active.contractId ?? current.contract?.id ?? ''
-    contractForm.contractName = active.contractName ?? current.contract?.name ?? ''
-    contractForm.weeklyHours = active.weeklyHours ?? current.contract?.weeklyHours ?? null
-    contractForm.contractNature = active.contractNature
-    contractForm.startDate = active.startDate
-    contractForm.endDate = getTodayYmd()
+    contractForm.contractId = period.contractId ?? current.contract?.id ?? ''
+    contractForm.contractName = period.contractName ?? current.contract?.name ?? ''
+    contractForm.weeklyHours = period.weeklyHours ?? current.contract?.weeklyHours ?? null
+    contractForm.contractNature = period.contractNature
+    contractForm.startDate = period.startDate
+    contractForm.endDate = period.endDate ?? getTodayYmd()
     contractForm.paidLeaveSettled = false
     contractForm.comment = ''
   }
@@ -173,8 +186,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     createContractForm.contractNature = 'CDI'
     createContractForm.endDate = ''
     createContractForm.isDriver = false
-    createContractForm.startDate = currentActiveContractPeriod.value?.endDate
-      ? (shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate)
+    createContractForm.startDate = editableContractPeriod.value?.endDate
+      ? (shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate)
       : getTodayYmd()
     resetCreateValidation()
     isCreateContractDrawerOpen.value = true
@@ -185,15 +198,16 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
   }
 
   const submitContractUpdate = async () => {
-    if (!employee.value || isContractSubmitting.value || !currentActiveContractPeriod.value) return
+    const period = editableContractPeriod.value
+    if (!employee.value || isContractSubmitting.value || !period) return
 
     validationTouched.endDate = true
     if (!isContractEndDateValid.value) return
 
-    if (contractForm.endDate < currentActiveContractPeriod.value.startDate) {
+    if (contractForm.endDate < period.startDate) {
       toast.error({
         title: 'Erreur',
-        message: `La date de fin doit être postérieure au ${formatDate(currentActiveContractPeriod.value.startDate)}.`
+        message: `La date de fin doit être postérieure au ${formatDate(period.startDate)}.`
       })
       return
     }
@@ -226,8 +240,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     createValidationTouched.endDate = true
     if (!isCreateContractFormValid.value) return
 
-    if (currentActiveContractPeriod.value?.endDate) {
-      const minStartDate = shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate
+    if (editableContractPeriod.value?.endDate) {
+      const minStartDate = shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate
       if (createContractForm.startDate < minStartDate) {
         toast.error({
           title: 'Erreur',

frontend/composables/useEmployeeDetailPage.ts

@@ -6,7 +6,7 @@ export const useEmployeeDetailPage = () => {
   const route = useRoute()
   const employee = ref<Employee | null>(null)
   const isLoading = ref(false)
-  const activeTab = ref<'contract' | 'leave' | 'rtt' | 'mileage' | 'bonus'>('contract')
+  const activeTab = ref<'contract' | 'leave' | 'rtt' | 'mileage' | 'bonus' | 'observation'>('contract')
 
   const showLeaveTab = computed(() => employee.value?.currentContractNature !== 'INTERIM')
   const showRttTab = computed(() => employee.value?.contract?.type !== CONTRACT_TYPES.FORFAIT)
@@ -40,6 +40,7 @@ export const useEmployeeDetailPage = () => {
       rtt.resetLoaded()
       mileage.resetLoaded()
       bonus.resetLoaded()
+      observation.resetLoaded()
 
       if (activeTab.value === 'leave' && showLeaveTab.value) {
         await leave.loadLeaveData()
@@ -49,6 +50,8 @@ export const useEmployeeDetailPage = () => {
         await mileage.loadMileageData()
       } else if (activeTab.value === 'bonus') {
         await bonus.loadBonusData()
+      } else if (activeTab.value === 'observation') {
+        await observation.loadObservationData()
       }
     } finally {
       isLoading.value = false
@@ -60,6 +63,7 @@ export const useEmployeeDetailPage = () => {
   const rtt = useEmployeeRtt(employee, loadEmployee)
   const mileage = useEmployeeMileage(employee, loadEmployee)
   const bonus = useEmployeeBonus(employee, loadEmployee)
+  const observation = useEmployeeObservation(employee, loadEmployee)
 
   watch(activeTab, (tab) => {
     if (tab === 'leave' && !leave.leaveDataLoaded.value && showLeaveTab.value) {
@@ -70,6 +74,8 @@ export const useEmployeeDetailPage = () => {
       mileage.loadMileageData()
     } else if (tab === 'bonus' && !bonus.bonusDataLoaded.value) {
       bonus.loadBonusData()
+    } else if (tab === 'observation' && !observation.observationDataLoaded.value) {
+      observation.loadObservationData()
     }
   })
 
@@ -89,6 +95,7 @@ export const useEmployeeDetailPage = () => {
     ...leave,
     ...rtt,
     ...mileage,
-    ...bonus
+    ...bonus,
+    ...observation
   }
 }

frontend/composables/useEmployeeMileage.ts

@@ -6,7 +6,8 @@ import {
   createMileageAllowance,
   updateMileageAllowance,
   deleteMileageAllowance,
-  uploadReceipt
+  uploadKmReceipt,
+  uploadAmountReceipt
 } from '~/services/mileage-allowances'
 
 export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
@@ -32,24 +33,33 @@ export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmploye
     mileageDataLoaded.value = false
   }
 
-  const submitCreateMileage = async (data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+  const submitCreateMileage = async (data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
     if (!employee.value) return
     const result = await createMileageAllowance({
       employeeId: employee.value.id,
       month: data.month,
       kilometers: data.kilometers,
+      amount: data.amount,
       comment: data.comment
     })
-    if (file && result?.id) {
-      await uploadReceipt(apiBase, result.id, file)
+    if (result?.id) {
+      if (kmFile) {
+        await uploadKmReceipt(apiBase, result.id, kmFile)
+      }
+      if (amountFile) {
+        await uploadAmountReceipt(apiBase, result.id, amountFile)
+      }
     }
     await reloadEmployee()
   }
 
-  const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+  const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
     await updateMileageAllowance(id, data)
-    if (file) {
-      await uploadReceipt(apiBase, id, file)
+    if (kmFile) {
+      await uploadKmReceipt(apiBase, id, kmFile)
+    }
+    if (amountFile) {
+      await uploadAmountReceipt(apiBase, id, amountFile)
     }
     await reloadEmployee()
   }

frontend/composables/useEmployeeObservation.ts

@@ -0,0 +1,61 @@
+import type { Ref } from 'vue'
+import type { Observation } from '~/services/dto/observation'
+import type { Employee } from '~/services/dto/employee'
+import {
+  listObservations,
+  createObservation,
+  updateObservation,
+  deleteObservation
+} from '~/services/observations'
+
+export const useEmployeeObservation = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
+  const observations = ref<Observation[]>([])
+  const isObservationLoading = ref(false)
+  const observationDataLoaded = ref(false)
+
+  const loadObservationData = async () => {
+    if (!employee.value || isObservationLoading.value) return
+    isObservationLoading.value = true
+    try {
+      observations.value = await listObservations(employee.value.id)
+      observationDataLoaded.value = true
+    } finally {
+      isObservationLoading.value = false
+    }
+  }
+
+  const resetLoaded = () => {
+    observationDataLoaded.value = false
+  }
+
+  const submitCreateObservation = async (data: { month: string; content: string }) => {
+    if (!employee.value) return
+    await createObservation({
+      employeeId: employee.value.id,
+      month: data.month,
+      content: data.content
+    })
+    await reloadEmployee()
+  }
+
+  const submitUpdateObservation = async (id: number, data: { month: string; content: string }) => {
+    await updateObservation(id, data)
+    await reloadEmployee()
+  }
+
+  const submitDeleteObservation = async (id: number) => {
+    await deleteObservation(id)
+    await reloadEmployee()
+  }
+
+  return {
+    observations,
+    isObservationLoading,
+    observationDataLoaded,
+    loadObservationData,
+    resetLoaded,
+    submitCreateObservation,
+    submitUpdateObservation,
+    submitDeleteObservation
+  }
+}

frontend/composables/useHoursPage.ts

@@ -1045,7 +1045,7 @@ export const useHoursPage = () => {
     isSubmitting.value = true
     try {
       const entries = employees.value
-        .filter((employee) => hasContractAtSelectedDate(employee.id))
+        .filter((employee) => hasContractAtSelectedDate(employee.id) && !isRowLocked(employee.id))
         .map((employee) => {
         const employeeId = employee.id
         const row = rows.value[employeeId] ?? emptyRow()

frontend/i18n/locales/fr.json

@@ -46,6 +46,11 @@
             "create": "Impossible de créer la prime.",
             "update": "Impossible de mettre à jour la prime.",
             "delete": "Impossible de supprimer la prime."
+        },
+        "observation": {
+            "create": "Impossible de créer l'observation.",
+            "update": "Impossible de mettre à jour l'observation.",
+            "delete": "Impossible de supprimer l'observation."
         }
     },
     "success": {
@@ -87,6 +92,11 @@
             "create": "Prime créée.",
             "update": "Prime mise à jour.",
             "delete": "Prime supprimée."
+        },
+        "observation": {
+            "create": "Observation créée.",
+            "update": "Observation mise à jour.",
+            "delete": "Observation supprimée."
         }
     }
 }

frontend/pages/employees/[id].vue

@@ -13,7 +13,16 @@
         <div v-else class="flex min-h-0 flex-1 flex-col">
             <div class="flex items-center justify-between">
                 <div>
-                    <h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
+                    <div class="flex items-center gap-4">
+                        <h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
+                        <button
+                            class="inline-flex items-center justify-center rounded-md p-1 transition-colors duration-150 focus:outline-none focus-visible:ring-2 bg-primary-500 hover:bg-secondary-500 active:bg-primary-500 text-white cursor-pointer"
+                            title="Export heures annuelles"
+                            @click="isYearlyHoursDrawerOpen = true"
+                        >
+                            <Icon name="mdi:printer" size="24" />
+                        </button>
+                    </div>
                     <p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
                 </div>
                 <div class="text-right">
@@ -62,8 +71,8 @@
                             : 'border-transparent text-primary-500/50 hover:text-primary-500'"
                         @click="activeTab = 'mileage'"
                     >
-                        <Icon name="mdi:car-outline" size="24" class="align-self"/>
-                        Frais Kms
+                        <Icon name="mdi:account-cash-outline" size="24" class="align-self"/>
+                        Frais
                     </button>
                     <button
                         class="pb-2 border-b-2 flex items-center gap-3"
@@ -75,6 +84,16 @@
                         <Icon name="mdi:money-100" size="24" class="align-self"/>
                         Prime
                     </button>
+                    <button
+                        class="pb-2 border-b-2 flex items-center gap-3"
+                        :class="activeTab === 'observation'
+                            ? 'border-primary-500 text-primary-500'
+                            : 'border-transparent text-primary-500/50 hover:text-primary-500'"
+                        @click="activeTab = 'observation'"
+                    >
+                        <Icon name="mdi:note-text-outline" size="24" class="align-self"/>
+                        Observation
+                    </button>
                 </div>
             </div>
             <div class="min-h-0 flex-1">
@@ -164,12 +183,39 @@
                         @delete="submitDeleteBonus"
                     />
                 </div>
+                <div v-else-if="activeTab === 'observation'" class="h-full">
+                    <div v-if="isObservationLoading" class="mt-6 rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
+                        Chargement...
+                    </div>
+                    <EmployeesObservationTab
+                        v-else
+                        class="h-full"
+                        :observations="observations"
+                        @create="submitCreateObservation"
+                        @update="submitUpdateObservation"
+                        @delete="submitDeleteObservation"
+                    />
+                </div>
             </div>
         </div>
+
+        <EmployeeYearlyHoursDrawer
+            v-if="employee"
+            v-model="isYearlyHoursDrawerOpen"
+            :employee-id="employee.id"
+            @submit="handleYearlyHoursPrint"
+        />
     </div>
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue'
+import EmployeeYearlyHoursDrawer from '~/components/EmployeeYearlyHoursDrawer.vue'
+import { usePdfPrinter } from '~/composables/usePdfPrinter'
+
+const { printPdf } = usePdfPrinter()
+const isYearlyHoursDrawerOpen = ref(false)
+
 const {
     employee,
     isLoading,
@@ -231,9 +277,20 @@ const {
     isBonusLoading,
     submitCreateBonus,
     submitUpdateBonus,
-    submitDeleteBonus
+    submitDeleteBonus,
+    observations,
+    isObservationLoading,
+    submitCreateObservation,
+    submitUpdateObservation,
+    submitDeleteObservation
 } = useEmployeeDetailPage()
 
+const handleYearlyHoursPrint = async (year: number) => {
+    if (!employee.value) return
+    await printPdf(`/yearly-hours/print?employeeId=${employee.value.id}&year=${year}`)
+    isYearlyHoursDrawerOpen.value = false
+}
+
 useHead(() => ({
     title: employee.value
         ? `${employee.value.firstName} ${employee.value.lastName}`

frontend/pages/employees/index.vue

@@ -4,6 +4,13 @@
             <div class="flex items-center justify-between">
                 <h1 class="text-4xl font-bold text-primary-500">Employés</h1>
                 <div class="flex items-center gap-3">
+                    <button
+                        type="button"
+                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                        @click="handleLeaveRecapPrint"
+                    >
+                        Export récap. congés
+                    </button>
                     <button
                         type="button"
                         class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
@@ -27,7 +34,7 @@
                 <SiteFilterSelector v-if="sites.length > 0" v-model="selectedSiteIds" :sites="sites"/>
                 <select
                     v-model="contractStatusFilter"
-                    class="rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500"
+                    class="rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500 cursor-pointer"
                 >
                     <option value="active">Avec contrat</option>
                     <option value="inactive">Sans contrat</option>
@@ -530,6 +537,10 @@ const openCreate = () => {
     isDrawerOpen.value = true
 }
 
+const handleLeaveRecapPrint = async () => {
+    await printPdf('/leave-recap/print')
+}
+
 const handleSalaryRecapPrint = async (month: string) => {
     await printPdf(`/salary-recap/print?month=${month}`)
     isSalaryRecapOpen.value = false

frontend/pages/users.vue

@@ -19,11 +19,12 @@
     </div>
 
     <div v-else class="min-h-0 overflow-auto rounded-md bg-white">
-      <div class="grid grid-cols-4 gap-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md sticky top-0 z-10">
+      <div class="grid grid-cols-5 gap-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md sticky top-0 z-10">
         <span class="text-left">Utilisateur</span>
         <span class="text-left">Employé</span>
         <span class="text-left">Accès</span>
         <span class="text-left">Sites</span>
+        <span class="text-left">Statut</span>
       </div>
       <div v-if="isLoading" class="px-6 py-4 text-md text-neutral-500">
         Chargement...
@@ -32,7 +33,7 @@
         <div
           v-for="user in users"
           :key="user.id"
-          class="grid grid-cols-4 items-center gap-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
+          class="grid grid-cols-5 items-center gap-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
           @click="openEdit(user)"
         >
           <span>{{ user.username }}</span>
@@ -41,6 +42,16 @@
           </span>
           <span>{{ getAccessLabel(user) }}</span>
           <span>{{ getSiteLabels(user) }}</span>
+          <span>
+            <span
+              v-if="user.isLocked"
+              class="inline-block rounded-full bg-red-100 px-3 py-1 text-sm font-semibold text-red-700"
+            >Verrouillé</span>
+            <span
+              v-else
+              class="inline-block rounded-full bg-green-100 px-3 py-1 text-sm font-semibold text-green-700"
+            >Actif</span>
+          </span>
         </div>
       </div>
     </div>
@@ -164,6 +175,20 @@
           </p>
         </div>
 
+        <div>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input
+              v-model="form.isLocked"
+              type="checkbox"
+              class="cursor-pointer"
+            />
+            <span class="text-md font-semibold text-neutral-700">Verrouiller le compte</span>
+          </label>
+          <p class="mt-1 text-sm text-neutral-500">
+            Un compte verrouillé ne peut plus se connecter.
+          </p>
+        </div>
+
         <div class="flex justify-center pt-2">
           <button
             type="submit"
@@ -207,7 +232,8 @@ const form = reactive({
   password: '',
   accessMode: 'admin' as 'admin' | 'self' | 'sites',
   employeeId: '' as number | '',
-  siteIds: [] as number[]
+  siteIds: [] as number[],
+  isLocked: false
 })
 
 const validationTouched = reactive({
@@ -318,6 +344,7 @@ const resetForm = () => {
   form.employeeId = ''
   form.accessMode = 'admin'
   form.siteIds = []
+  form.isLocked = false
   editingUser.value = null
   validationTouched.username = false
   validationTouched.password = false
@@ -345,6 +372,7 @@ const openEdit = (user: User) => {
   }
 
   form.employeeId = user.employee?.id ?? ''
+  form.isLocked = user.isLocked
 
   const siteRoles = userAccessById.value.get(user.id) ?? []
   form.siteIds = siteRoles.map((role) => role.site?.id).filter((id): id is number => typeof id === 'number')
@@ -398,7 +426,8 @@ const handleSubmit = async () => {
         username: form.username,
         plainPassword: form.password.trim() ? form.password : undefined,
         roles,
-        employeeId
+        employeeId,
+        isLocked: form.isLocked
       })
 
       const existingSiteRoles = userAccessById.value.get(editingUser.value.id) ?? []
@@ -422,7 +451,8 @@ const handleSubmit = async () => {
         username: form.username,
         plainPassword: form.password,
         roles,
-        employeeId
+        employeeId,
+        isLocked: form.isLocked
       })
 
       if (form.accessMode === 'sites' && form.siteIds.length > 0) {

frontend/services/dto/employee-rtt-summary.ts

@@ -32,4 +32,5 @@ export type EmployeeRttSummary = {
   availableMinutes: number
   weeks: EmployeeRttWeekSummary[]
   monthPayments: RttMonthPayment[]
+  rttStartDate: string | null
 }

frontend/services/dto/mileage-allowance.ts

@@ -2,8 +2,11 @@ export type MileageAllowance = {
   id: number
   month: string
   kilometers: number
+  amount: number
   comment: string | null
   receiptPath: string | null
   receiptName: string | null
+  amountReceiptPath: string | null
+  amountReceiptName: string | null
   createdAt: string
 }

frontend/services/dto/observation.ts

@@ -0,0 +1,6 @@
+export type Observation = {
+  id: number
+  month: string
+  content: string
+  createdAt: string
+}

frontend/services/dto/user.ts

@@ -4,5 +4,6 @@ export type User = {
   id: number
   username: string
   roles: string[]
+  isLocked: boolean
   employee?: Employee | null
 }

frontend/services/mileage-allowances.ts

@@ -16,6 +16,7 @@ export const createMileageAllowance = async (data: {
   employeeId: number
   month: string
   kilometers: number
+  amount: number
   comment?: string
 }) => {
   const api = useApi()
@@ -23,6 +24,7 @@ export const createMileageAllowance = async (data: {
     employee: `/api/employees/${data.employeeId}`,
     month: data.month,
     kilometers: data.kilometers,
+    amount: data.amount,
     comment: data.comment
   }, {
     toastSuccessKey: 'success.mileage.create',
@@ -33,12 +35,14 @@ export const createMileageAllowance = async (data: {
 export const updateMileageAllowance = async (id: number, data: {
   month: string
   kilometers: number
+  amount: number
   comment?: string
 }) => {
   const api = useApi()
   return api.patch<MileageAllowance>(`/mileage_allowances/${id}`, {
     month: data.month,
     kilometers: data.kilometers,
+    amount: data.amount,
     comment: data.comment
   }, {
     toastSuccessKey: 'success.mileage.update',
@@ -54,7 +58,7 @@ export const deleteMileageAllowance = async (id: number) => {
   })
 }
 
-export const uploadReceipt = async (baseURL: string, id: number, file: File) => {
+export const uploadKmReceipt = async (baseURL: string, id: number, file: File) => {
   const formData = new FormData()
   formData.append('file', file)
   return $fetch(`${baseURL}/mileage_allowances/${id}/receipt`, {
@@ -64,6 +68,20 @@ export const uploadReceipt = async (baseURL: string, id: number, file: File) =>
   })
 }
 
-export const getReceiptUrl = (baseURL: string, id: number): string => {
+export const uploadAmountReceipt = async (baseURL: string, id: number, file: File) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return $fetch(`${baseURL}/mileage_allowances/${id}/amount-receipt`, {
+    method: 'POST',
+    body: formData,
+    credentials: 'include'
+  })
+}
+
+export const getKmReceiptUrl = (baseURL: string, id: number): string => {
   return `${baseURL}/mileage_allowances/${id}/receipt`
 }
+
+export const getAmountReceiptUrl = (baseURL: string, id: number): string => {
+  return `${baseURL}/mileage_allowances/${id}/amount-receipt`
+}

frontend/services/observations.ts

@@ -0,0 +1,50 @@
+import type { Observation } from './dto/observation'
+import { extractItems } from '~/utils/api'
+
+export const listObservations = async (employeeId: number) => {
+  const api = useApi()
+  const data = await api.get<Observation[] | { 'hydra:member'?: Observation[] }>(
+    '/observations',
+    { employee: `/api/employees/${employeeId}` },
+    { toast: false }
+  )
+  return extractItems<Observation>(data)
+}
+
+export const createObservation = async (data: {
+  employeeId: number
+  month: string
+  content: string
+}) => {
+  const api = useApi()
+  return api.post<Observation>('/observations', {
+    employee: `/api/employees/${data.employeeId}`,
+    month: data.month,
+    content: data.content
+  }, {
+    toastSuccessKey: 'success.observation.create',
+    toastErrorKey: 'errors.observation.create'
+  })
+}
+
+export const updateObservation = async (id: number, data: {
+  month: string
+  content: string
+}) => {
+  const api = useApi()
+  return api.patch<Observation>(`/observations/${id}`, {
+    month: data.month,
+    content: data.content
+  }, {
+    toastSuccessKey: 'success.observation.update',
+    toastErrorKey: 'errors.observation.update'
+  })
+}
+
+export const deleteObservation = async (id: number) => {
+  const api = useApi()
+  return api.delete(`/observations/${id}`, {}, {
+    toastSuccessKey: 'success.observation.delete',
+    toastErrorKey: 'errors.observation.delete'
+  })
+}

frontend/services/users.ts

@@ -16,6 +16,7 @@ export const createUser = async (payload: {
   plainPassword: string
   roles: string[]
   employeeId?: number | null
+  isLocked?: boolean
 }) => {
   const api = useApi()
   return api.post<User>(
@@ -24,7 +25,8 @@ export const createUser = async (payload: {
       username: payload.username,
       plainPassword: payload.plainPassword,
       roles: payload.roles,
-      employee: payload.employeeId ? `/api/employees/${payload.employeeId}` : null
+      employee: payload.employeeId ? `/api/employees/${payload.employeeId}` : null,
+      isLocked: payload.isLocked ?? false
     },
     {
       toastSuccessKey: 'success.user.create',
@@ -38,12 +40,14 @@ export const updateUser = async (id: number, payload: {
   plainPassword?: string
   roles: string[]
   employeeId?: number | null
+  isLocked?: boolean
 }) => {
   const api = useApi()
   const body: Record<string, unknown> = {
     username: payload.username,
     roles: payload.roles,
-    employee: payload.employeeId ? `/api/employees/${payload.employeeId}` : null
+    employee: payload.employeeId ? `/api/employees/${payload.employeeId}` : null,
+    isLocked: payload.isLocked ?? false
   }
 
   if (payload.plainPassword) {

migrations/Version20260318143503.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260318143503 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add amount column to mileage_allowances';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances ADD COLUMN amount DOUBLE PRECISION DEFAULT 0 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount');
+    }
+}

migrations/Version20260319100000.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260319100000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add amount receipt fields to mileage_allowances';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_path VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_name VARCHAR(255) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_path');
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_name');
+    }
+}

migrations/Version20260325081258.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260325081258 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create observations table with unique constraint on (employee_id, month)';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE observations (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, employee_id INT NOT NULL, month DATE NOT NULL, content TEXT NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_BBC15BA88C03F15C ON observations (employee_id)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_observation_employee_month ON observations (employee_id, month)');
+        $this->addSql('ALTER TABLE observations ADD CONSTRAINT FK_BBC15BA88C03F15C FOREIGN KEY (employee_id) REFERENCES employees (id) NOT DEFERRABLE');
+        $this->addSql("COMMENT ON COLUMN observations.month IS '(DC2Type:date_immutable)'");
+        $this->addSql("COMMENT ON COLUMN observations.created_at IS '(DC2Type:datetime_immutable)'");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE observations DROP CONSTRAINT FK_BBC15BA88C03F15C');
+        $this->addSql('DROP TABLE observations');
+    }
+}

migrations/Version20260325084215.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260325084215 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add is_locked column to users table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users ADD is_locked BOOLEAN DEFAULT false NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP is_locked');
+    }
+}

src/ApiResource/EmployeeLeaveSummary.php

@@ -12,7 +12,7 @@ use App\State\EmployeeLeaveSummaryProvider;
     operations: [
         new Get(
             uriTemplate: '/employees/{id}/leave-summary',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
             provider: EmployeeLeaveSummaryProvider::class
         ),
     ],

src/ApiResource/EmployeeRttSummary.php

@@ -14,7 +14,7 @@ use App\State\EmployeeRttSummaryProvider;
     operations: [
         new Get(
             uriTemplate: '/employees/{id}/rtt-summary',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
             provider: EmployeeRttSummaryProvider::class
         ),
     ],
@@ -32,6 +32,7 @@ final class EmployeeRttSummary
     public int $currentYearRecoveryMinutes   = 0;
     public int $availableMinutes             = 0;
     public int $totalPaidMinutes             = 0;
+    public ?string $rttStartDate             = null;
 
     /** @var list<RttMonthPayment> */
     public array $monthPayments = [];

src/ApiResource/EmployeeYearlyHoursPrint.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ApiResource;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\QueryParameter;
+use App\State\EmployeeYearlyHoursPrintProvider;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/yearly-hours/print',
+            provider: EmployeeYearlyHoursPrintProvider::class,
+            parameters: [
+                new QueryParameter(key: 'employeeId', required: true),
+                new QueryParameter(key: 'year', required: true),
+            ],
+            security: "is_granted('ROLE_USER')"
+        ),
+    ]
+)]
+final class EmployeeYearlyHoursPrint {}

src/ApiResource/LeaveRecapPrint.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ApiResource;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use App\State\LeaveRecapPrintProvider;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/leave-recap/print',
+            provider: LeaveRecapPrintProvider::class,
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+    ]
+)]
+final class LeaveRecapPrint {}

src/Entity/Bonus.php

@@ -21,10 +21,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
 #[ApiResource(
     operations: [
         new Get(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
         ),
         new GetCollection(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
         ),
         new Post(
             security: "is_granted('ROLE_ADMIN')"

src/Entity/Employee.php

@@ -24,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
     paginationEnabled: false,
     security: "is_granted('ROLE_ADMIN')",
     processor: EmployeeWriteProcessor::class,
+    order: ['site.name' => 'ASC', 'displayOrder' => 'ASC', 'lastName' => 'ASC', 'firstName' => 'ASC'],
 )]
 #[ORM\Entity(repositoryClass: EmployeeRepository::class)]
 #[ORM\Table(name: 'employees')]

src/Entity/MileageAllowance.php

@@ -14,6 +14,8 @@ use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use App\Repository\MileageAllowanceRepository;
+use App\State\MileageAllowanceAmountReceiptDownloadProvider;
+use App\State\MileageAllowanceAmountReceiptUploadProcessor;
 use App\State\MileageAllowanceDeleteProcessor;
 use App\State\MileageAllowanceReceiptDownloadProvider;
 use App\State\MileageAllowanceReceiptUploadProcessor;
@@ -24,10 +26,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
 #[ApiResource(
     operations: [
         new Get(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
         ),
         new GetCollection(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
         ),
         new Post(
             security: "is_granted('ROLE_ADMIN')"
@@ -47,9 +49,20 @@ use Symfony\Component\Serializer\Attribute\Groups;
         ),
         new Get(
             uriTemplate: '/mileage_allowances/{id}/receipt',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
             provider: MileageAllowanceReceiptDownloadProvider::class,
         ),
+        new Post(
+            uriTemplate: '/mileage_allowances/{id}/amount-receipt',
+            security: "is_granted('ROLE_ADMIN')",
+            deserialize: false,
+            processor: MileageAllowanceAmountReceiptUploadProcessor::class,
+        ),
+        new Get(
+            uriTemplate: '/mileage_allowances/{id}/amount-receipt',
+            security: "is_granted('ROLE_ADMIN')",
+            provider: MileageAllowanceAmountReceiptDownloadProvider::class,
+        ),
     ],
     normalizationContext: [
         'groups'          => ['mileage_allowance:read', 'employee:read'],
@@ -87,6 +100,10 @@ class MileageAllowance
     #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
     private float $kilometers = 0;
 
+    #[ORM\Column(type: 'float', options: ['default' => 0])]
+    #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+    private float $amount = 0;
+
     #[ORM\Column(type: 'text', nullable: true)]
     #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
     private ?string $comment = null;
@@ -99,6 +116,14 @@ class MileageAllowance
     #[Groups(['mileage_allowance:read'])]
     private ?string $receiptName = null;
 
+    #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Groups(['mileage_allowance:read'])]
+    private ?string $amountReceiptPath = null;
+
+    #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Groups(['mileage_allowance:read'])]
+    private ?string $amountReceiptName = null;
+
     #[ORM\Column(type: 'datetime_immutable')]
     #[Groups(['mileage_allowance:read'])]
     private DateTimeImmutable $createdAt;
@@ -149,6 +174,18 @@ class MileageAllowance
         return $this;
     }
 
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    public function setAmount(float $amount): self
+    {
+        $this->amount = $amount;
+
+        return $this;
+    }
+
     public function getComment(): ?string
     {
         return $this->comment;
@@ -185,6 +222,30 @@ class MileageAllowance
         return $this;
     }
 
+    public function getAmountReceiptPath(): ?string
+    {
+        return $this->amountReceiptPath;
+    }
+
+    public function setAmountReceiptPath(?string $amountReceiptPath): self
+    {
+        $this->amountReceiptPath = $amountReceiptPath;
+
+        return $this;
+    }
+
+    public function getAmountReceiptName(): ?string
+    {
+        return $this->amountReceiptName;
+    }
+
+    public function setAmountReceiptName(?string $amountReceiptName): self
+    {
+        $this->amountReceiptName = $amountReceiptName;
+
+        return $this;
+    }
+
     public function getCreatedAt(): DateTimeImmutable
     {
         return $this->createdAt;

src/Entity/Observation.php

@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
+use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
+use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
+use App\Repository\ObservationRepository;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+        new GetCollection(
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+        new Post(
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+        new Patch(
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+        new Delete(
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+    ],
+    normalizationContext: [
+        'groups'          => ['observation:read', 'employee:read'],
+        'datetime_format' => 'Y-m-d',
+    ],
+    denormalizationContext: [
+        'groups'          => ['observation:write'],
+        'datetime_format' => 'Y-m-d',
+    ],
+    order: ['month' => 'DESC'],
+    paginationEnabled: false,
+)]
+#[ApiFilter(DateFilter::class, properties: ['month'])]
+#[ApiFilter(SearchFilter::class, properties: ['employee' => 'exact'])]
+#[ORM\Entity(repositoryClass: ObservationRepository::class)]
+#[ORM\Table(name: 'observations')]
+#[ORM\UniqueConstraint(name: 'uniq_observation_employee_month', columns: ['employee_id', 'month'])]
+class Observation
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    #[Groups(['observation:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: Employee::class)]
+    #[ORM\JoinColumn(nullable: false)]
+    #[Groups(['observation:read', 'observation:write'])]
+    private ?Employee $employee = null;
+
+    #[ORM\Column(type: 'date_immutable')]
+    #[Groups(['observation:read', 'observation:write'])]
+    private ?DateTimeImmutable $month = null;
+
+    #[ORM\Column(type: 'text')]
+    #[Groups(['observation:read', 'observation:write'])]
+    private string $content = '';
+
+    #[ORM\Column(type: 'datetime_immutable')]
+    #[Groups(['observation:read'])]
+    private DateTimeImmutable $createdAt;
+
+    public function __construct()
+    {
+        $this->createdAt = new DateTimeImmutable();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getEmployee(): ?Employee
+    {
+        return $this->employee;
+    }
+
+    public function setEmployee(?Employee $employee): self
+    {
+        $this->employee = $employee;
+
+        return $this;
+    }
+
+    public function getMonth(): ?DateTimeImmutable
+    {
+        return $this->month;
+    }
+
+    public function setMonth(?DateTimeImmutable $month): self
+    {
+        $this->month = $month;
+
+        return $this;
+    }
+
+    public function getContent(): string
+    {
+        return $this->content;
+    }
+
+    public function setContent(string $content): self
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    public function getCreatedAt(): DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+}

src/Entity/User.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;
 
 #[ApiResource(
     operations: [
@@ -84,6 +85,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[Groups(['user:read', 'user:write'])]
     private ?Employee $employee = null;
 
+    #[ORM\Column(type: 'boolean', options: ['default' => false])]
+    #[Groups(['user:read', 'user:write'])]
+    #[SerializedName('isLocked')]
+    private bool $isLocked = false;
+
     /**
      * @var Collection<int, UserSiteRole>
      */
@@ -204,5 +210,19 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this;
     }
 
+    #[Groups(['user:read'])]
+    #[SerializedName('isLocked')]
+    public function isLocked(): bool
+    {
+        return $this->isLocked;
+    }
+
+    public function setIsLocked(bool $isLocked): self
+    {
+        $this->isLocked = $isLocked;
+
+        return $this;
+    }
+
     public function eraseCredentials(): void {}
 }

src/Repository/AbsenceRepository.php

@@ -100,6 +100,38 @@ final class AbsenceRepository extends ServiceEntityRepository implements Absence
         return $qb->getQuery()->getResult();
     }
 
+    /**
+     * @return list<DateTimeImmutable> sorted maladie dates
+     */
+    public function findMaladieDatesByEmployee(
+        Employee $employee,
+        DateTimeImmutable $from,
+        DateTimeImmutable $to
+    ): array {
+        $results = $this->createQueryBuilder('a')
+            ->select('a.startDate')
+            ->join('a.type', 't')
+            ->andWhere('a.employee = :employee')
+            ->andWhere('t.code = :code')
+            ->andWhere('a.startDate >= :from')
+            ->andWhere('a.startDate <= :to')
+            ->setParameter('employee', $employee)
+            ->setParameter('code', 'M')
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->orderBy('a.startDate', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        return array_map(
+            static fn (array $row): DateTimeImmutable => $row['startDate'] instanceof DateTimeImmutable
+                ? $row['startDate']
+                : DateTimeImmutable::createFromInterface($row['startDate']),
+            $results
+        );
+    }
+
     /**
      * @return list<Absence>
      */

src/Repository/Contract/EmployeeContractPeriodReadRepositoryInterface.php

@@ -11,4 +11,6 @@ use DateTimeImmutable;
 interface EmployeeContractPeriodReadRepositoryInterface
 {
     public function findOneCoveringDate(Employee $employee, DateTimeImmutable $date): ?EmployeeContractPeriod;
+
+    public function findLatestPeriod(Employee $employee): ?EmployeeContractPeriod;
 }

src/Repository/EmployeeContractPeriodRepository.php

@@ -60,6 +60,18 @@ final class EmployeeContractPeriodRepository extends ServiceEntityRepository imp
         ;
     }
 
+    public function findLatestPeriod(Employee $employee): ?EmployeeContractPeriod
+    {
+        return $this->createQueryBuilder('p')
+            ->andWhere('p.employee = :employee')
+            ->setParameter('employee', $employee)
+            ->orderBy('p.startDate', 'DESC')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+
     public function closeOpenPeriods(Employee $employee, DateTimeImmutable $endDate): int
     {
         return $this->createQueryBuilder('p')

src/Repository/EmployeeRepository.php

@@ -87,8 +87,7 @@ final class EmployeeRepository extends ServiceEntityRepository implements Employ
             ->addSelect('s')
             ->leftJoin('e.contract', 'c')
             ->addSelect('c')
-            ->orderBy('s.displayOrder', 'ASC')
-            ->addOrderBy('s.name', 'ASC')
+            ->orderBy('s.name', 'ASC')
             ->addOrderBy('e.displayOrder', 'ASC')
             ->addOrderBy('e.lastName', 'ASC')
             ->addOrderBy('e.firstName', 'ASC')

src/Repository/ObservationRepository.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repository;
+
+use App\Entity\Observation;
+use DateTimeImmutable;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<Observation>
+ */
+final class ObservationRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Observation::class);
+    }
+
+    /**
+     * @return Observation[]
+     */
+    public function findByMonth(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        return $this->createQueryBuilder('o')
+            ->andWhere('o.month >= :from')
+            ->andWhere('o.month <= :to')
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->innerJoin('o.employee', 'e')
+            ->addSelect('e')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+}

src/Repository/WorkHourRepository.php

@@ -191,6 +191,57 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
         return $result;
     }
 
+    /**
+     * Count weekend and public holiday worked days for forfait bonus leave (PRESENCE mode only).
+     * Morning + afternoon = 1.0 day, one only = 0.5 day.
+     *
+     * @param list<string> $publicHolidayDates Y-m-d formatted weekday public holiday dates
+     */
+    public function countWeekendAndHolidayWorkedDays(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidayDates = []): float
+    {
+        $targetDates = [];
+
+        // Collect weekend dates in range
+        for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
+            if ((int) $cursor->format('N') >= 6) {
+                $targetDates[] = $cursor;
+            }
+        }
+
+        // Add weekday public holidays
+        foreach ($publicHolidayDates as $date) {
+            $targetDates[] = new DateTimeImmutable($date);
+        }
+
+        if ([] === $targetDates) {
+            return 0.0;
+        }
+
+        $dateStrings = array_map(static fn (DateTimeImmutable $d): string => $d->format('Y-m-d'), $targetDates);
+
+        /** @var list<WorkHour> $rows */
+        $rows = $this->createQueryBuilder('w')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate IN (:dates)')
+            ->andWhere('w.isPresentMorning = true OR w.isPresentAfternoon = true')
+            ->setParameter('employee', $employee)
+            ->setParameter('dates', $dateStrings)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $total = 0.0;
+        foreach ($rows as $row) {
+            if ($row->isPresentMorning() && $row->isPresentAfternoon()) {
+                $total += 1.0;
+            } else {
+                $total += 0.5;
+            }
+        }
+
+        return $total;
+    }
+
     /**
      * Return the set of Y-m-d dates where the employee has worked hours on the given dates.
      *
@@ -228,6 +279,55 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
         return $result;
     }
 
+    public function isWeekFullyValidated(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): bool
+    {
+        // Count weekdays (Mon-Fri) in range
+        $expectedWeekdays = 0;
+        for ($d = $from; $d <= $to; $d = $d->modify('+1 day')) {
+            if ((int) $d->format('N') <= 5) {
+                ++$expectedWeekdays;
+            }
+        }
+
+        if (0 === $expectedWeekdays) {
+            return false;
+        }
+
+        // Every weekday must have a work_hour row
+        $totalCount = (int) $this->createQueryBuilder('w')
+            ->select('COUNT(w.id)')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate >= :from')
+            ->andWhere('w.workDate <= :to')
+            ->setParameter('employee', $employee)
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        if ($totalCount < $expectedWeekdays) {
+            return false;
+        }
+
+        // All rows must be validated
+        $nonValidatedCount = (int) $this->createQueryBuilder('w')
+            ->select('COUNT(w.id)')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate >= :from')
+            ->andWhere('w.workDate <= :to')
+            ->andWhere('w.isValid = :isValid')
+            ->setParameter('employee', $employee)
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->setParameter('isValid', false)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return 0 === $nonValidatedCount;
+    }
+
     public function hasPendingSiteValidationForSiteAndDate(int $siteId, DateTimeInterface $date): bool
     {
         $workDate = DateTimeImmutable::createFromInterface($date);

src/Security/UserChecker.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Security;
+
+use App\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\CustomUserMessageAccountStatusException;
+use Symfony\Component\Security\Core\User\UserCheckerInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+final class UserChecker implements UserCheckerInterface
+{
+    public function checkPreAuth(UserInterface $user): void
+    {
+        if (!$user instanceof User) {
+            return;
+        }
+
+        if ($user->isLocked()) {
+            throw new CustomUserMessageAccountStatusException('Ce compte est verrouillé.');
+        }
+    }
+
+    public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void {}
+}

src/Service/Contracts/EmployeeContractPeriodManager.php

@@ -45,18 +45,21 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
         ?EmployeeContractPeriod $todayPeriod,
         DateTimeImmutable $requestedEndDate,
         bool $paidLeaveSettled,
-        ?string $comment = null
+        ?string $comment = null,
+        bool $isAlreadyEnded = false
     ): void {
         if (null === $todayPeriod) {
             throw new UnprocessableEntityHttpException('No active contract period to close.');
         }
 
-        $this->periodValidator->assertCloseEndDateCanBeApplied(
-            $todayPeriod->getStartDate(),
-            $todayPeriod->getEndDate(),
-            $requestedEndDate,
-            $todayPeriod->getContractNatureEnum()
-        );
+        if (!$isAlreadyEnded) {
+            $this->periodValidator->assertCloseEndDateCanBeApplied(
+                $todayPeriod->getStartDate(),
+                $todayPeriod->getEndDate(),
+                $requestedEndDate,
+                $todayPeriod->getContractNatureEnum()
+            );
+        }
 
         $todayPeriod->setEndDate($requestedEndDate);
         $todayPeriod->setPaidLeaveSettled($paidLeaveSettled);

src/Service/Contracts/EmployeeContractPeriodManagerInterface.php

@@ -25,7 +25,8 @@ interface EmployeeContractPeriodManagerInterface
         ?EmployeeContractPeriod $todayPeriod,
         DateTimeImmutable $requestedEndDate,
         bool $paidLeaveSettled,
-        ?string $comment = null
+        ?string $comment = null,
+        bool $isAlreadyEnded = false
     ): void;
 
     public function createNextPeriod(

src/Service/Leave/LeaveBalanceComputationService.php

@@ -24,6 +24,7 @@ final readonly class LeaveBalanceComputationService
     private const float STANDARD_SATURDAY_ACCRUAL_PER_MONTH = self::STANDARD_ANNUAL_SATURDAYS / 12.0;
     private const float FOUR_HOUR_ANNUAL_DAYS               = 10.0;
     private const float FOUR_HOUR_ACCRUAL_PER_MONTH         = 0.83;
+    private const float LONG_MALADIE_MONTHLY_ACCRUAL        = 2.0;
 
     public function __construct(
         private AbsenceRepository $absenceRepository,
@@ -31,6 +32,7 @@ final readonly class LeaveBalanceComputationService
         private EmployeeLeaveBalanceRepository $leaveBalanceRepository,
         private PublicHolidayServiceInterface $publicHolidayService,
         private SuspensionDaysCalculator $suspensionDaysCalculator,
+        private LongMaladieService $longMaladieService,
     ) {}
 
     /**
@@ -83,19 +85,34 @@ final readonly class LeaveBalanceComputationService
             $suspensions = $this->suspensionDaysCalculator->applyFirstMonthGrace(
                 $this->resolveSuspensionsForEmployeePeriod($employee, $from, $to)
             );
+
+            $longMaladiePeriods         = [];
+            $longMaladieReductionFactor = 1.0;
+            if (4 !== $employee->getContract()?->getWeeklyHours()) {
+                $longMaladiePeriods = $this->longMaladieService->findReducedRatePeriods($employee, $effectiveFrom, $to);
+                if ([] !== $longMaladiePeriods) {
+                    $totalNormalAccrual         = $this->resolveDaysAccrualPerMonth($employee) + $this->resolveSaturdayAccrualPerMonth($employee);
+                    $longMaladieReductionFactor = self::LONG_MALADIE_MONTHLY_ACCRUAL / $totalNormalAccrual;
+                }
+            }
+
             $generatedDays = $this->computeAccruedDays(
                 $this->resolveAnnualDays($employee),
                 $this->resolveDaysAccrualPerMonth($employee),
                 $effectiveFrom,
                 $to,
-                $suspensions
+                $suspensions,
+                $longMaladiePeriods,
+                $longMaladieReductionFactor
             );
             $generatedSaturdays = $this->computeAccruedDays(
                 $this->resolveAnnualSaturdays($employee),
                 $this->resolveSaturdayAccrualPerMonth($employee),
                 $effectiveFrom,
                 $to,
-                $suspensions
+                $suspensions,
+                $longMaladiePeriods,
+                $longMaladieReductionFactor
             );
 
             $absences                     = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $effectiveFrom, $to);
@@ -267,21 +284,29 @@ final readonly class LeaveBalanceComputationService
             : self::STANDARD_SATURDAY_ACCRUAL_PER_MONTH;
     }
 
+    /**
+     * @param list<ContractSuspension>                                      $suspensions
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $longMaladiePeriods
+     */
     private function computeAccruedDays(
         float $annualCap,
         float $accrualPerMonth,
         DateTimeImmutable $periodStart,
         DateTimeImmutable $periodEnd,
-        array $suspensions = []
+        array $suspensions = [],
+        array $longMaladiePeriods = [],
+        float $longMaladieReductionFactor = 1.0
     ): float {
         if ($accrualPerMonth <= 0.0 || $periodEnd < $periodStart) {
             return 0.0;
         }
 
-        $periodStart   = $this->normalizeDate($periodStart);
-        $periodEnd     = $this->normalizeDate($periodEnd);
-        $coveredMonths = 0.0;
-        $cursor        = $periodStart->modify('first day of this month')->setTime(0, 0);
+        $periodStart    = $this->normalizeDate($periodStart);
+        $periodEnd      = $this->normalizeDate($periodEnd);
+        $publicHolidays = [] !== $suspensions ? $this->buildPublicHolidayMap($periodStart, $periodEnd) : [];
+        $normalMonths   = 0.0;
+        $reducedMonths  = 0.0;
+        $cursor         = $periodStart->modify('first day of this month')->setTime(0, 0);
         while ($cursor <= $periodEnd) {
             $monthStart = $cursor > $periodStart ? $cursor : $periodStart;
             $monthEnd   = $cursor->modify('last day of this month')->setTime(0, 0);
@@ -289,18 +314,39 @@ final readonly class LeaveBalanceComputationService
                 $monthEnd = $periodEnd;
             }
 
-            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
             if ([] !== $suspensions) {
                 $suspendedDays = $this->suspensionDaysCalculator->countSuspendedDaysInMonth($monthStart, $monthEnd, $suspensions);
-                $coveredDays   = max(0, $coveredDays - $suspendedDays);
+                if ($suspendedDays > 0) {
+                    $businessDays          = $this->countBusinessDaysInRange($monthStart, $monthEnd, $publicHolidays);
+                    $suspendedBusinessDays = $this->suspensionDaysCalculator->countSuspendedBusinessDays($monthStart, $monthEnd, $suspensions, $publicHolidays);
+                    $normalMonths += max(0, $businessDays - $suspendedBusinessDays) / 22.0;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
             }
+
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
             $daysInMonth = (int) $cursor->format('t');
-            $coveredMonths += $coveredDays / $daysInMonth;
+
+            if ([] !== $longMaladiePeriods) {
+                $reducedDays = $this->longMaladieService->countReducedDaysInMonth($monthStart, $monthEnd, $longMaladiePeriods);
+                if ($reducedDays > 0) {
+                    $normalDays = max(0, $coveredDays - $reducedDays);
+                    $normalMonths += $normalDays / $daysInMonth;
+                    $reducedMonths += min($coveredDays, $reducedDays) / $daysInMonth;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
+            }
+
+            $normalMonths += $coveredDays / $daysInMonth;
 
             $cursor = $cursor->modify('first day of next month');
         }
 
-        return min($annualCap, $coveredMonths * $accrualPerMonth);
+        return min($annualCap, ($normalMonths + $reducedMonths * $longMaladieReductionFactor) * $accrualPerMonth);
     }
 
     private function parseYmdDate(string $value): ?DateTimeImmutable
@@ -317,8 +363,15 @@ final readonly class LeaveBalanceComputationService
 
     private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to): int
     {
-        $publicHolidays = $this->buildPublicHolidayMap($from, $to);
-        $count          = 0;
+        return $this->countBusinessDaysInRange($from, $to, $this->buildPublicHolidayMap($from, $to));
+    }
+
+    /**
+     * @param array<string, string> $publicHolidays pre-built map
+     */
+    private function countBusinessDaysInRange(DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidays): int
+    {
+        $count = 0;
         for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
             $weekDay = (int) $cursor->format('N');
             $dayKey  = $cursor->format('Y-m-d');

src/Service/Leave/LongMaladieService.php

@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Leave;
+
+use App\Entity\Employee;
+use App\Repository\AbsenceRepository;
+use DateTimeImmutable;
+
+use function count;
+
+/**
+ * Detects continuous MALADIE (sick leave) periods and computes
+ * the date ranges where reduced accrual applies (after the first month grace).
+ */
+final readonly class LongMaladieService
+{
+    private const int MAX_GAP_DAYS = 3;
+
+    public function __construct(
+        private AbsenceRepository $absenceRepository,
+    ) {}
+
+    /**
+     * Returns date ranges where the reduced maladie accrual rate applies.
+     * For continuous maladie periods > 1 month, the first month is excluded (grace period).
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    public function findReducedRatePeriods(
+        Employee $employee,
+        DateTimeImmutable $from,
+        DateTimeImmutable $to
+    ): array {
+        // Look back 13 months to catch maladie that started before the exercise period
+        $extendedFrom = $from->modify('-13 months');
+        $dates        = $this->absenceRepository->findMaladieDatesByEmployee($employee, $extendedFrom, $to);
+        if ([] === $dates) {
+            return [];
+        }
+
+        $periods = $this->consolidateIntoPeriods($dates);
+
+        return $this->applyFirstMonthGrace($periods);
+    }
+
+    /**
+     * Count calendar days in [monthStart, monthEnd] that fall within reduced maladie periods.
+     *
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $reducedPeriods
+     */
+    public function countReducedDaysInMonth(
+        DateTimeImmutable $monthStart,
+        DateTimeImmutable $monthEnd,
+        array $reducedPeriods
+    ): int {
+        $total = 0;
+        foreach ($reducedPeriods as $period) {
+            $overlapStart = $period['start'] > $monthStart ? $period['start'] : $monthStart;
+            $overlapEnd   = $period['end'] < $monthEnd ? $period['end'] : $monthEnd;
+
+            if ($overlapStart > $overlapEnd) {
+                continue;
+            }
+
+            $total += ((int) $overlapEnd->diff($overlapStart)->format('%a')) + 1;
+        }
+
+        return $total;
+    }
+
+    /**
+     * @param list<DateTimeImmutable> $dates sorted chronologically
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    private function consolidateIntoPeriods(array $dates): array
+    {
+        $periods = [];
+        $start   = $dates[0];
+        $prev    = $start;
+
+        for ($i = 1, $count = count($dates); $i < $count; ++$i) {
+            $current = $dates[$i];
+            $gap     = (int) $prev->diff($current)->format('%a');
+            if ($gap > self::MAX_GAP_DAYS) {
+                $periods[] = ['start' => $start, 'end' => $prev];
+                $start     = $current;
+            }
+            $prev = $current;
+        }
+        $periods[] = ['start' => $start, 'end' => $prev];
+
+        return $periods;
+    }
+
+    /**
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $periods
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    private function applyFirstMonthGrace(array $periods): array
+    {
+        $result = [];
+        foreach ($periods as $period) {
+            $gracedStart = $period['start']->modify('+1 month');
+            if ($gracedStart > $period['end']) {
+                continue;
+            }
+            $result[] = ['start' => $gracedStart, 'end' => $period['end']];
+        }
+
+        return $result;
+    }
+}

src/Service/PublicHolidayService.php

@@ -6,6 +6,8 @@ namespace App\Service;
 
 use Exception;
 use RuntimeException;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
@@ -17,7 +19,8 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
 {
     public function __construct(
         private HttpClientInterface $client,
-        private string $holidayUrl
+        private string $holidayUrl,
+        private CacheInterface $cache,
     ) {}
 
     /**
@@ -30,24 +33,29 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
     public function getHolidaysDay(string $zone): array
     {
         $zone = strtolower(trim($zone));
-        $url  = $this->holidayUrl."{$zone}.json";
+        $key  = "public_holidays_{$zone}_all";
 
-        try {
-            $response = $this->client->request(
-                'GET',
-                $url
-            );
-        } catch (TransportExceptionInterface) {
-            throw new RuntimeException('Unable to reach public holidays API.');
-        } catch (ClientExceptionInterface) {
-            throw new RuntimeException('Invalid zone provided for public holidays.');
-        } catch (ServerExceptionInterface) {
-            throw new RuntimeException('Public holidays API is temporarily unavailable.');
-        } catch (Throwable) {
-            throw new RuntimeException('Unexpected error while fetching public holidays.');
-        }
+        return $this->cache->get($key, function (ItemInterface $item) use ($zone): array {
+            $item->expiresAfter(30 * 86400);
+            $url = $this->holidayUrl."{$zone}.json";
 
-        return json_decode($response->getContent(), true);
+            try {
+                $response = $this->client->request(
+                    'GET',
+                    $url
+                );
+            } catch (TransportExceptionInterface) {
+                throw new RuntimeException('Unable to reach public holidays API.');
+            } catch (ClientExceptionInterface) {
+                throw new RuntimeException('Invalid zone provided for public holidays.');
+            } catch (ServerExceptionInterface) {
+                throw new RuntimeException('Public holidays API is temporarily unavailable.');
+            } catch (Throwable) {
+                throw new RuntimeException('Unexpected error while fetching public holidays.');
+            }
+
+            return json_decode($response->getContent(), true);
+        });
     }
 
     /**
@@ -60,20 +68,25 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
     {
         $zone  = strtolower(trim($zone));
         $years = trim($years);
-        $url   = $this->holidayUrl."{$zone}/{$years}.json";
+        $key   = "public_holidays_{$zone}_{$years}";
 
-        try {
-            $response = $this->client->request('GET', $url);
-        } catch (TransportExceptionInterface) {
-            throw new RuntimeException('Unable to reach public holidays API.');
-        } catch (ClientExceptionInterface) {
-            throw new RuntimeException('Invalid zone or year provided for public holidays.');
-        } catch (ServerExceptionInterface) {
-            throw new RuntimeException('Public holidays API is temporarily unavailable.');
-        } catch (Throwable) {
-            throw new RuntimeException('Unexpected error while fetching public holidays.');
-        }
+        return $this->cache->get($key, function (ItemInterface $item) use ($zone, $years): array {
+            $item->expiresAfter(30 * 86400);
+            $url = $this->holidayUrl."{$zone}/{$years}.json";
 
-        return json_decode($response->getContent(), true);
+            try {
+                $response = $this->client->request('GET', $url);
+            } catch (TransportExceptionInterface) {
+                throw new RuntimeException('Unable to reach public holidays API.');
+            } catch (ClientExceptionInterface) {
+                throw new RuntimeException('Invalid zone or year provided for public holidays.');
+            } catch (ServerExceptionInterface) {
+                throw new RuntimeException('Public holidays API is temporarily unavailable.');
+            } catch (Throwable) {
+                throw new RuntimeException('Unexpected error while fetching public holidays.');
+            }
+
+            return json_decode($response->getContent(), true);
+        });
     }
 }

src/Service/Rtt/RttRecoveryComputationService.php

@@ -21,13 +21,18 @@ use DateTimeImmutable;
 
 final readonly class RttRecoveryComputationService
 {
+    private ?DateTimeImmutable $rttStartDate;
+
     public function __construct(
         private WorkHourRepository $workHourRepository,
         private AbsenceRepository $absenceRepository,
         private AbsenceSegmentsResolver $absenceSegmentsResolver,
         private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
         private EmployeeContractResolver $contractResolver,
-    ) {}
+        string $rttStartDate = '',
+    ) {
+        $this->rttStartDate = '' !== $rttStartDate ? new DateTimeImmutable($rttStartDate) : null;
+    }
 
     /**
      * @return array{DateTimeImmutable, DateTimeImmutable}
@@ -71,7 +76,7 @@ final readonly class RttRecoveryComputationService
         return $weeks;
     }
 
-    public function computeTotalRecoveryForExercise(Employee $employee, int $exerciseYear): WeekRecoveryDetail
+    public function computeTotalRecoveryForExercise(Employee $employee, int $exerciseYear, ?DateTimeImmutable $limitDate = null): WeekRecoveryDetail
     {
         [$from, $to] = $this->resolveExerciseBounds($exerciseYear);
         $weeks       = $this->buildWeeksForExercise($from, $to);
@@ -85,7 +90,7 @@ final readonly class RttRecoveryComputationService
             $weeks
         );
 
-        $byWeek = $this->computeRecoveryByWeek($employee, $weekRanges, $from, $to, null);
+        $byWeek = $this->computeRecoveryByWeek($employee, $weekRanges, $from, $to, $limitDate);
 
         $total = new WeekRecoveryDetail();
         foreach ($byWeek as $detail) {
@@ -172,6 +177,12 @@ final readonly class RttRecoveryComputationService
                 continue;
             }
 
+            if ($this->rttStartDate instanceof DateTimeImmutable && $effectiveEnd < $this->rttStartDate) {
+                $results[$weekKey] = new WeekRecoveryDetail();
+
+                continue;
+            }
+
             $weekDays = [];
             for ($cursor = $effectiveStart; $cursor <= $effectiveEnd; $cursor = $cursor->modify('+1 day')) {
                 $weekDays[] = $cursor->format('Y-m-d');
@@ -195,20 +206,36 @@ final readonly class RttRecoveryComputationService
                 continue;
             }
 
-            $weekAnchorNature           = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
-            $weekAnchorContract         = $employeeContractsByDate[$weekDays[0]] ?? null;
-            $isWeekPresenceTracking     = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
-            $disableOvertimeBonuses     = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
-            $overtimeReferenceMinutes   = $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
+            $weekAnchorNature       = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
+            $weekAnchorContract     = $employeeContractsByDate[$weekDays[0]] ?? null;
+            $isWeekPresenceTracking = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
+            $disableOvertimeBonuses = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
+            $weekContractType       = ContractType::resolve(
+                $weekAnchorContract?->getName(),
+                $weekAnchorContract?->getTrackingMode(),
+                $weekAnchorContract?->getWeeklyHours()
+            );
+            $isCustomContract         = ContractType::CUSTOM === $weekContractType;
+            $overtimeReferenceMinutes = $isCustomContract
+                ? $this->computeWeeklyCustomReferenceMinutes($weekDays, $employeeContractsByDate)
+                : $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
             $overtime25StartMinutes     = $this->computeWeeklyOvertime25StartMinutes($weekDays, $employeeContractsByDate);
             $weeklyOvertimeTotalMinutes = $isWeekPresenceTracking
                 ? 0
-                : max(0, $weeklyTotalMinutes - $overtimeReferenceMinutes);
+                : $weeklyTotalMinutes - $overtimeReferenceMinutes;
 
-            $base25  = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
-            $bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base25 * 0.25);
-            $base50  = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
-            $bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base50 * 0.5);
+            $base25  = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
+            $bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base25 * 0.25);
+            $base50  = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
+            $bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base50 * 0.5);
+
+            if ($isWeekPresenceTracking || $disableOvertimeBonuses) {
+                $totalMinutes = 0;
+            } elseif ($isCustomContract) {
+                $totalMinutes = max(0, $weeklyOvertimeTotalMinutes);
+            } else {
+                $totalMinutes = $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50;
+            }
 
             $results[$weekKey] = new WeekRecoveryDetail(
                 overtimeMinutes: $weeklyOvertimeTotalMinutes,
@@ -216,9 +243,7 @@ final readonly class RttRecoveryComputationService
                 bonus25Minutes: $bonus25,
                 base50Minutes: $base50,
                 bonus50Minutes: $bonus50,
-                totalMinutes: ($isWeekPresenceTracking || $disableOvertimeBonuses)
-                    ? 0
-                    : $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50,
+                totalMinutes: $totalMinutes,
             );
         }
 
@@ -227,6 +252,20 @@ final readonly class RttRecoveryComputationService
 
     private function computeMetrics(WorkHour $workHour): WorkMetrics
     {
+        $driverDay      = $workHour->getDayHoursMinutes() ?? 0;
+        $driverNight    = $workHour->getNightHoursMinutes() ?? 0;
+        $driverWorkshop = $workHour->getWorkshopHoursMinutes() ?? 0;
+
+        if ($driverDay > 0 || $driverNight > 0 || $driverWorkshop > 0) {
+            $totalMinutes = $driverDay + $driverNight + $driverWorkshop;
+
+            return new WorkMetrics(
+                dayMinutes: $driverDay + $driverWorkshop,
+                nightMinutes: $driverNight,
+                totalMinutes: $totalMinutes,
+            );
+        }
+
         $ranges = [
             [$workHour->getMorningFrom(), $workHour->getMorningTo()],
             [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
@@ -315,6 +354,23 @@ final readonly class RttRecoveryComputationService
         return max(0, $end - $start);
     }
 
+    /**
+     * @param list<string>             $days
+     * @param array<string, ?Contract> $contractsByDate
+     */
+    private function computeWeeklyCustomReferenceMinutes(array $days, array $contractsByDate): int
+    {
+        $total = 0;
+        foreach ($days as $date) {
+            $isoDay   = (int) new DateTimeImmutable($date)->format('N');
+            $contract = $contractsByDate[$date] ?? null;
+            $hours    = $contract?->getWeeklyHours();
+            $total += $this->resolveDailyReferenceMinutes($hours, $isoDay);
+        }
+
+        return $total;
+    }
+
     /**
      * @param list<string>             $days
      * @param array<string, ?Contract> $contractsByDate

src/State/EmployeeLeaveSummaryProvider.php

@@ -21,6 +21,7 @@ use App\Repository\EmployeeRepository;
 use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
 use App\Service\Leave\LeaveBalanceComputationService;
+use App\Service\Leave\LongMaladieService;
 use App\Service\Leave\SuspensionDaysCalculator;
 use App\Service\PublicHolidayServiceInterface;
 use DateTimeImmutable;
@@ -42,6 +43,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     private const float CDI_NON_FORFAIT_4H_ACQUIRED_SATURDAYS               = 0.0;
     private const float CDI_NON_FORFAIT_4H_ACCRUAL_PER_MONTH                = 0.83;
     private const float CDI_NON_FORFAIT_4H_SATURDAY_ACCRUAL_PER_MONTH       = 0.0;
+    private const float LONG_MALADIE_MONTHLY_ACCRUAL                        = 2.0;
 
     public function __construct(
         private Security $security,
@@ -52,6 +54,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         private EmployeeContractPeriodRepository $periodRepository,
         private EmployeeLeaveBalanceRepository $leaveBalanceRepository,
         private LeaveBalanceComputationService $leaveBalanceComputationService,
+        private LongMaladieService $longMaladieService,
         private PublicHolidayServiceInterface $publicHolidayService,
         private SuspensionDaysCalculator $suspensionDaysCalculator,
         private WorkHourRepository $workHourRepository,
@@ -126,9 +129,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
      *   previousYearRemainingDays: float
      * }
      */
-    private function computeYearSummary(Employee $employee, int $targetYear): ?array
+    public function computeYearSummary(Employee $employee, int $targetYear): ?array
     {
-        $firstYear = $this->resolveFirstComputationYear($employee);
+        $firstYear = max($this->resolveFirstComputationYear($employee), $targetYear - 1);
         if ($targetYear < $firstYear) {
             $targetYear = $firstYear;
         }
@@ -187,13 +190,29 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             $suspensions           = $this->suspensionDaysCalculator->applyFirstMonthGrace(
                 $this->resolveSuspensionsForPeriod($employee, $effectiveFrom, $to)
             );
+
+            $longMaladiePeriods         = [];
+            $longMaladieReductionFactor = 1.0;
+            if (LeaveRuleCode::CDI_CDD_NON_FORFAIT->value === $leavePolicy['ruleCode']
+                && 4 !== $employee->getContract()?->getWeeklyHours()
+                && null !== $accrualCalculationEnd
+            ) {
+                $longMaladiePeriods = $this->longMaladieService->findReducedRatePeriods($employee, $effectiveFrom, $accrualCalculationEnd);
+                if ([] !== $longMaladiePeriods) {
+                    $totalNormalAccrual         = $leavePolicy['accrualPerMonth'] + $leavePolicy['saturdayAccrualPerMonth'];
+                    $longMaladieReductionFactor = self::LONG_MALADIE_MONTHLY_ACCRUAL / $totalNormalAccrual;
+                }
+            }
+
             $generatedDays = $leavePolicy['accrualPerMonth'] > 0.0
                 ? $this->computeAccruedDaysFromStart(
                     $leavePolicy['acquiredDays'],
                     $leavePolicy['accrualPerMonth'],
                     $effectiveFrom,
                     $accrualCalculationEnd,
-                    $suspensions
+                    $suspensions,
+                    $longMaladiePeriods,
+                    $longMaladieReductionFactor
                 )
                 : 0.0;
             $generatedSaturdays = $leavePolicy['saturdayAccrualPerMonth'] > 0.0
@@ -202,7 +221,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     $leavePolicy['saturdayAccrualPerMonth'],
                     $effectiveFrom,
                     $accrualCalculationEnd,
-                    $suspensions
+                    $suspensions,
+                    $longMaladiePeriods,
+                    $longMaladieReductionFactor
                 )
                 : 0.0;
             $absences                     = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $from, $to);
@@ -286,6 +307,16 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $targetSummary;
     }
 
+    public function resolveLeaveYearForToday(Employee $employee): int
+    {
+        $today = new DateTimeImmutable('today');
+        if (ContractType::FORFAIT === $employee->getContract()?->getType()) {
+            return (int) $today->format('Y');
+        }
+
+        return $this->resolveCurrentLeaveYear($today);
+    }
+
     private function resolveEffectivePeriodStart(
         Employee $employee,
         DateTimeImmutable $from,
@@ -365,12 +396,18 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $year;
     }
 
+    /**
+     * @param list<ContractSuspension>                                      $suspensions
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $longMaladiePeriods
+     */
     private function computeAccruedDaysFromStart(
         float $acquiredDays,
         float $accrualPerMonth,
         DateTimeImmutable $periodStart,
         ?DateTimeImmutable $periodEnd,
-        array $suspensions = []
+        array $suspensions = [],
+        array $longMaladiePeriods = [],
+        float $longMaladieReductionFactor = 1.0
     ): float {
         if ($accrualPerMonth <= 0.0) {
             return $acquiredDays;
@@ -380,10 +417,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             return 0.0;
         }
 
-        $periodStart   = $this->normalizeDate($periodStart);
-        $periodEnd     = $this->normalizeDate($periodEnd);
-        $coveredMonths = 0.0;
-        $cursor        = $periodStart->modify('first day of this month')->setTime(0, 0);
+        $periodStart    = $this->normalizeDate($periodStart);
+        $periodEnd      = $this->normalizeDate($periodEnd);
+        $publicHolidays = [] !== $suspensions ? $this->buildPublicHolidayMap($periodStart, $periodEnd) : [];
+        $normalMonths   = 0.0;
+        $reducedMonths  = 0.0;
+        $cursor         = $periodStart->modify('first day of this month')->setTime(0, 0);
         while ($cursor <= $periodEnd) {
             $monthStart = $cursor > $periodStart ? $cursor : $periodStart;
             $monthEnd   = $cursor->modify('last day of this month')->setTime(0, 0);
@@ -391,18 +430,39 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                 $monthEnd = $periodEnd;
             }
 
-            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
             if ([] !== $suspensions) {
                 $suspendedDays = $this->suspensionDaysCalculator->countSuspendedDaysInMonth($monthStart, $monthEnd, $suspensions);
-                $coveredDays   = max(0, $coveredDays - $suspendedDays);
+                if ($suspendedDays > 0) {
+                    $businessDays          = $this->countBusinessDays($monthStart, $monthEnd, $publicHolidays);
+                    $suspendedBusinessDays = $this->suspensionDaysCalculator->countSuspendedBusinessDays($monthStart, $monthEnd, $suspensions, $publicHolidays);
+                    $normalMonths += max(0, $businessDays - $suspendedBusinessDays) / 22.0;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
             }
+
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
             $daysInMonth = (int) $cursor->format('t');
-            $coveredMonths += $coveredDays / $daysInMonth;
+
+            if ([] !== $longMaladiePeriods) {
+                $reducedDays = $this->longMaladieService->countReducedDaysInMonth($monthStart, $monthEnd, $longMaladiePeriods);
+                if ($reducedDays > 0) {
+                    $normalDays = max(0, $coveredDays - $reducedDays);
+                    $normalMonths += $normalDays / $daysInMonth;
+                    $reducedMonths += min($coveredDays, $reducedDays) / $daysInMonth;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
+            }
+
+            $normalMonths += $coveredDays / $daysInMonth;
 
             $cursor = $cursor->modify('first day of next month');
         }
 
-        return min($acquiredDays, $coveredMonths * $accrualPerMonth);
+        return min($acquiredDays, ($normalMonths + $reducedMonths * $longMaladieReductionFactor) * $accrualPerMonth);
     }
 
     private function resolveAccrualCalculationEndDate(
@@ -475,10 +535,21 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $type = $employee->getContract()?->getType();
         if (ContractType::FORFAIT === $type) {
             $businessDaysInPeriod = $this->countBusinessDays($from, $to);
+            $publicHolidays       = $this->buildPublicHolidayMap($from, $to);
+            $weekdayHolidays      = array_filter(
+                array_keys($publicHolidays),
+                static fn (string $date): bool => (int) new DateTimeImmutable($date)->format('N') <= 5
+            );
+            $bonusDays = $this->workHourRepository->countWeekendAndHolidayWorkedDays(
+                $employee,
+                $from,
+                $to,
+                array_values($weekdayHolidays)
+            );
 
             return [
                 'ruleCode'                => LeaveRuleCode::FORFAIT_218->value,
-                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS),
+                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS) + $bonusDays,
                 'acquiredSaturdays'       => 0.0,
                 'accrualPerMonth'         => 0.0,
                 'saturdayAccrualPerMonth' => 0.0,
@@ -516,10 +587,13 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         ];
     }
 
-    private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to): int
+    /**
+     * @param null|array<string, string> $publicHolidays pre-built map (built if null)
+     */
+    private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to, ?array $publicHolidays = null): int
     {
-        $publicHolidays = $this->buildPublicHolidayMap($from, $to);
-        $count          = 0;
+        $publicHolidays ??= $this->buildPublicHolidayMap($from, $to);
+        $count = 0;
         for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
             $weekDay = (int) $cursor->format('N');
             $dayKey  = $cursor->format('Y-m-d');

src/State/EmployeeRttSummaryProvider.php

@@ -15,6 +15,7 @@ use App\Entity\User;
 use App\Repository\EmployeeRepository;
 use App\Repository\EmployeeRttBalanceRepository;
 use App\Repository\EmployeeRttPaymentRepository;
+use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
 use App\Service\Rtt\RttRecoveryComputationService;
 use DateTimeImmutable;
@@ -26,6 +27,8 @@ use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 final readonly class EmployeeRttSummaryProvider implements ProviderInterface
 {
+    private ?string $rttStartDate;
+
     public function __construct(
         private Security $security,
         private RequestStack $requestStack,
@@ -34,7 +37,11 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
         private EmployeeRttBalanceRepository $rttBalanceRepository,
         private EmployeeRttPaymentRepository $rttPaymentRepository,
         private RttRecoveryComputationService $rttRecoveryService,
-    ) {}
+        private WorkHourRepository $workHourRepository,
+        string $rttStartDate = '',
+    ) {
+        $this->rttStartDate = '' !== $rttStartDate ? $rttStartDate : null;
+    }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): EmployeeRttSummary
     {
@@ -72,9 +79,22 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             $weeks
         );
 
-        $limitDate = null;
         if ($year > $currentExerciseYear) {
             $limitDate = $periodFrom->modify('-1 day');
+        } else {
+            // Exclude the current (incomplete) week: limit to last Sunday
+            $isoDay    = (int) $today->format('N'); // 1=Monday .. 7=Sunday
+            $limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
+
+            // Include the current week if all existing days are admin-validated
+            if (7 !== $isoDay) {
+                $currentWeekStart = $today->modify('monday this week');
+                $currentWeekEnd   = $currentWeekStart->modify('+6 days');
+                $checkEnd         = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
+                if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
+                    $limitDate = $currentWeekEnd;
+                }
+            }
         }
 
         $currentByWeekStart   = $this->rttRecoveryService->computeRecoveryByWeek($employee, $weekRanges, $periodFrom, $periodTo, $limitDate);
@@ -90,7 +110,15 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
         $summary->carryBonus50Minutes          = $carry->bonus50Minutes;
         $summary->currentYearRecoveryMinutes   = array_sum(array_map(static fn ($d) => $d->totalMinutes, $currentByWeekStart));
         $summary->availableMinutes             = $summary->carryFromPreviousYearMinutes + $summary->currentYearRecoveryMinutes;
-        $summary->weeks                        = array_map(
+
+        // Pass rttStartDate only if it falls within this exercise
+        if (null !== $this->rttStartDate) {
+            $startDate = new DateTimeImmutable($this->rttStartDate);
+            if ($startDate >= $periodFrom && $startDate <= $periodTo) {
+                $summary->rttStartDate = $this->rttStartDate;
+            }
+        }
+        $summary->weeks = array_map(
             static function (array $week) use ($currentByWeekStart) {
                 $detail = $currentByWeekStart[$week['start']->format('Y-m-d')] ?? new WeekRecoveryDetail();
 
@@ -110,6 +138,37 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             $weekRanges
         );
 
+        // Post-process: distribute deficit weeks across cumulative balance (50% first, then 25%)
+        $cumulative50 = $carry->base50Minutes + $carry->bonus50Minutes;
+        $cumulative25 = $carry->base25Minutes + $carry->bonus25Minutes;
+
+        foreach ($summary->weeks as $i => $week) {
+            if ($week->totalMinutes >= 0) {
+                $cumulative50 += $week->base50Minutes + $week->bonus50Minutes;
+                $cumulative25 += $week->base25Minutes + $week->bonus25Minutes;
+            } else {
+                $deficit = -$week->totalMinutes;
+                $from50  = min($deficit, max(0, $cumulative50));
+                $from25  = $deficit - $from50;
+
+                $cumulative50 -= $from50;
+                $cumulative25 -= $from25;
+
+                $summary->weeks[$i] = new EmployeeRttWeekSummary(
+                    month: $week->month,
+                    weekNumber: $week->weekNumber,
+                    weekStart: $week->weekStart,
+                    weekEnd: $week->weekEnd,
+                    overtimeMinutes: $week->overtimeMinutes,
+                    base25Minutes: $from25 > 0 ? -$from25 : 0,
+                    bonus25Minutes: 0,
+                    base50Minutes: $from50 > 0 ? -$from50 : 0,
+                    bonus50Minutes: 0,
+                    totalMinutes: $week->totalMinutes,
+                );
+            }
+        }
+
         $payments     = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $year);
         $monthBuckets = [];
 
@@ -189,4 +248,25 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
 
         return $month >= 6 ? $year + 1 : $year;
     }
+
+    /**
+     * If the employee's contract ends within the current week, cap the check range to that end date.
+     */
+    private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
+    {
+        foreach ($employee->getContractPeriods() as $period) {
+            if ($period->getStartDate() > $today) {
+                continue;
+            }
+            $endDate = $period->getEndDate();
+            if (null === $endDate) {
+                continue;
+            }
+            if ($endDate >= $weekStart && $endDate <= $weekEnd) {
+                return $endDate;
+            }
+        }
+
+        return $weekEnd;
+    }
 }

src/State/EmployeeWriteProcessor.php

@@ -80,7 +80,8 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
         }
 
         $todayPeriod           = $this->periodRepository->findOneCoveringDate($data, $today);
-        $currentPeriodContract = $todayPeriod?->getContract();
+        $effectivePeriod       = $todayPeriod ?? $this->periodRepository->findLatestPeriod($data);
+        $currentPeriodContract = $effectivePeriod?->getContract();
         $contractChanged       = $currentPeriodContract instanceof Contract
             ? $currentPeriodContract->getId() !== $currentContract->getId()
             : true;
@@ -91,25 +92,27 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
             if (null === $requestedEndDate) {
                 throw new UnprocessableEntityHttpException('contractEndDate is required for close-only request.');
             }
+            $isAlreadyEnded = null === $todayPeriod;
             $this->periodManager->closeCurrentPeriod(
-                $todayPeriod,
+                $effectivePeriod,
                 $requestedEndDate,
                 $changeRequest->contractPaidLeaveSettled ?? false,
-                $changeRequest->contractComment
+                $changeRequest->contractComment,
+                $isAlreadyEnded
             );
 
             return $result;
         }
 
         $startDate = $changeRequest->contractStartDate ?? $today;
-        $nature    = $changeRequest->contractNature ?? $todayPeriod?->getContractNatureEnum() ?? ContractNature::CDI;
+        $nature    = $changeRequest->contractNature ?? $effectivePeriod?->getContractNatureEnum() ?? ContractNature::CDI;
         $this->periodManager->createNextPeriod(
             employee: $data,
             contract: $currentContract,
             startDate: $startDate,
             endDate: $changeRequest->contractEndDate,
             nature: $nature,
-            todayPeriod: $todayPeriod,
+            todayPeriod: $effectivePeriod,
             isDriver: $changeRequest->isDriver ?? false,
         );
 

src/State/EmployeeYearlyHoursPrintProvider.php

@@ -0,0 +1,420 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Dto\WorkHours\WorkMetrics;
+use App\Entity\Employee;
+use App\Entity\WorkHour;
+use App\Enum\TrackingMode;
+use App\Repository\AbsenceRepository;
+use App\Repository\EmployeeRepository;
+use App\Repository\WorkHourRepository;
+use App\Service\Contracts\EmployeeContractResolver;
+use App\Service\WorkHours\AbsenceSegmentsResolver;
+use App\Service\WorkHours\WorkedHoursCreditPolicy;
+use DateInterval;
+use DateTimeImmutable;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+use Twig\Environment;
+
+class EmployeeYearlyHoursPrintProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private readonly RequestStack $requestStack,
+        private EmployeeRepository $employeeRepository,
+        private WorkHourRepository $workHourRepository,
+        private AbsenceRepository $absenceRepository,
+        private EmployeeContractResolver $contractResolver,
+        private AbsenceSegmentsResolver $absenceSegmentsResolver,
+        private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            return new Response('Missing request.', Response::HTTP_BAD_REQUEST);
+        }
+
+        $employeeId = (int) $request->query->get('employeeId', '0');
+        if ($employeeId <= 0) {
+            throw new UnprocessableEntityHttpException('employeeId must be a positive integer.');
+        }
+
+        $employee = $this->employeeRepository->find($employeeId);
+        if (!$employee instanceof Employee) {
+            throw new NotFoundHttpException('Employee not found.');
+        }
+
+        $yearRaw = (string) $request->query->get('year');
+        if (!preg_match('/^\d{4}$/', $yearRaw)) {
+            throw new UnprocessableEntityHttpException('year must use YYYY format.');
+        }
+        $year = (int) $yearRaw;
+
+        $from = new DateTimeImmutable("{$year}-01-01");
+        $to   = new DateTimeImmutable("{$year}-12-31");
+        $days = $this->buildDays($from, $to);
+
+        $workHours   = $this->workHourRepository->findByDateRangeAndEmployees($from, $to, [$employee]);
+        $absences    = $this->absenceRepository->findForPrint($from, $to, [$employee]);
+        $contractMap = $this->contractResolver->resolveForEmployeesAndDays([$employee], $days);
+        $driverMap   = $this->contractResolver->resolveIsDriverForEmployeesAndDays([$employee], $days);
+
+        $workHourMap = $this->buildWorkHourMap($workHours);
+        $absenceData = $this->buildAbsenceData($absences, $days, $employee);
+
+        $segments = $this->buildSegments(
+            $employee,
+            $days,
+            $contractMap[$employee->getId()] ?? [],
+            $driverMap[$employee->getId()] ?? [],
+            $workHourMap[$employee->getId()] ?? [],
+            $absenceData,
+        );
+
+        $employeeName = trim(($employee->getLastName() ?? '').' '.($employee->getFirstName() ?? ''));
+
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('employee-yearly-hours/print.html.twig', [
+            'employeeName' => $employeeName,
+            'year'         => $year,
+            'segments'     => $segments,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4', 'portrait');
+        $dompdf->render();
+
+        $filename = sprintf(
+            '%s_%s_%d.pdf',
+            $this->sanitizeFilename($employee->getLastName() ?? ''),
+            $this->sanitizeFilename($employee->getFirstName() ?? ''),
+            $year,
+        );
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+
+    /**
+     * @return list<string>
+     */
+    private function buildDays(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        $days    = [];
+        $current = $from;
+
+        while ($current <= $to) {
+            $days[]  = $current->format('Y-m-d');
+            $current = $current->add(new DateInterval('P1D'));
+        }
+
+        return $days;
+    }
+
+    /**
+     * @return array<int, array<string, WorkHour>>
+     */
+    private function buildWorkHourMap(array $workHours): array
+    {
+        $map = [];
+        foreach ($workHours as $wh) {
+            $employeeId = $wh->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $date                    = $wh->getWorkDate()->format('Y-m-d');
+            $map[$employeeId][$date] = $wh;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array{credited: array<string, int>, labels: array<string, string>, absentMorning: array<string, bool>, absentAfternoon: array<string, bool>, hasDayAbsence: array<string, bool>}
+     */
+    private function buildAbsenceData(array $absences, array $days, Employee $employee): array
+    {
+        $credited        = [];
+        $labels          = [];
+        $absentMorning   = [];
+        $absentAfternoon = [];
+        $hasDayAbsence   = [];
+
+        foreach ($absences as $absence) {
+            $absEmployeeId = $absence->getEmployee()?->getId();
+            if ($absEmployeeId !== $employee->getId()) {
+                continue;
+            }
+
+            $start = $absence->getStartDate()->format('Y-m-d');
+            $end   = $absence->getEndDate()->format('Y-m-d');
+
+            foreach ($days as $date) {
+                if ($date < $start || $date > $end) {
+                    continue;
+                }
+
+                [$isMorning, $isAfternoon] = $this->absenceSegmentsResolver->resolveForDate($absence, $date);
+                if ($isMorning || $isAfternoon) {
+                    $hasDayAbsence[$date]   = true;
+                    $absentMorning[$date]   = ($absentMorning[$date] ?? false)   || $isMorning;
+                    $absentAfternoon[$date] = ($absentAfternoon[$date] ?? false) || $isAfternoon;
+                    if (!isset($labels[$date])) {
+                        $labels[$date] = $absence->getType()?->getLabel() ?? '';
+                    }
+                }
+
+                $credited[$date] = ($credited[$date] ?? 0)
+                    + $this->workedHoursCreditPolicy->computeCreditedMinutes($absence, $date, $isMorning, $isAfternoon);
+            }
+        }
+
+        return [
+            'credited'        => $credited,
+            'labels'          => $labels,
+            'absentMorning'   => $absentMorning,
+            'absentAfternoon' => $absentAfternoon,
+            'hasDayAbsence'   => $hasDayAbsence,
+        ];
+    }
+
+    /**
+     * @return list<array{mode: string, contractName: ?string, rows: list<array>}>
+     */
+    private function buildSegments(
+        Employee $employee,
+        array $days,
+        array $contractsByDate,
+        array $driverByDate,
+        array $workHoursByDate,
+        array $absenceData,
+    ): array {
+        $segments    = [];
+        $currentMode = null;
+        $currentRows = [];
+        $currentName = null;
+
+        foreach ($days as $date) {
+            $contract = $contractsByDate[$date] ?? null;
+            $isDriver = $driverByDate[$date] ?? false;
+            $wh       = $workHoursByDate[$date] ?? null;
+            $hasData  = null !== $wh || ($absenceData['hasDayAbsence'][$date] ?? false);
+
+            if (!$hasData) {
+                continue;
+            }
+
+            $trackingMode = $contract?->getTrackingMode() ?? TrackingMode::TIME->value;
+            $mode         = $this->resolveSegmentMode($trackingMode, $isDriver);
+            $contractName = $contract?->getName();
+
+            if ($mode !== $currentMode) {
+                if (null !== $currentMode && [] !== $currentRows) {
+                    $segments[] = [
+                        'mode'         => $currentMode,
+                        'contractName' => $currentName,
+                        'rows'         => $currentRows,
+                    ];
+                }
+                $currentMode = $mode;
+                $currentRows = [];
+                $currentName = $contractName;
+            }
+
+            $creditedMinutes = $absenceData['credited'][$date] ?? 0;
+            $absenceLabel    = $absenceData['labels'][$date] ?? null;
+
+            $row = [
+                'date'         => new DateTimeImmutable($date)->format('d/m/Y'),
+                'absenceLabel' => $absenceLabel,
+            ];
+
+            if ('presence' === $mode) {
+                $absentMorning   = $absenceData['absentMorning'][$date] ?? false;
+                $absentAfternoon = $absenceData['absentAfternoon'][$date] ?? false;
+                $morning         = (($wh?->getIsPresentMorning() ?? false) && !$absentMorning) ? 0.5 : 0.0;
+                $afternoon       = (($wh?->getIsPresentAfternoon() ?? false) && !$absentAfternoon) ? 0.5 : 0.0;
+                $total           = $morning + $afternoon;
+
+                $row['presentMorning']   = $morning > 0;
+                $row['presentAfternoon'] = $afternoon > 0;
+                $row['total']            = $total > 0 ? (string) $total : '';
+            } elseif ('driver' === $mode) {
+                $dayMin      = $wh?->getDayHoursMinutes() ?? 0;
+                $nightMin    = $wh?->getNightHoursMinutes() ?? 0;
+                $workshopMin = $wh?->getWorkshopHoursMinutes() ?? 0;
+                $totalMin    = $dayMin + $nightMin + $workshopMin + $creditedMinutes;
+
+                $row['dayHours']      = $this->formatMinutes($dayMin);
+                $row['nightHours']    = $this->formatMinutes($nightMin);
+                $row['workshopHours'] = $this->formatMinutes($workshopMin);
+                $row['total']         = $this->formatMinutes($totalMin);
+            } else {
+                $metrics = null !== $wh ? $this->computeMetrics($wh) : new WorkMetrics();
+                $metrics->addCreditedMinutes($creditedMinutes);
+
+                $row['morningFrom']   = $wh?->getMorningFrom() ?? '';
+                $row['morningTo']     = $wh?->getMorningTo() ?? '';
+                $row['afternoonFrom'] = $wh?->getAfternoonFrom() ?? '';
+                $row['afternoonTo']   = $wh?->getAfternoonTo() ?? '';
+                $row['eveningFrom']   = $wh?->getEveningFrom() ?? '';
+                $row['eveningTo']     = $wh?->getEveningTo() ?? '';
+                $row['total']         = $this->formatMinutes($metrics->totalMinutes);
+            }
+
+            $currentRows[] = $row;
+        }
+
+        if (null !== $currentMode && [] !== $currentRows) {
+            $segments[] = [
+                'mode'         => $currentMode,
+                'contractName' => $currentName,
+                'rows'         => $currentRows,
+            ];
+        }
+
+        return $segments;
+    }
+
+    private function resolveSegmentMode(string $trackingMode, bool $isDriver): string
+    {
+        if ($isDriver) {
+            return 'driver';
+        }
+
+        if (TrackingMode::PRESENCE->value === $trackingMode) {
+            return 'presence';
+        }
+
+        return 'time';
+    }
+
+    private function computeMetrics(WorkHour $workHour): WorkMetrics
+    {
+        $ranges = [
+            [$workHour->getMorningFrom(), $workHour->getMorningTo()],
+            [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
+            [$workHour->getEveningFrom(), $workHour->getEveningTo()],
+        ];
+
+        $totalMinutes = 0;
+        $nightMinutes = 0;
+
+        foreach ($ranges as [$from, $to]) {
+            $totalMinutes += $this->intervalMinutes($from, $to);
+            $nightMinutes += $this->nightIntervalMinutes($from, $to);
+        }
+
+        $dayMinutes = max(0, $totalMinutes - $nightMinutes);
+
+        return new WorkMetrics(
+            dayMinutes: $dayMinutes,
+            nightMinutes: $nightMinutes,
+            totalMinutes: $totalMinutes,
+        );
+    }
+
+    /**
+     * @return null|array{int, int}
+     */
+    private function resolveInterval(?string $from, ?string $to): ?array
+    {
+        $fromMinutes = $this->toMinutes($from);
+        $toMinutes   = $this->toMinutes($to);
+        if (null === $fromMinutes || null === $toMinutes) {
+            return null;
+        }
+
+        $end = $toMinutes <= $fromMinutes ? $toMinutes + 1440 : $toMinutes;
+
+        return [$fromMinutes, $end];
+    }
+
+    private function toMinutes(?string $time): ?int
+    {
+        if (null === $time || '' === $time) {
+            return null;
+        }
+
+        [$hours, $minutes] = array_map('intval', explode(':', $time));
+
+        return ($hours * 60) + $minutes;
+    }
+
+    private function intervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+
+        return max(0, $end - $start);
+    }
+
+    private function nightIntervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+        $windows       = [[0, 360], [1260, 1440]];
+        $total         = 0;
+
+        for ($dayOffset = 0; $dayOffset <= 1; ++$dayOffset) {
+            $shift = $dayOffset * 1440;
+            foreach ($windows as [$windowStart, $windowEnd]) {
+                $total += $this->overlap($start, $end, $windowStart + $shift, $windowEnd + $shift);
+            }
+        }
+
+        return $total;
+    }
+
+    private function overlap(int $startA, int $endA, int $startB, int $endB): int
+    {
+        $start = max($startA, $startB);
+        $end   = min($endA, $endB);
+
+        return max(0, $end - $start);
+    }
+
+    private function formatMinutes(int $minutes): string
+    {
+        if (0 === $minutes) {
+            return '';
+        }
+
+        $h = intdiv($minutes, 60);
+        $m = $minutes % 60;
+
+        return 0 === $m ? "{$h}h" : "{$h}h{$m}m";
+    }
+
+    private function sanitizeFilename(string $name): string
+    {
+        $name = str_replace(' ', '_', $name);
+
+        return preg_replace('/[^a-zA-Z0-9_\-]/', '', $name) ?? $name;
+    }
+}

src/State/LeaveRecapPrintProvider.php

@@ -0,0 +1,212 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\Employee;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use App\Enum\TrackingMode;
+use App\Repository\EmployeeRepository;
+use App\Repository\EmployeeRttBalanceRepository;
+use App\Repository\EmployeeRttPaymentRepository;
+use App\Repository\WorkHourRepository;
+use App\Service\Rtt\RttRecoveryComputationService;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\Response;
+use Throwable;
+use Twig\Environment;
+
+class LeaveRecapPrintProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private EmployeeRepository $employeeRepository,
+        private EmployeeLeaveSummaryProvider $leaveSummaryProvider,
+        private RttRecoveryComputationService $rttRecoveryService,
+        private EmployeeRttBalanceRepository $rttBalanceRepository,
+        private EmployeeRttPaymentRepository $rttPaymentRepository,
+        private EntityManagerInterface $entityManager,
+        private WorkHourRepository $workHourRepository,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $today     = new DateTimeImmutable('today');
+        $employees = $this->employeeRepository->findForPrintBySiteIds([]);
+
+        $siteGroups = [];
+
+        foreach ($employees as $employee) {
+            if (!$employee->getHasActiveContract()) {
+                continue;
+            }
+
+            $site   = $employee->getSite();
+            $siteId = $site ? $site->getId() : 0;
+
+            if (!isset($siteGroups[$siteId])) {
+                $siteGroups[$siteId] = [
+                    'name'      => $site ? $site->getName() : 'Sans site',
+                    'color'     => $site?->getColor() ?? '#ffd7d7',
+                    'employees' => [],
+                ];
+            }
+
+            $siteGroups[$siteId]['employees'][] = $this->buildEmployeeRow($employee, $today);
+            $this->entityManager->clear();
+        }
+
+        // Re-load Twig environment after clear
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('leave-recap/print.html.twig', [
+            'today'      => $today,
+            'siteGroups' => $siteGroups,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4', 'portrait');
+        $dompdf->render();
+
+        $filename = sprintf('recap_conges_%s.pdf', $today->format('Y-m-d'));
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+
+    private function buildEmployeeRow(Employee $employee, DateTimeImmutable $today): array
+    {
+        $contract     = $employee->getContract();
+        $contractName = $contract?->getName();
+        $isForfait    = ContractType::FORFAIT === $contract?->getType();
+        $nature       = ContractNature::tryFrom($employee->getCurrentContractNature());
+        $isInterim    = ContractNature::INTERIM === $nature;
+
+        $cpN1Remaining     = 0.0;
+        $cpN               = '-';
+        $acquiredSaturdays = '-';
+        $rtt               = '-';
+
+        if (!$isInterim) {
+            $leaveYear   = $this->leaveSummaryProvider->resolveLeaveYearForToday($employee);
+            $yearSummary = $this->leaveSummaryProvider->computeYearSummary($employee, $leaveYear);
+
+            if (null !== $yearSummary) {
+                if ($isForfait) {
+                    $cpN1Remaining     = round($yearSummary['previousYearRemainingDays'], 2);
+                    $cpN               = (string) round($yearSummary['acquiredDays'], 2);
+                    $acquiredSaturdays = '-';
+                } else {
+                    $cpN1Remaining     = round($yearSummary['remainingDays'], 2);
+                    $cpN               = (string) round($yearSummary['accruingDays'], 2);
+                    $acquiredSaturdays = (string) round($yearSummary['remainingSaturdays'], 2);
+                }
+            }
+
+            if (!$isForfait && TrackingMode::PRESENCE->value !== $contract?->getTrackingMode()) {
+                try {
+                    $rtt = $this->formatMinutes($this->computeAvailableRttMinutes($employee, $today));
+                } catch (Throwable) {
+                    $rtt = '-';
+                }
+            }
+        }
+
+        return [
+            'lastName'          => $employee->getLastName(),
+            'firstName'         => $employee->getFirstName(),
+            'contractName'      => $contractName,
+            'cpN1Remaining'     => $cpN1Remaining,
+            'cpN'               => $cpN,
+            'acquiredSaturdays' => $acquiredSaturdays,
+            'rtt'               => $rtt,
+        ];
+    }
+
+    private function computeAvailableRttMinutes(Employee $employee, DateTimeImmutable $today): int
+    {
+        $month        = (int) $today->format('n');
+        $year         = (int) $today->format('Y');
+        $exerciseYear = $month >= 6 ? $year + 1 : $year;
+
+        // Exclude incomplete current week: limit to last Sunday
+        $isoDay    = (int) $today->format('N');
+        $limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
+
+        // Include the current week if all existing days are admin-validated
+        if (7 !== $isoDay) {
+            $currentWeekStart = $today->modify('monday this week');
+            $currentWeekEnd   = $currentWeekStart->modify('+6 days');
+            $checkEnd         = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
+            if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
+                $limitDate = $currentWeekEnd;
+            }
+        }
+
+        // Carry from previous exercise
+        $carry   = 0;
+        $balance = $this->rttBalanceRepository->findOneByEmployeeAndYear($employee, $exerciseYear);
+        if (null !== $balance) {
+            $carry = $balance->getTotalOpeningMinutes();
+        } else {
+            $previousTotal = $this->rttRecoveryService->computeTotalRecoveryForExercise($employee, $exerciseYear - 1);
+            $carry         = $previousTotal->totalMinutes;
+        }
+
+        // Current exercise (limited to completed weeks)
+        $current = $this->rttRecoveryService->computeTotalRecoveryForExercise($employee, $exerciseYear, $limitDate);
+
+        // Paid RTT
+        $paid     = 0;
+        $payments = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $exerciseYear);
+        foreach ($payments as $payment) {
+            $paid += $payment->getBase25Minutes() + $payment->getBonus25Minutes()
+                   + $payment->getBase50Minutes() + $payment->getBonus50Minutes();
+        }
+
+        return $carry + $current->totalMinutes - $paid;
+    }
+
+    private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
+    {
+        foreach ($employee->getContractPeriods() as $period) {
+            if ($period->getStartDate() > $today) {
+                continue;
+            }
+            $endDate = $period->getEndDate();
+            if (null === $endDate) {
+                continue;
+            }
+            if ($endDate >= $weekStart && $endDate <= $weekEnd) {
+                return $endDate;
+            }
+        }
+
+        return $weekEnd;
+    }
+
+    private function formatMinutes(int $minutes): string
+    {
+        if (0 === $minutes) {
+            return '0 h';
+        }
+
+        $sign = $minutes < 0 ? '- ' : '';
+        $abs  = abs($minutes);
+        $h    = intdiv($abs, 60);
+        $m    = $abs % 60;
+
+        return 0 === $m ? "{$sign}{$h} h" : "{$sign}{$h} h {$m} m";
+    }
+}

src/State/MileageAllowanceAmountReceiptDownloadProvider.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\MileageAllowance;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\HeaderUtils;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final readonly class MileageAllowanceAmountReceiptDownloadProvider implements ProviderInterface
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        #[Autowire('%kernel.project_dir%/var/uploads')]
+        private string $uploadDir,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): BinaryFileResponse
+    {
+        $mileageAllowance = $this->entityManager->find(MileageAllowance::class, $uriVariables['id']);
+
+        if (null === $mileageAllowance) {
+            throw new NotFoundHttpException('Mileage allowance not found.');
+        }
+
+        $receiptPath = $mileageAllowance->getAmountReceiptPath();
+
+        if (null === $receiptPath) {
+            throw new NotFoundHttpException('No amount receipt found for this mileage allowance.');
+        }
+
+        $absolutePath = sprintf('%s/%s', $this->uploadDir, $receiptPath);
+
+        if (!file_exists($absolutePath)) {
+            throw new NotFoundHttpException('Amount receipt file not found.');
+        }
+
+        $response    = new BinaryFileResponse($absolutePath);
+        $disposition = HeaderUtils::makeDisposition(
+            HeaderUtils::DISPOSITION_ATTACHMENT,
+            $mileageAllowance->getAmountReceiptName() ?? 'justificatif.pdf'
+        );
+        $response->headers->set('Content-Disposition', $disposition);
+
+        return $response;
+    }
+}

src/State/MileageAllowanceAmountReceiptUploadProcessor.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use App\Entity\MileageAllowance;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Uid\Uuid;
+
+final readonly class MileageAllowanceAmountReceiptUploadProcessor implements ProcessorInterface
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private RequestStack $requestStack,
+        #[Autowire('%kernel.project_dir%/var/uploads')]
+        private string $uploadDir,
+    ) {}
+
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): JsonResponse
+    {
+        if (!$data instanceof MileageAllowance) {
+            throw new BadRequestHttpException('Invalid entity.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $file    = $request?->files->get('file');
+
+        if (null === $file) {
+            throw new BadRequestHttpException('No file uploaded.');
+        }
+
+        if ('application/pdf' !== $file->getMimeType()) {
+            throw new BadRequestHttpException('Only PDF files are accepted.');
+        }
+
+        $month        = $data->getMonth();
+        $year         = $month?->format('Y') ?? date('Y');
+        $monthNumber  = $month?->format('m') ?? date('m');
+        $relativePath = sprintf('mileage-receipts/%s/%s', $year, $monthNumber);
+        $absoluteDir  = sprintf('%s/%s', $this->uploadDir, $relativePath);
+
+        if (!is_dir($absoluteDir)) {
+            mkdir($absoluteDir, 0o755, true);
+        }
+
+        $filename     = Uuid::v4()->toRfc4122().'.pdf';
+        $fullRelative = sprintf('%s/%s', $relativePath, $filename);
+        $originalName = $file->getClientOriginalName();
+
+        $file->move($absoluteDir, $filename);
+
+        $data->setAmountReceiptPath($fullRelative);
+        $data->setAmountReceiptName($originalName);
+        $this->entityManager->flush();
+
+        return new JsonResponse(['path' => $fullRelative, 'name' => $originalName], Response::HTTP_OK);
+    }
+}

src/State/MileageAllowanceDeleteProcessor.php

@@ -34,6 +34,16 @@ final readonly class MileageAllowanceDeleteProcessor implements ProcessorInterfa
             }
         }
 
+        $amountReceiptPath = $data->getAmountReceiptPath();
+
+        if (null !== $amountReceiptPath) {
+            $absolutePath = sprintf('%s/%s', $this->uploadDir, $amountReceiptPath);
+
+            if (file_exists($absolutePath)) {
+                unlink($absolutePath);
+            }
+        }
+
         $this->entityManager->remove($data);
         $this->entityManager->flush();
 

src/State/SalaryRecapPrintProvider.php

@@ -15,6 +15,7 @@ use App\Repository\BonusRepository;
 use App\Repository\EmployeeRepository;
 use App\Repository\EmployeeRttPaymentRepository;
 use App\Repository\MileageAllowanceRepository;
+use App\Repository\ObservationRepository;
 use App\Repository\WorkHourRepository;
 use App\Service\Contracts\EmployeeContractResolver;
 use DateInterval;
@@ -36,6 +37,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         private EmployeeRttPaymentRepository $rttPaymentRepository,
         private BonusRepository $bonusRepository,
         private MileageAllowanceRepository $mileageAllowanceRepository,
+        private ObservationRepository $observationRepository,
         private EmployeeContractResolver $contractResolver,
     ) {}
 
@@ -62,20 +64,22 @@ class SalaryRecapPrintProvider implements ProviderInterface
         $monthNumber = (int) $from->format('n');
         $rttPayments = $this->rttPaymentRepository->findByYearAndMonth($year, $monthNumber);
 
-        $bonuses  = $this->bonusRepository->findByMonth($from, $to);
-        $mileages = $this->mileageAllowanceRepository->findByMonth($from, $to);
+        $bonuses      = $this->bonusRepository->findByMonth($from, $to);
+        $mileages     = $this->mileageAllowanceRepository->findByMonth($from, $to);
+        $observations = $this->observationRepository->findByMonth($from, $to);
 
         $days        = $this->buildDays($from, $to);
         $contractMap = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
         $driverMap   = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
 
-        $workHourMap   = $this->buildWorkHourMap($workHours);
-        $absenceMap    = $this->buildAbsenceMap($absences);
-        $rttPaymentMap = $this->buildRttPaymentMap($rttPayments);
-        $bonusMap      = $this->buildBonusMap($bonuses);
-        $mileageMap    = $this->buildMileageMap($mileages);
+        $workHourMap    = $this->buildWorkHourMap($workHours);
+        $absenceMap     = $this->buildAbsenceMap($absences);
+        $rttPaymentMap  = $this->buildRttPaymentMap($rttPayments);
+        $bonusMap       = $this->buildBonusMap($bonuses);
+        $mileageMap     = $this->buildMileageMap($mileages);
+        $observationMap = $this->buildObservationMap($observations);
 
-        $siteGroups = $this->aggregateBySite($employees, $days, $contractMap, $driverMap, $workHourMap, $absenceMap, $rttPaymentMap, $bonusMap, $mileageMap);
+        $siteGroups = $this->aggregateBySite($employees, $days, $contractMap, $driverMap, $workHourMap, $absenceMap, $rttPaymentMap, $bonusMap, $mileageMap, $observationMap);
 
         $options = new Options();
         $options->set('isRemoteEnabled', true);
@@ -204,6 +208,23 @@ class SalaryRecapPrintProvider implements ProviderInterface
         return $map;
     }
 
+    /**
+     * @return array<int, string>
+     */
+    private function buildObservationMap(array $observations): array
+    {
+        $map = [];
+        foreach ($observations as $observation) {
+            $employeeId = $observation->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId] = $observation->getContent();
+        }
+
+        return $map;
+    }
+
     private function aggregateBySite(
         array $employees,
         array $days,
@@ -214,6 +235,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         array $rttPaymentMap,
         array $bonusMap,
         array $mileageMap,
+        array $observationMap,
     ): array {
         $siteGroups = [];
 
@@ -234,6 +256,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
                 $rttPaymentMap[$employeeId] ?? 0,
                 $bonusMap[$employeeId] ?? 0.0,
                 $mileageMap[$employeeId] ?? 0.0,
+                $observationMap[$employeeId] ?? '',
             );
 
             if (!isset($siteGroups[$siteId])) {
@@ -261,6 +284,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         int $rttPaidMinutes,
         float $bonusAmount,
         float $mileageKm,
+        string $observation,
     ): array {
         $contractName       = null;
         $presenceDays       = 0.0;
@@ -298,7 +322,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
                 $nightMinutesTotal += $wh->getNightHoursMinutes() ?? 0;
                 $dayMin   = $wh->getDayHoursMinutes() ?? 0;
                 $nightMin = $wh->getNightHoursMinutes() ?? 0;
-                if ($nightMin > $dayMin && $nightMin > 0) {
+                if (($nightMin > $dayMin && $nightMin > 0) || $nightMin >= 240) {
                     ++$nightBasketCount;
                 }
 
@@ -322,7 +346,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
             } else {
                 $metrics = $this->computeNightMinutes($wh);
                 $nightMinutesTotal += $metrics['nightMinutes'];
-                if ($metrics['nightMinutes'] > $metrics['dayMinutes'] && $metrics['nightMinutes'] > 0) {
+                if (($metrics['nightMinutes'] > $metrics['dayMinutes'] && $metrics['nightMinutes'] > 0) || $metrics['nightMinutes'] >= 240) {
                     ++$nightBasketCount;
                 }
 
@@ -373,6 +397,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
             'driverMeals'      => $driverMeals,
             'driverOvernight'  => $driverOvernight,
             'driverSaturdays'  => $driverSaturdays,
+            'observation'      => $observation,
         ];
     }
 

src/State/WorkHourWeeklySummaryProvider.php

@@ -271,7 +271,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                     $present          = min(1.0, $morning + $afternoon + $creditedPresence);
                 }
 
-                $hasNightBasket = $nightMinutes > $dayMinutes && $nightMinutes > 0;
+                $hasNightBasket = ($nightMinutes > $dayMinutes && $nightMinutes > 0) || $nightMinutes >= 240;
                 if ($hasNightBasket) {
                     ++$weeklyNightBasketCount;
                 }

templates/employee-yearly-hours/print.html.twig

@@ -0,0 +1,151 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <title>{{ employeeName }} - {{ year }}</title>
+
+    <style>
+        @page { size: A4 portrait; margin: 4mm; }
+
+        html, body {
+            margin: 0;
+            padding: 2mm;
+            font-family: Helvetica, sans-serif;
+            font-size: 9px;
+        }
+
+        h1 {
+            text-align: center;
+            font-size: 16px;
+            margin: 0 0 4mm 0;
+        }
+
+        h2 {
+            font-size: 12px;
+            margin: 4mm 0 2mm 0;
+            padding: 2px 6px;
+            background: #e8e8e8;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: auto;
+            border: 2px solid #0a0a0a;
+        }
+
+        th, td {
+            border: 1px solid #0a0a0a;
+            padding: 2px 4px;
+            vertical-align: middle;
+            white-space: nowrap;
+        }
+
+        thead th {
+            text-align: center;
+            font-weight: 700;
+            font-size: 9px;
+            background: #d9e2f3;
+        }
+
+        td { font-size: 9px; }
+        td.date { text-align: left; font-weight: bold; }
+        td.absence { text-align: left; color: #c00; }
+        td.time { text-align: center; }
+        td.presence { text-align: center; }
+        td.total { text-align: center; font-weight: bold; }
+    </style>
+</head>
+<body>
+
+<h1>{{ employeeName }} - {{ year }}</h1>
+
+{% for segment in segments %}
+    {% if segments|length > 1 %}
+        <h2>{{ segment.contractName ?? 'Contrat inconnu' }}{% if segment.mode == 'driver' %} (Chauffeur){% endif %}</h2>
+    {% endif %}
+
+    {% if segment.mode == 'presence' %}
+        <table>
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Absence</th>
+                    <th>Présence matin</th>
+                    <th>Présence après-midi</th>
+                    <th>Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in segment.rows %}
+                    <tr>
+                        <td class="date">{{ row.date }}</td>
+                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="presence">{{ row.presentMorning ? 'X' : '' }}</td>
+                        <td class="presence">{{ row.presentAfternoon ? 'X' : '' }}</td>
+                        <td class="total">{{ row.total }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% elseif segment.mode == 'driver' %}
+        <table>
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Absence</th>
+                    <th>Heures jour</th>
+                    <th>Heures nuit</th>
+                    <th>Heures atelier</th>
+                    <th>Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in segment.rows %}
+                    <tr>
+                        <td class="date">{{ row.date }}</td>
+                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="time">{{ row.dayHours }}</td>
+                        <td class="time">{{ row.nightHours }}</td>
+                        <td class="time">{{ row.workshopHours }}</td>
+                        <td class="total">{{ row.total }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <table>
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Absence</th>
+                    <th>Début matin</th>
+                    <th>Fin matin</th>
+                    <th>Début après-midi</th>
+                    <th>Fin après-midi</th>
+                    <th>Début soir</th>
+                    <th>Fin soir</th>
+                    <th>Total</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in segment.rows %}
+                    <tr>
+                        <td class="date">{{ row.date }}</td>
+                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="time">{{ row.morningFrom }}</td>
+                        <td class="time">{{ row.morningTo }}</td>
+                        <td class="time">{{ row.afternoonFrom }}</td>
+                        <td class="time">{{ row.afternoonTo }}</td>
+                        <td class="time">{{ row.eveningFrom }}</td>
+                        <td class="time">{{ row.eveningTo }}</td>
+                        <td class="total">{{ row.total }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+{% endfor %}
+
+</body>
+</html>

templates/leave-recap/print.html.twig

@@ -0,0 +1,124 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <title>Récapitulatif Congés & RTT</title>
+
+    <style>
+        @page { size: A4 portrait; margin: 4mm; }
+
+        html, body {
+            margin: 0;
+            padding: 2mm;
+            font-family: Helvetica, sans-serif;
+            font-size: 10px;
+        }
+
+        .title-bar {
+            position: relative;
+            margin: 0 0 6mm 0;
+        }
+
+        h1 {
+            text-align: center;
+            font-size: 18px;
+            margin: 0;
+        }
+
+        .date-box {
+            position: absolute;
+            top: 0;
+            right: 0;
+            border: 2px solid #000;
+            padding: 4px 12px;
+            font-size: 14px;
+            font-weight: 700;
+        }
+
+        table.recap {
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: auto;
+            border: 4px solid #0a0a0a;
+        }
+
+        th, td {
+            border: 2px solid #0a0a0a;
+            padding: 3px 5px;
+            vertical-align: middle;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        .site-header td {
+            font-weight: 700;
+            font-size: 12px;
+            text-align: center;
+        }
+
+        thead th {
+            text-align: center;
+            font-weight: 700;
+            font-size: 10px;
+            white-space: normal;
+        }
+
+        td.name {
+            text-align: left;
+            font-weight: bold;
+        }
+        td.base { text-align: center; }
+        td.num  { text-align: center; }
+        td.obs  { min-width: 40mm; }
+
+        tbody td { font-size: 10px; }
+    </style>
+</head>
+<body>
+
+<div class="title-bar">
+    <h1>RECAPITULATIF CONGES & RTT</h1>
+    <div class="date-box">{{ today|date('d/m/Y') }}</div>
+</div>
+
+<table class="recap">
+    <thead>
+        <tr>
+            <th style="text-align: left;">Nom</th>
+            <th>Contrat</th>
+            <th>CP N-1<br>restant</th>
+            <th>Samedi<br>restant</th>
+            <th>CP<br>N</th>
+            <th>RTT</th>
+            <th style="width: 40mm;">Observations</th>
+        </tr>
+    </thead>
+    <tbody>
+    {% for siteId, group in siteGroups %}
+        {% set siteColor = group.color ?? '#B3E5FC' %}
+        <tr class="site-header">
+            <td style="background: {{ siteColor }}; text-align: left;" colspan="7">
+                {{ group.name }}
+            </td>
+        </tr>
+        {% for row in group.employees %}
+            <tr>
+                <td class="name">{{ row.lastName }} {{ row.firstName }}</td>
+                <td class="base">{{ row.contractName ?? '' }}</td>
+                <td class="num">{{ row.cpN1Remaining }}</td>
+                <td class="num">{{ row.acquiredSaturdays }}</td>
+                <td class="num">{{ row.cpN }}</td>
+                <td class="num">{{ row.rtt }}</td>
+                <td class="obs"></td>
+            </tr>
+        {% else %}
+            <tr>
+                <td colspan="7">Aucun employé.</td>
+            </tr>
+        {% endfor %}
+    {% endfor %}
+    </tbody>
+</table>
+
+</body>
+</html>

templates/salary-recap/print.html.twig

@@ -76,7 +76,12 @@
             word-break: break-word;
             font-size: 10px;
         }
-        td.obs  { }
+        td.obs  {
+            text-align: left;
+            white-space: normal;
+            word-break: break-word;
+            font-size: 9px;
+        }
 
         tbody td { font-size: 10px; }
     </style>
@@ -139,7 +144,7 @@
                 <td class="num">{{ row.nightBasketCount > 0 ? row.nightBasketCount : '' }}</td>
                 <td class="num">{{ row.paidHours > 0 ? row.paidHours : '' }}</td>
                 <td class="num">{{ row.sundayHours > 0 ? row.sundayHours : '' }}</td>
-                <td class="num">{{ row.bonusAmount > 0 ? row.bonusAmount : '' }}</td>
+                <td class="num">{{ row.bonusAmount > 0 ? row.bonusAmount ~ ' €' : '' }}</td>
                 <td class="num">{{ row.congesCount > 0 ? row.congesCount : '' }}</td>
                 <td class="dates">{{ row.congesDates }}</td>
                 <td class="num">{{ row.maladieCount > 0 ? row.maladieCount : '' }}</td>
@@ -148,7 +153,7 @@
                 <td class="num">{{ row.isDriver and row.driverMeals > 0 ? row.driverMeals : '' }}</td>
                 <td class="num">{{ row.isDriver and row.driverOvernight > 0 ? row.driverOvernight : '' }}</td>
                 <td class="num">{{ row.isDriver and row.driverSaturdays > 0 ? row.driverSaturdays : '' }}</td>
-                <td class="obs"></td>
+                <td class="obs">{{ row.observation }}</td>
             </tr>
         {% else %}
             <tr>