fix(rtt) : skip non-contracted days in overtime 25% threshold

computeWeeklyOvertime25StartMinutes used a ternary that fell back to 35h
when a day had no active contract. Once periodFrom was uncapped (so the
RTT week iterates the full exercise), pre-hire days were silently
contributing 7h each to the weekly threshold, erasing the 25% overtime
for the employee's first partial week.

Dylan CHABOISSON week 12 (Mar 19 hire, worked Thu 9h + Fri 9h30 +
Sat 3h30 = 22h): threshold was 36h (incorrect), now back to 15h (Thu 8h
+ Fri 7h) so the 7h above threshold + 1h45 bonus are correctly credited.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

CLAUDE.md

@@ -15,6 +15,7 @@
 ## Stack
 - Backend: Symfony + API Platform + Doctrine ORM
 - Frontend: Nuxt 4 + Vue 3 + TypeScript + Tailwind CSS
+- UI library: `@malio/layer-ui` (Nuxt layer, `extends: ['@malio/layer-ui']` dans `nuxt.config.ts`). Composants auto-importés avec préfixe `Malio*` (ex. `MalioSelectCheckbox`, `MalioInputText`…). Doc d'usage dans `node_modules/@malio/layer-ui/COMPONENTS.md`. Tokens Tailwind `m-*` (primary/muted/danger/success/…) et variables CSS `--m-*` fournies par la couche.
 
 ## Project Structure
 - `src/` — Symfony domain, API resources, state providers/processors, services
@@ -32,6 +33,8 @@
 - Contract nature (per period): CDI, CDD, INTERIM
 - **Agence d'intérim** (`InterimAgency` entity, table `interim_agencies`): optionnelle sur `EmployeeContractPeriod` quand nature = INTERIM. Pas de CRUD UI — gérée en BDD. API lecture seule `GET /interim_agencies`. Affichée "Intérim (NomAgence)" sur la liste employés et l'historique contrat.
 - Employee contract history: `employee_contract_periods`, resolved by `EmployeeContractResolver`
+- **Écrans Heures / Heures Conducteurs (vue jour)** : le libellé nature (CDI/CDD/Intérim) sous le nom de l'employé est résolu **à la date filtrée** via `WorkHourDayContext.contractNature` (alimenté par `EmployeeContractResolver::resolveNatureForEmployeeAndDate`), pas via `Employee.currentContractNature` (qui est résolu à aujourd'hui).
+- **Écran Calendrier** : un employé est affiché uniquement si au moins une de ses périodes de contrat (`employee.contractHistory`) intersecte le mois affiché (`[1er ; dernier jour]`). Filtre côté frontend dans `visibleEmployees` (`pages/calendar.vue`).
 - **Planning jours travaillés** (`EmployeeContractPeriod.workDaysHours` : JSON `{iso_day: minutes}`) : obligatoire pour tout contrat TIME **hors 35h/39h/INTERIM** (ex. 4h, 25h, 28h). Somme = `weeklyHours × 60`. Utilisé par `HolidayVirtualHoursResolver` (crédit férié) et `WorkedHoursCreditPolicy` (crédit absence) pour ne créditer que les jours effectivement travaillés. Validation : `EmployeeContractPeriodValidator::assertWorkDaysHours`.
 - Absences: stored per day (auto-split), AM/PM/full day, clear corresponding hour slots
 - Absences with `countAsWorkedHours=true`: credit minutes (TIME) or nothing (PRESENCE)
@@ -45,6 +48,12 @@
 - Saisie d'heures (ou de jours de présence) autorisée sur un férié
 - **Crédit automatique des heures contractuelles** sur un férié Lun-Ven pour tout contrat hors Forfait, **uniquement en l'absence d'absence déclarée** : le total journalier = `max(saisie + credited_absence, référence_contractuelle)`. Référence : 35h→7h, 39h→8h Lun-Jeu/7h Ven, CUSTOM→weeklyHours/5, INTERIM→idem 35h/39h/custom selon weeklyHours. Aucune ligne BDD créée (crédit virtuel). Drivers : crédité en `dayHoursMinutes`. Impacte directement le total hebdo RTT (tranches 25%/50%). Dès qu'une absence est posée sur le férié, le crédit virtuel saute — c'est le `countAsWorkedHours` du type d'absence qui pilote. Services : `App\Service\WorkHours\HolidayVirtualHoursResolver` + `DailyReferenceMinutesResolver`. Doc complète : `doc/holiday-virtual-hours.md`.
 
+## Commentaires de semaine
+- Entité `EmployeeWeekComment` : commentaire libre par employé et semaine ISO (unique `(employee_id, week_start_date)`). `week_start_date` = lundi.
+- CRUD `/employee_week_comments` `ROLE_ADMIN`. Write processor audite via `AuditLogger`.
+- Picto bulle vue semaine (HoursWeekView + DriverHoursWeekView) : fond bleu/rouge. Intégré dans `WeeklySummaryRow.comment/commentId`.
+- Doc : `doc/week-comments.md`.
+
 ## Validation Rules
 - `isValid` (RH): locks line for everyone (admin can only untoggle validation)
 - `isSiteValid` (site manager): locks for non-admin, admin can still edit
@@ -58,6 +67,35 @@
 - INTERIM: no overtime bonuses, no recovery time
 - 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.
+- **FORFAIT — jours de présence et N-1** : les congés posés et imputés sur le stock N-1 ne décrémentent **pas** les jours de présence affichés (`presenceDaysByMonth` et `presenceDaysToToday`). Implémenté dans `EmployeeLeaveSummaryProvider::computePresenceDaysByMonth` via un budget N-1 (= `previousYearTakenDays`) consommé chronologiquement avant comptage des absences. Pour les non-forfait, ce budget vaut toujours 0 → comportement inchangé.
+
+## Onglet Congés (fiche employé)
+- Calendrier annuel des congés (`frontend/components/employees/LeaveTab.vue`) — période = Janvier→Décembre pour FORFAIT, Juin(N-1)→Mai(N) pour les autres contrats. Règle pilotée par le **contrat courant** (cf. `EmployeeLeaveSummaryProvider::resolveYear`), même quand on consulte une année passée.
+- **Sélecteur d'année** en pied de calendrier (zone scrollable, à gauche). Plage : de l'exercice courant jusqu'à `max(floor_contrat, floor_data_start_date)` — `floor_contrat` = premier exercice avec contrat ouvert (`employee.contractHistory[].startDate`) ; `floor_data_start_date` = exercice contenant `RTT_START_DATE` (env, ex. `2026-02-23` → exercice 2026). Le double plancher empêche de remonter avant la mise en service du logiciel. Format : `2026` pour FORFAIT, `Juin 2025 → Mai 2026` sinon.
+- Changement d'année → recharge complète de l'onglet via `useEmployeeLeave.setSelectedLeaveYear(year)` (reload de `getEmployeeLeaveSummary?year=YYYY` + `listAbsences` + `listPublicHolidays`). Backend : filtre `?year=YYYY` validé 2000-2100, et `EmployeeLeaveSummary` expose `dataStartDate` (env `RTT_START_DATE`, injecté via `services.yaml`).
+- Sur un exercice passé (`selectedYear !== currentYear`), les boutons crayon **Jours fractionnés** et **Année N-1 payés** sont **désactivés** : pas d'édition rétroactive des stocks de report.
+- Doc : `doc/leave-tab.md`.
+
+## Onglet RTT (fiche employé)
+- Tableau hebdomadaire (`frontend/components/employees/RttTab.vue`) — exercice fixe Juin(N-1)→Mai(N). Onglet **masqué pour les FORFAIT** (`showRttTab`).
+- **Sélecteur d'année** sous le tableau dans la zone scrollable. Même mécanique que l'onglet Congés (double plancher) : `max(floor_contrat, floor_rttStartDate)`. Format unique : `Juin 2025 → Mai 2026`.
+- Changement d'année → recharge via `useEmployeeRtt.setSelectedRttYear(year)` (`getEmployeeRttSummary?year=YYYY`). `EmployeeRttSummary.rttStartDate` est déjà exposé (champ existant) — il sert à la fois au floor du sélecteur et au masquage des lignes Report avant la mise en service.
+- Sur un exercice passé, le bouton **+ Payer les RTT** est désactivé (pas de paiement rétroactif).
+- Doc : `doc/rtt-tab.md`.
+
+## Vue contrat (sélecteur de phase)
+- Picker `Vue contrat` en haut de la fiche employé (`pages/employees/[id].vue`). Caché si l'employé n'a qu'une phase.
+- Phase = groupe d'`EmployeeContractPeriod` consécutifs partageant la signature `(contract.type, weeklyHours, isDriver)`. Résolu par `App\Service\Contracts\EmployeeContractPhaseResolver`.
+- **Filtre `RTT_START_DATE`** : les phases dont `endDate < RTT_START_DATE` sont masquées (aucune donnée logiciel avant la mise en service). Le resolver reçoit la date via DI (`services.yaml`) ; `Employee::getContractPhases()` lit `$_SERVER['RTT_START_DATE']` pour instancier le resolver côté entité.
+- Exposé via `Employee.contractPhases` (`employee:read`). Endpoints `GET /employees/{id}/leave-summary` et `GET /employees/{id}/rtt-summary` acceptent `?phaseId=N` ; défaut = phase courante.
+- Sélectionner une phase passée :
+  - Onglet **Congés** : période et règles de la phase (Juin→Mai non-forfait, Jan→Déc FORFAIT). Exercice de transition capé sur `phase.endDate`. **Cap `from` au `phase.startDate` uniquement pour FORFAIT** (sémantique année civile). Pour le non-forfait, l'exercice CP reste annuel et continu à travers les changements d'heures (35h→39h, etc.) — seul `resolveEffectivePeriodStart` clampe sur la date d'entrée en contrat des nouveaux embauchés.
+  - Onglet **RTT** : visible ssi `phase.contractType !== FORFAIT`. Tableau hebdo affiché sur l'exercice complet (Juin→Mai) ; `periodFrom` non capé sur `phase.startDate` (les semaines avant embauche ou hors phase apparaissent à 0). `periodTo`/`limitDate` capés sur `phase.endDate` pour les phases clôturées. `+ Payer les RTT` actif uniquement sur l'exercice contenant `phase.endDate`.
+  - Bandeau jaune affiché en mode phase passée. Édition d'absences et des stocks de report (jours fractionnés, Année N-1 payés) désactivée.
+- Sélection non persistée — chaque ouverture de fiche démarre sur la phase courante.
+- CP : solder via `EmployeeContractPeriod.paidLeaveSettledClosureDate` (mécanisme existant). RTT : créer un `EmployeeRttPayment` sur le dernier exercice de la phase.
+- "Exercise year for date" mutualisé dans `App\Service\Exercise\ExerciseYearResolver` (forfait = année civile, non-forfait = Juin N-1 → Mai N).
+- Doc complète : `doc/contract-phase-view.md`.
 
 ## Récap. congés (écran)
 - Accès via sidebar `Récap. congés`, conditionné au flag `User.hasLeaveRecapAccess` (défaut `false`) — activé au create/edit user. Le flag s'applique à tous les profils, y compris admin.

README.md

@@ -23,5 +23,17 @@ docker compose exec -T db psql -U root -d sirh < sirh.sql
 ```sql
 UPDATE users SET roles = '["ROLE_ADMIN","ROLE_SUPER_ADMIN"]' WHERE username = 'emilie';
 ```
+
+## Récupérer la bdd de prod en local
+
+Sur le serveur de prod, créer le dump :
+```shell
 sudo -u postgres pg_dump --no-owner --no-privileges --clean --if-exists sirh_prod > /tmp/sirh_prod_$(date +%F).sql
-scp user@<serveur>:/tmp/sirh_prod_2026-04-14.dump ~/workspace/
+```
+
+En local, récupérer le fichier et l'importer (remplace `YYYY-MM-DD` par la date du dump) :
+```shell
+scp user@<serveur>:/tmp/sirh_prod_YYYY-MM-DD.sql ~/workspace/SIRH/sirh.sql
+docker compose exec -T db psql -U root -d sirh -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
+docker compose exec -T db psql -U root -d sirh < ~/workspace/SIRH/sirh.sql
+```

config/services.yaml

@@ -35,6 +35,14 @@ services:
         arguments:
             $rttStartDate: '%env(RTT_START_DATE)%'
 
+    App\State\EmployeeLeaveSummaryProvider:
+        arguments:
+            $dataStartDate: '%env(RTT_START_DATE)%'
+
+    App\Service\Contracts\EmployeeContractPhaseResolver:
+        arguments:
+            $dataStartDate: '%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.94'
+    app.version: '0.1.101'

doc/contract-phase-view.md

@@ -0,0 +1,90 @@
+# Vue contrat — sélecteur de phase
+
+## Objectif
+
+Permettre à la RH de consulter les onglets Congés et RTT d'un employé selon une phase de contrat passée (ex. un 39h CDI avant un switch FORFAIT, ou un CDD clôturé avec solde de tout compte) sans changer le comportement par défaut sur la phase courante.
+
+## Concept de "phase"
+
+Une **phase** = groupe d'`EmployeeContractPeriod` consécutifs (triés par `startDate`) partageant la signature `(contract.type, weeklyHours, isDriver)`. Le service `EmployeeContractPhaseResolver` (`src/Service/Contracts/EmployeeContractPhaseResolver.php`) calcule ces phases à la volée depuis `Employee::getContractPeriods()`.
+
+Une transition de signature (35h → 39h, 39h → FORFAIT, driver false→true, weeklyHours 28→30, etc.) ouvre une nouvelle phase. Un type différent entre deux périodes de même signature empêche leur fusion (39h → INTERIM → 39h = 3 phases).
+
+## Filtrage par `RTT_START_DATE`
+
+Les phases dont la date de fin est strictement antérieure à `RTT_START_DATE` (env, date de mise en service du logiciel) sont **masquées** du picker. Aucune donnée logiciel (heures, absences) n'existe avant cette date, donc consulter une phase entièrement antérieure n'a pas de sens fonctionnel.
+
+Exemple : un employé sous 35h CDI de 2014 à 2025-10-31 puis 39h CDI depuis 2025-11-01, avec `RTT_START_DATE=2026-02-23` :
+- Phase 35h (2014 → 2025-10-31) : entièrement avant → masquée
+- Phase 39h (depuis 2025-11-01) : chevauche → visible
+- Résultat : 1 seule phase visible → picker caché (seuil ≥ 2 phases)
+
+Une phase dont la date de fin est égale à `RTT_START_DATE` est conservée (inégalité `>=`, non stricte).
+
+`EmployeeContractPhaseResolver` reçoit `RTT_START_DATE` via DI (`services.yaml`). L'entité `Employee::getContractPhases()` lit la valeur depuis `$_SERVER`/`$_ENV` directement (l'entité n'a pas d'injection) et passe la chaîne au constructeur du resolver.
+
+## Picker UI
+
+- Position : en haut de la fiche employé, sous le nom et au-dessus des onglets.
+- Libellé : `Vue contrat`.
+- Caché si l'employé n'a qu'une seule phase.
+- Sélection non persistée — chaque ouverture de fiche démarre sur la phase courante.
+
+## Bandeau d'information
+
+Affiché quand le picker est sur une phase passée. Indique que le mode lecture est partiel — les paiements de solde restent possibles, l'édition d'absences et des stocks de report est désactivée.
+
+## Effet sur les onglets
+
+| Onglet | Effet |
+|---|---|
+| Congés | Recharge avec les règles de la phase. Période Juin→Mai pour non-forfait, Jan→Déc pour FORFAIT. Exercices bornés à la phase. |
+| RTT | Visible ssi `phase.contractType !== FORFAIT`. Le tableau affiche **toujours toutes les semaines de l'exercice** (Juin→Mai). Pour une phase clôturée, `periodTo` et `limitDate` sont capés à `phase.endDate` (les semaines après la fin de phase contribuent 0 au cumul). `periodFrom` n'est pas capé : les semaines avant l'embauche ou avant le début d'une phase passée apparaissent à 0 (pas de contrat → pas de référence → 0 minute). |
+| Heures, Frais, Formation, Contrat, Calendrier | Non impactés. |
+
+## Paiements de solde sur phase passée
+
+- **RTT** : `+ Payer les RTT` activé sur le **dernier exercice de la phase** uniquement (l'exercice contenant `phase.endDate`). Les exercices antérieurs restent en lecture seule.
+- **CP** : utiliser le mécanisme existant `EmployeeContractPeriod.paidLeaveSettledClosureDate` pour solder. Pas de nouveau channel.
+
+## Transition d'exercice
+
+Quand un exercice chevauche deux phases, les bornes sont capées différemment selon le type de phase consultée :
+
+### Phase FORFAIT (passée ou courante)
+
+Le cumul 218 jours est **par année civile**. Toute consultation FORFAIT cape :
+- `from` à `max(phase.startDate, 1er janvier de l'année)`
+- `to` à `min(phase.endDate, 31 décembre de l'année)`
+
+Ex. switch 39h → FORFAIT au 01/05/2026, vue FORFAIT année 2026 → période = [01/05/2026, 31/12/2026].
+
+### Phase non-forfait (35h / 39h / CUSTOM / INTERIM)
+
+L'exercice CP est **annuel** (Juin N-1 → Mai N) et continu à travers les changements d'heures contractuelles dans le même régime non-forfait. La cap **n'applique pas** sur `from` :
+- `from` reste à 1er juin de l'année (le contrat-entry-date est géré par `resolveEffectivePeriodStart` pour les nouveaux embauchés)
+- `to` est borné à `phase.endDate` uniquement quand on consulte une **phase passée**
+
+Ex. employé 35h jusqu'au 31/10/2025 puis 39h depuis le 01/11/2025 :
+- Vue 39h (courante) sur exercice 2026 → période = [01/06/2025, 31/05/2026]. Acquis CP = exercice complet (~27.5 jours à fin avril).
+- Vue 35h (passée) sur exercice 2026 → période = [01/06/2025, 31/10/2025]. Acquis CP = 5 mois de l'exercice.
+
+**Important** : c'est intentionnel que la vue courante 39h inclue les mois Juin-Octobre travaillés en 35h dans son cumul. Le stock CP est annuel, pas par phase ; un changement d'heures ne reset pas le compteur.
+
+## API
+
+Les endpoints suivants acceptent `?phaseId=N` :
+- `GET /employees/{id}/leave-summary`
+- `GET /employees/{id}/rtt-summary`
+
+Quand absent, ils utilisent la phase courante (comportement inchangé).
+
+`Employee.contractPhases` (lecture, groupe `employee:read`) liste les phases au format `{id, contractType, weeklyHours, isDriver, contractNature, startDate, endDate, periodIds, isCurrent}`.
+
+## Tests
+
+- `tests/Service/Contracts/EmployeeContractPhaseResolverTest.php` (unit)
+- `tests/State/EmployeeLeaveSummaryProviderTest.php` (functional, phaseId)
+- `tests/State/EmployeeRttSummaryProviderTest.php` (functional, phaseId)
+- `tests/State/EmployeeRttPaymentProcessorTest.php` (functional, dernier exo phase clôturée)
+- `tests/Service/Exercise/ExerciseYearResolverTest.php` (helper extrait pendant Task 5)

doc/functional-rules.md

@@ -58,6 +58,9 @@ Documents complementaires:
   - mise à jour uniquement quand un employé (`ROLE_SELF`) modifie ses propres heures
   - non mise à jour lors de modifications admin ou chef de site
   - affichée sous le nom de l'employé (visible admin uniquement)
+- Libellé nature de contrat (CDI/CDD/Intérim) affiché sous le nom:
+  - résolu à la date filtrée (période de contrat couvrant ce jour), pas à aujourd'hui
+  - masqué si aucun contrat à cette date (cas rarissime en vue jour puisque l'employé est alors déjà filtré)
 
 ## 4) Absences
 
@@ -71,6 +74,10 @@ Documents complementaires:
 - Calendrier congés: fond coloré selon la couleur du type d'absence (`AbsenceType.color`)
   - demi-journée: dégradé diagonal
   - journée complète: fond plein
+- Visibilité des employés dans le Calendrier:
+  - un employé est affiché si au moins une de ses périodes de contrat intersecte le mois affiché
+  - un employé dont toutes les périodes se terminent avant le 1er du mois (ou commencent après la fin du mois) est masqué
+  - même logique que l'écran Heures : « pas de contrat sur la période → masqué »
 
 ### Effet absence sur les heures
 
@@ -166,6 +173,7 @@ Documents complementaires:
 - Exclusions configurables: variable d'env `EXCLUDED_PUBLIC_HOLIDAYS` (liste de libellés séparés par virgules). Par défaut `"Lundi de Pentecôte"` — journée de solidarité généralement travaillée. Le filtre s'applique à tous les consommateurs (frontend + calculs backend) en amont du retour du service.
 - Onglet congés: jours fériés affichés sur le calendrier avec fond `rgb(179, 229, 252)` et nom au survol
 - Écran Heures et Heures Conducteurs (vue jour): le nom du férié est affiché dans la colonne Absence sous forme de pill (fond `#b3e5fc`, icône `mdi:calendar-star`), distinct du pill absence
+- Écran Heures et Heures Conducteurs (vue semaine): la cellule du jour férié prend le fond `#b3e5fc` quand l'employé n'a pas d'absence ce jour-là, avec le nom du férié au survol (`title`). Si une absence est posée, la couleur de l'absence prime ; le `title` cumule les deux libellés (`Absence — Férié : Nom`).
 - Règle courante:
   - absences autorisées sur jour férié (création/édition depuis l'écran Heures et le Calendrier). Quand une absence est posée, le crédit virtuel férié est désactivé — c'est le `countAsWorkedHours` du type d'absence qui pilote
   - saisie d'heures ou de jours de présence autorisée — les heures saisies comptent normalement dans le total hebdo et le calcul RTT
@@ -306,6 +314,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
       - 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
+    - colonne Cumul (dernière colonne): solde RTT à la fin de chaque semaine = `report N-1 + somme totalMinutes des semaines jusqu'à celle-ci − paiements RTT des mois antérieurs au mois de la semaine`. Le paiement d'un mois M n'est déduit qu'à partir des semaines du mois M+1 (cohérent avec la logique de la ligne "Report mois précédent"). Permet la comparaison ligne à ligne avec un suivi RH externe (Excel)
     - 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)
@@ -328,7 +337,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 | 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 |
+| CP N | Forfait: restant sur quota année civile (acquis − pris depuis N, sans toucher au stock N-1). Non-forfait: en cours d'acquisition |
 | RTT | Minutes disponibles (report N-1 + acquis N - payés). Format `X h Y m`. Forfait et INTERIM: `-` |
 
 ## 10bis) Écran Récap. congés (tableau)
@@ -371,7 +380,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 | Maladie - Nombre | Absence code 'M' ou 'AT' | Jours (demi-journées = 0.5) |
 | Maladie - Date | Absence code 'M' ou 'AT' | Dates formatées dd/mm |
 | CHAUFFEUR - PDJ | WorkHour.hasBreakfast | Comptage mois (chauffeurs uniquement) |
-| CHAUFFEUR - REPAS | WorkHour.hasLunch + hasDinner | Comptage mois (chauffeurs uniquement) |
+| CHAUFFEUR - REPAS | WorkHour.hasLunch + hasDinner | Somme sur le mois : +1 par déjeuner coché et +1 par dîner coché (un jour avec les deux compte 2 repas, chauffeurs uniquement) |
 | CHAUFFEUR - NUITEE | WorkHour.hasOvernight | Comptage mois (chauffeurs uniquement) |
 | CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
 | Observations | — | Colonne vide pour saisie manuelle |
@@ -435,7 +444,8 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 - 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
+- Seuls les jours avec heures saisies, absence, week-end ou jour férié sont affichés
+- Les jours fériés apparaissent toujours sur une ligne dédiée (fond bleu clair) avec la mention "Férié : {nom}" dans la colonne Absence (même si aucune saisie)
 
 ### Colonnes selon le mode de suivi
 
@@ -453,6 +463,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 - 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
+- Jour férié Lun-Ven (hors Forfait, sans absence) : `total = max(saisie + crédit absence, référence contractuelle)` — même règle que l'écran Heures (cf. `HolidayVirtualHoursResolver`). Pour Forfait : pas de crédit virtuel, la ligne férié affiche juste l'éventuelle présence saisie.
 
 ### Nom du fichier
 

doc/leave-tab.md

@@ -0,0 +1,70 @@
+# Onglet "Congés" — fiche employé
+
+## Vue d'ensemble
+
+L'onglet **Congés** de la fiche employé (`frontend/components/employees/LeaveTab.vue`) affiche :
+- un bandeau de compteurs (acquis, pris, reste, en cours d'acquisition, N-1 ou samedis selon le contrat) ;
+- un calendrier annuel coloré des congés posés (12 mois en grille 4×3) ;
+- pour chaque mois, le nombre de jours de présence (`presenceDaysByMonth`) ;
+- un sélecteur d'année en pied de calendrier.
+
+## Période affichée
+
+La période dépend du **type de contrat actuel** de l'employé :
+
+| Type de contrat   | Période affichée               |
+|-------------------|--------------------------------|
+| FORFAIT           | Janvier → Décembre (année civile) |
+| Autres            | Juin (Y-1) → Mai (Y) (exercice CP) |
+
+Cette règle suit `EmployeeLeaveSummaryProvider::resolveYear()` côté backend : la sélection FORFAIT vs non-FORFAIT se fait toujours sur le contrat **courant**, pas sur celui qui était en vigueur à l'année consultée.
+
+## Sélecteur d'année
+
+Position : **en bas du calendrier**, à gauche, à l'intérieur de la zone scrollable. Il scrolle donc avec les mois et apparaît sous la grille.
+
+Plage proposée :
+- du plus récent (= année courante) au plus ancien ;
+- **double plancher** : l'année minimum est `max(floor_historique_contrat, floor_data_start_date)`
+  - **floor_historique_contrat** : dérivé de `employee.contractHistory[].startDate` — premier exercice où l'employé avait un contrat ouvert
+  - **floor_data_start_date** : dérivé de l'env `RTT_START_DATE` (date de mise en service du logiciel, ex. `2026-02-23` → exercice 2026 / année forfait 2026). Aucune donnée historique n'existe avant cette date, donc on ne propose pas d'années antérieures même si le contrat de l'employé est plus ancien.
+- la valeur est exposée par l'API `GET /employees/{id}/leave-summary` via le champ `dataStartDate` (peuplé depuis l'env serveur).
+- en cas d'historique manquant **et** d'env absente, la plage se réduit à l'année courante.
+
+Format des libellés :
+- FORFAIT : `2026`, `2025`, `2024`…
+- Autres : `Juin 2025 → Mai 2026`, `Juin 2024 → Mai 2025`…
+
+Comportement :
+- changer d'année recharge l'intégralité de l'onglet (`getEmployeeLeaveSummary?year=YYYY` + `listAbsences` + `listPublicHolidays`) ;
+- les compteurs du bandeau reflètent l'année sélectionnée.
+
+## Verrouillage des éditions sur années passées
+
+Quand `selectedYear !== currentYear` (consultation d'une année antérieure) :
+- le bouton crayon **Jours fractionnés** (non-FORFAIT) est désactivé ;
+- le bouton crayon **Année N-1 payés** (FORFAIT) est désactivé.
+
+Justification : modifier rétroactivement les stocks de report ou les jours fractionnés d'un exercice clos décalerait silencieusement les soldes de toutes les années postérieures. La consultation reste possible, l'édition non.
+
+## Sélecteur de phase de contrat
+
+Quand l'employé a plusieurs phases de contrat (`Employee.contractPhases.length > 1`), le picker `Vue contrat` en haut de la fiche permet de consulter une phase passée. L'onglet Congés bascule alors sur les règles de la phase choisie :
+- Période Juin→Mai pour les phases non-forfait, Jan→Déc pour FORFAIT.
+- Sélecteur d'année interne borné aux exercices intersectant la phase.
+- Bornes d'exercice cappées sur `phase.endDate` côté backend (l'exercice de transition affiche les soldes acquis jusqu'à la date de fin de phase, pas au-delà).
+- Boutons crayon `Jours fractionnés` / `Année N-1 payés` désactivés (lecture seule sur phase passée).
+
+Cf. `doc/contract-phase-view.md` pour les détails complets.
+
+## Implémentation
+
+- Composable : `frontend/composables/useEmployeeLeave.ts`
+  - État : `selectedLeaveYear`, computed `currentLeaveYear`, `availableLeaveYears`
+  - API : `setSelectedLeaveYear(year)`, `loadLeaveData()`, `resetLoaded()`
+  - `resetLoaded()` (appelé au changement d'employé) remet `selectedLeaveYear = null` pour que la valeur par défaut soit recalculée à partir du nouveau contrat.
+- Composant : `frontend/components/employees/LeaveTab.vue`
+  - Props : `selectedYear`, `availableYears`, `currentYear`
+  - Event : `update-selected-year`
+- Page : `frontend/pages/employees/[id].vue` (câble le composable au composant)
+- Backend : `EmployeeLeaveSummaryProvider` reçoit `RTT_START_DATE` via `services.yaml` (argument `$dataStartDate`) et l'expose dans la réponse `EmployeeLeaveSummary.dataStartDate`. Le filtrage `?year=YYYY` était déjà accepté (validation 2000–2100).

doc/rtt-tab.md

@@ -0,0 +1,62 @@
+# Onglet "RTT" — fiche employé
+
+## Vue d'ensemble
+
+L'onglet **RTT** de la fiche employé (`frontend/components/employees/RttTab.vue`) affiche un tableau hebdomadaire détaillé des heures supplémentaires accumulées et payées sur un exercice :
+- bandeau de navigation par mois (chevrons gauche/droite) ;
+- table semaine par semaine : Heure / Base 25% / 25% / Total 25% / Base 50% / 50% / Total 50% / Total / Cumul ;
+- ligne Report (carry N-1 ou cumul mois précédents) ;
+- ligne Total mois, ligne Payé, ligne Reste ;
+- bouton « + Payer les RTT » dans le bandeau ;
+- sélecteur d'exercice en pied de tableau.
+
+L'onglet est **masqué pour les contrats FORFAIT** (filtre `showRttTab` dans `useEmployeeDetailPage`). Les FORFAIT n'accumulent pas de RTT.
+
+## Période affichée
+
+Toujours **Juin (Y-1) → Mai (Y)**. Le champ `EmployeeRttSummary.year` correspond à `Y` (année de fin d'exercice) ; ex. `year=2026` = `01/06/2025 → 31/05/2026`.
+
+## Sélecteur d'année
+
+Position : sous la table, à l'intérieur de la zone scrollable, à gauche.
+
+Plage proposée :
+- du plus récent (= exercice courant) au plus ancien ;
+- **double plancher** : `max(floor_historique_contrat, floor_data_start_date)`
+  - **floor_historique_contrat** : dérivé de `employee.contractHistory[].startDate` — premier exercice où l'employé avait un contrat ouvert
+  - **floor_data_start_date** : exercice contenant `RTT_START_DATE` (env, ex. `2026-02-23` → exercice 2026)
+- la valeur est exposée par l'API `GET /employees/{id}/rtt-summary` via le champ `rttStartDate` (déjà existant — mais peuplé uniquement quand la date tombe dans l'exercice retourné, donc le composable utilise la première réponse pour borner la plage).
+- format unique : `Juin 2025 → Mai 2026`, `Juin 2024 → Mai 2025`…
+
+Comportement :
+- changer d'exercice recharge `getEmployeeRttSummary?year=YYYY` (le backend valide 2000–2100) ;
+- la table redéploie les semaines de l'exercice sélectionné, navigation par mois conservée.
+
+## Verrouillage des édition sur exercices passés
+
+Quand `selectedYear !== currentYear` (consultation d'un exercice antérieur), le bouton **+ Payer les RTT** est désactivé. Justification : un paiement rétroactif sur un exercice clos décalerait les soldes courants et le report N-1 calculé.
+
+La consultation reste possible, l'édition non.
+
+## Sélecteur de phase de contrat
+
+L'onglet RTT est visible quand la **phase de contrat sélectionnée** n'est pas FORFAIT (et non pas le contrat courant). Concrètement, sur un employé passé en FORFAIT après une période 39h :
+- En vue `FORFAIT` (défaut), l'onglet RTT est masqué.
+- En vue `39h` (phase passée sélectionnée via le picker `Vue contrat`), l'onglet RTT redevient visible avec les exercices Juin→Mai bornés à la phase.
+
+Le bouton `+ Payer les RTT` est activé uniquement sur le **dernier exercice de la phase passée** (l'exercice contenant `phase.endDate`). Les exercices antérieurs sont en lecture seule.
+
+Cf. `doc/contract-phase-view.md` pour les détails complets.
+
+## Implémentation
+
+- Composable : `frontend/composables/useEmployeeRtt.ts`
+  - État : `selectedRttYear`, computed `currentRttYear`, `availableRttYears`
+  - API : `setSelectedRttYear(year)`, `loadRttData()`, `resetLoaded()`
+  - `resetLoaded()` (appelé au changement d'employé) remet `selectedRttYear = null`.
+- Composant : `frontend/components/employees/RttTab.vue`
+  - Props : `selectedYear`, `availableYears`, `currentYear`
+  - Event : `update-selected-year`
+  - Renommage `currentYear` (computed local de l'année du mois affiché) → `displayedMonthYear` pour éviter la collision avec la nouvelle prop.
+- Page : `frontend/pages/employees/[id].vue`
+- Backend : aucun changement — `EmployeeRttSummaryProvider` accepte déjà `?year=YYYY` (validation 2000–2100) et expose `rttStartDate`.

docs/superpowers/specs/2026-05-19-contract-phase-view-design.md

@@ -0,0 +1,230 @@
+# Vue contrat (sélecteur de phase) — Design Spec
+
+## Objectif
+
+Permettre à la RH de consulter les onglets Congés et RTT d'un employé **selon le contrat actuel ET selon ses contrats passés**, sans changement de comportement par défaut.
+
+Cas qui motive : un employé passe de 39h à FORFAIT. Tant que le contrat courant est FORFAIT, les soldes CP/RTT accumulés sous l'ancien contrat 39h sont invisibles ou faussés (l'onglet RTT est masqué, la période Congés passe de Juin→Mai à Jan→Déc, les règles d'acquisition appliquent du FORFAIT_218 à toute année consultée). Conséquence : la RH ne peut plus payer les soldes restants.
+
+Le même verrou existe pour toute fin de contrat avec **solde de tout compte** (notamment fin de CDD) suivie d'un nouveau contrat de type différent.
+
+## Principe directeur
+
+> Une fois passé en contrat X, on utilise toutes les règles X par défaut. Le sélecteur permet de revenir sur les phases passées pour les consulter et solder leurs reliquats.
+
+## Concept de "phase de contrat"
+
+Une **phase** est un groupe d'`EmployeeContractPeriod` consécutifs (triés par `startDate`) partageant la même **signature contractuelle** = `(contract.type, weeklyHours, isDriver)`. La fusion s'arrête dès qu'une période diffère sur l'un de ces trois axes, même si une période identique apparaît plus tard.
+
+La signature inclut `weeklyHours` et `isDriver` parce que :
+- `weeklyHours` détermine les tranches d'heures supp (25%/50%), le rythme d'acquisition CP (cas 4h), la base contractuelle quotidienne.
+- `isDriver` change l'écran (`/driver-hours` vs `/hours`) et les colonnes de WorkHour utilisées pour le calcul RTT.
+
+Exemples :
+- CDD 39h → CDI 39h → FORFAIT : 2 phases (`39h`, `FORFAIT`).
+- CDD 35h → CDI 39h : 2 phases (`35h`, `39h`).
+- 3 CDD 39h consécutifs sans interruption : 1 phase (`39h`).
+- 39h → INTERIM 4 mois → 39h : 3 phases (les `39h` ne fusionnent pas à travers l'`INTERIM`).
+- CUSTOM 28h → CUSTOM 30h : 2 phases (`weeklyHours` diffère).
+- 35h non-driver → 35h driver : 2 phases (`isDriver` diffère).
+
+La règle de groupement vit dans un service backend, pas dans le frontend.
+
+## Backend
+
+### Nouveau service `EmployeeContractPhaseResolver`
+
+Localisation : `src/Service/Contracts/EmployeeContractPhaseResolver.php`.
+
+```php
+public function resolvePhases(Employee $employee): array;
+```
+
+Retour : liste ordonnée (plus récente d'abord) de `ContractPhase` :
+
+| Champ | Type | Description |
+|---|---|---|
+| `id` | `int` | `EmployeeContractPeriod.id` de la première période (par date) du groupe — sert d'identifiant stable. |
+| `contractType` | `ContractType` | Type partagé par les périodes du groupe. |
+| `weeklyHours` | `int` | Heures hebdomadaires (partagées par construction). |
+| `isDriver` | `bool` | Driver flag (partagé par construction). |
+| `startDate` | `DateTimeImmutable` | `startDate` de la première période. |
+| `endDate` | `?DateTimeImmutable` | `endDate` de la dernière période, ou `null` si en cours. |
+| `periodIds` | `list<int>` | IDs des périodes composant la phase, par ordre chronologique. |
+| `isCurrent` | `bool` | `true` si la phase couvre la date du jour (= `endDate === null` ou `endDate >= today`). |
+
+### Exposition API
+
+Nouveau computed field sur `Employee` (lecture seule, groupe `employee:read`) :
+
+```json
+"contractPhases": [
+  { "id": 42, "contractType": "FORFAIT", "weeklyHours": 39, "isDriver": false, "startDate": "2026-05-01", "endDate": null, "isCurrent": true },
+  { "id": 17, "contractType": "THIRTY_NINE_HOURS", "weeklyHours": 39, "isDriver": false, "startDate": "2020-06-01", "endDate": "2026-04-30", "isCurrent": false }
+]
+```
+
+Le calcul se fait à la sérialisation via un getter virtuel `Employee::getContractPhases(): array` qui délègue au resolver.
+
+### Endpoints impactés
+
+Les endpoints `GET /employees/{id}/leave-summary` et `GET /employees/{id}/rtt-summary` acceptent un nouveau paramètre optionnel :
+
+- `?phaseId=N` : id de la phase à consulter.
+- Si absent → phase courante (= comportement actuel inchangé).
+- Si invalide (phase n'appartient pas à l'employé) → 422.
+- `?year=YYYY` reste accepté en parallèle et continue de cibler un exercice précis.
+
+### Modifications des providers
+
+**`EmployeeLeaveSummaryProvider`** :
+- Nouvelle méthode `resolveTargetPhase(Employee $e, ?int $phaseId): ContractPhase` qui retourne la phase demandée ou la phase courante.
+- `resolveLeavePolicy(...)` reçoit la phase au lieu de lire `$employee->getContract()`. Le `contract.type` et le `weeklyHours` viennent de la signature de la phase (homogène par construction).
+- `resolvePeriodBounds(...)` : les bornes de l'exercice sont en plus contraintes à `[max(periodStart, phase.startDate), min(periodEnd, phase.endDate ?? periodEnd)]`.
+- `resolveYear(...)` : si `phaseId` fourni et pas de `year` explicite, default = dernier exercice intersectant la phase (= année de `phase.endDate` ou année courante si phase en cours).
+- Si `?year` est fourni hors de la plage des exercices intersectant la phase → **clamp silencieux** à l'exercice valide le plus proche, pas d'erreur 422 (cohérence avec l'expérience picker frontend).
+- `resolveAccrualCalculationEndDate(...)` et `resolveTakenCalculationEndDate(...)` : caps additionnels sur `phase.endDate` quand la phase n'est pas la phase courante.
+- `resolveFirstComputationYear(...)` : restreint aux exercices intersectant la phase.
+
+**`EmployeeRttSummaryProvider`** :
+- Mêmes principes : `?phaseId` côté API, `resolveTargetPhase`, bornes d'exercice cappées à la phase, `rttStartDate` exposé pour borner le sélecteur d'année frontend.
+- Pour une phase FORFAIT, le tab RTT est masqué frontend, donc l'endpoint n'est pas appelé en pratique. Pas de garde spécifique côté backend, le comportement existant (retour d'un summary potentiellement vide/inutile) suffit.
+
+### Paiements de solde
+
+**RTT — `EmployeeRttPaymentProcessor`** :
+- Garde actuelle "exercice courant uniquement" devient : "exercice courant OU dernier exercice d'une phase clôturée".
+- Concrètement, autoriser la création d'un `EmployeeRttPayment` sur l'exercice contenant `phase.endDate` d'une phase non courante.
+- Les exercices antérieurs au dernier de la phase restent verrouillés (lecture seule).
+
+**CP — settlement period-level** :
+- Le mécanisme existant `EmployeeContractPeriod.paidLeaveSettledClosureDate` reste le canal pour solder. Aucun changement de modèle.
+- Le bouton "Année N-1 payés" (FORFAIT) et "Jours fractionnés" (non-FORFAIT) restent désactivés sur une phase passée — ce ne sont pas des paiements de solde mais des éditions de stock.
+
+### Audit
+
+- La création d'`EmployeeRttPayment` est déjà auditée (existant).
+- La modification de `paidLeaveSettledClosureDate` est déjà auditée via `EmployeeContractPeriodManager` (existant).
+- Aucun audit nouveau requis.
+
+## Frontend
+
+### Picker
+
+- Composant `MalioSelect` placé dans `pages/employees/[id].vue`, dans le header de la fiche, sous le nom de l'employé et au-dessus de la barre d'onglets.
+- Libellé : `Vue contrat`.
+- Options formatées :
+  - `FORFAIT — depuis 01/05/2026 (actuel)`
+  - `39h CDI — 01/06/2020 → 30/04/2026`
+- **Caché** si `contractPhases.length <= 1` (employé mono-phase, ~majorité des cas).
+- Sélection en mémoire (état du composable), **non persistée** entre navigations ou rechargements. Chaque ouverture de fiche démarre sur la phase courante.
+
+### Bandeau d'information
+
+Affiché quand `selectedPhase.id !== currentPhase.id` :
+
+> Vous consultez l'historique **{contractType} — jusqu'au {endDate}**.  
+> Les paiements de solde sont possibles ; l'édition d'absences et des stocks de report est désactivée.
+
+Style : bandeau jaune doux (`bg-warning-100 border-warning-300`), sous le picker, au-dessus des onglets.
+
+### Composables
+
+**Nouveau `useEmployeeContractPhase()`** :
+- État : `selectedPhase`, `currentPhase` (computed depuis `employee.contractPhases`).
+- Computed : `availablePhases`, `isViewingPastPhase`.
+- API : `setSelectedPhase(phaseId)`, `resetToCurrent()`.
+- `resetToCurrent()` appelé au changement d'employé.
+
+**`useEmployeeLeave`** :
+- Reçoit `phaseId` en paramètre lors des appels à `getEmployeeLeaveSummary` / `listAbsences`.
+- `availableLeaveYears` borné aux exercices intersectant la phase sélectionnée.
+- `setSelectedPhase` côté parent → reset de `selectedLeaveYear` et reload.
+
+**`useEmployeeRtt`** :
+- Idem pour `getEmployeeRttSummary`, `availableRttYears`.
+
+**`useEmployeeDetailPage`** :
+- `showRttTab` devient : `selectedPhase.contractType !== FORFAIT`.
+- La logique de fallback ("si sur l'onglet RTT et FORFAIT, basculer ailleurs") s'applique aussi quand on bascule de phase 39h vers phase FORFAIT.
+
+### Onglets
+
+- **Congés** : reçoit la phase via le composable. Bouton "Année N-1 payés" / "Jours fractionnés" reste désactivé sur phase passée (idem que sur exercice passé).
+- **RTT** : visibilité driver par la phase. Bouton "+ Payer les RTT" activé **uniquement sur le dernier exercice de la phase passée**, désactivé sur les exercices antérieurs de la phase.
+- **Heures, Frais, Formation, Contrat, Calendrier** : non impactés.
+
+### Format des libellés du picker
+
+Format de la phase : `{labelContractType} — {startDateFR} → {endDateFR}`, suffixé `(actuel)` si phase courante.
+
+`labelContractType` mapping :
+- `FORFAIT` → `FORFAIT`
+- `THIRTY_FIVE_HOURS` → `35h`
+- `THIRTY_NINE_HOURS` → `39h`
+- `INTERIM` → `Intérim`
+- `CUSTOM` → `CUSTOM ({weeklyHours}h)` (les heures hebdo sont homogènes par construction dans une phase)
+
+Suffixe `(driver)` ajouté quand `isDriver=true`, ex. `35h CDI (driver) — ...`.
+
+## Migration et impact sur l'existant
+
+- Aucune migration de données. Le concept de phase est calculé à la volée depuis l'historique existant.
+- Comportement inchangé pour tout employé avec une seule phase (cas standard).
+- Comportement inchangé quand `phaseId` n'est pas fourni → phase courante.
+- Pas de breaking change API : `contractPhases` est un champ additionnel ; `?phaseId` est un paramètre optionnel.
+
+## Tests
+
+### Unit
+
+- `EmployeeContractPhaseResolverTest` :
+  - Employé mono-période → 1 phase, `isCurrent=true`.
+  - Trois périodes même signature consécutives → 1 phase.
+  - Switch 39h → FORFAIT → 2 phases avec `startDate`/`endDate` correctes.
+  - 39h → INTERIM 4 mois → 39h → 3 phases (pas de fusion).
+  - 35h → 39h → 2 phases (type différent).
+  - CUSTOM 28h → CUSTOM 30h → 2 phases (`weeklyHours` diffère).
+  - 35h non-driver → 35h driver → 2 phases (`isDriver` diffère).
+
+### Functional
+
+- `EmployeeLeaveSummaryProvider` avec `phaseId` :
+  - Phase 39h passée → `ruleCode = CDI_CDD_NON_FORFAIT`, période Juin→Mai, exercice de transition capé à `phase.endDate`.
+  - Phase FORFAIT passée → `ruleCode = FORFAIT_218`, période Jan→Déc.
+  - `phaseId` invalide pour l'employé → 422.
+  - `?year` hors de la plage de la phase → clamp silencieux à l'exercice intersectant le plus proche.
+
+- `EmployeeRttSummaryProvider` avec `phaseId` :
+  - Phase 39h passée → données RTT renvoyées, bornes cappées sur `phase.endDate`.
+  - `?year` hors de la plage de la phase → clamp silencieux.
+
+- `EmployeeRttPaymentProcessor` :
+  - Création autorisée sur exercice de fin d'une phase passée.
+  - Création refusée sur un exercice antérieur d'une phase passée.
+
+### Documentation à mettre à jour
+
+Obligatoire par CLAUDE.md :
+
+- `doc/contract-phase-view.md` — nouveau fichier détaillant la fonctionnalité.
+- `doc/leave-tab.md` — section "Sélecteur de phase" + interaction avec le sélecteur d'année.
+- `doc/rtt-tab.md` — section "Sélecteur de phase" + règle de visibilité.
+- `frontend/data/documentation-content.ts` — article niveau `admin`.
+- `CLAUDE.md` — bloc "Vue contrat (sélecteur de phase)" sous Onglet Congés / Onglet RTT.
+
+## Hors scope
+
+- Surface d'alerte automatique sur les fiches employés ayant des soldes non payés sur des phases passées (potentiel follow-up).
+- Persistance de la sélection du picker entre navigations.
+- Picker exposé sur le calendrier global ou tout autre écran que la fiche employé.
+- Modification de `WorkHourDayContext` (déjà date-driven, pas concerné).
+- Évolution du mécanisme `paidLeaveSettledClosureDate` (canal existant suffisant).
+- Cas exotiques : phases overlap (interdit par la modélisation actuelle), périodes avec dates incohérentes.
+
+## Décisions confirmées avec l'utilisateur
+
+- Picker global en haut de la fiche, **pas** par onglet.
+- Phases groupées par `contract.type` consécutif.
+- Sur une phase passée : exercices antérieurs visibles **en lecture seule**, seul le dernier exercice de la phase ouvre les actions de solde (RTT pay, CP settlement period-level).
+- Comportement par défaut (phase courante) strictement inchangé.

frontend/.npmrc

@@ -0,0 +1 @@
+@malio:registry=https://gitea.malio.fr/api/packages/MALIO-DEV/npm/

frontend/components/AbsenceFormDrawer.vue

@@ -1,44 +1,26 @@
 <template>
     <AppDrawer v-model="drawerOpen" title="Nouvelle absence">
         <form class="space-y-4" @submit.prevent="handleSubmit">
-            <div>
+            <MalioSelect
-                <label class="text-md font-semibold text-neutral-700" for="employee">
+                :model-value="absenceForm.employeeId === '' ? null : absenceForm.employeeId"
-                    Employé <span class="text-red-600">*</span>
+                :options="employeeOptions"
-                </label>
+                label="Employé *"
-                <select
+                empty-option-label="Choisir un employé"
-                    id="employee"
+                min-width=""
-                    v-model="absenceForm.employeeId"
-                    :class="employeeFieldClass"
                 :disabled="props.lockEmployee"
-                >
+                :error="showEmployeeError ? `L'employé est obligatoire.` : ''"
-                    <option value="" disabled>Choisir un employé</option>
+                @update:model-value="onEmployeeChange"
-                    <option v-for="employee in employees" :key="employee.id" :value="employee.id">
+            />
-                        {{ employee.firstName }} {{ employee.lastName }}
-                    </option>
-                </select>
-                <p v-if="showEmployeeError" class="mt-1 text-sm text-red-600">
-                    L'employé est obligatoire.
-                </p>
-            </div>
 
-            <div>
+            <MalioSelect
-                <label class="text-md font-semibold text-neutral-700" for="type">
+                :model-value="absenceForm.typeId === '' ? null : absenceForm.typeId"
-                    Type d'absence <span class="text-red-600">*</span>
+                :options="typeOptions"
-                </label>
+                label="Type d'absence *"
-                <select
+                empty-option-label="Choisir un type"
-                    id="type"
+                min-width=""
-                    v-model="absenceForm.typeId"
+                :error="showTypeError ? `Le type d'absence est obligatoire.` : ''"
-                    :class="typeFieldClass"
+                @update:model-value="onTypeChange"
-                >
+            />
-                    <option value="" disabled>Choisir un type</option>
-                    <option v-for="type in absenceTypes" :key="type.id" :value="type.id">
-                        {{ type.label }} ({{ type.code }})
-                    </option>
-                </select>
-                <p v-if="showTypeError" class="mt-1 text-sm text-red-600">
-                    Le type d'absence est obligatoire.
-                </p>
-            </div>
 
             <div class="space-y-4">
                 <div>
@@ -48,17 +30,15 @@
                             id="start-date"
                             v-model="absenceForm.startDate"
                             type="date"
-                            class="w-full rounded-md border border-neutral-300 px-3 py-2 text-md text-neutral-900"
+                            :class="[dateInputBaseClass, absenceForm.startDate ? 'border-black' : 'border-m-muted']"
                             :disabled="props.lockDates"
                         />
-                        <select
+                        <MalioSelect
-                            v-model="absenceForm.startHalf"
+                            :model-value="absenceForm.startHalf"
-                            class="w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
+                            :options="halfDayOptions"
-                        >
+                            min-width=""
-                            <option v-for="half in HALF_DAYS" :key="half.value" :value="half.value">
+                            @update:model-value="(v) => { if (v !== null) absenceForm.startHalf = v as HalfDay }"
-                                {{ half.label }}
+                        />
-                            </option>
-                        </select>
                     </div>
                 </div>
                 <div>
@@ -68,17 +48,15 @@
                             id="end-date"
                             v-model="absenceForm.endDate"
                             type="date"
-                            class="w-full rounded-md border border-neutral-300 px-3 py-2 text-md text-neutral-900"
+                            :class="[dateInputBaseClass, absenceForm.endDate ? 'border-black' : 'border-m-muted']"
                             :disabled="props.lockDates"
                         />
-                        <select
+                        <MalioSelect
-                            v-model="absenceForm.endHalf"
+                            :model-value="absenceForm.endHalf"
-                            class="w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
+                            :options="halfDayOptions"
-                        >
+                            min-width=""
-                            <option v-for="half in HALF_DAYS" :key="half.value" :value="half.value">
+                            @update:model-value="(v) => { if (v !== null) absenceForm.endHalf = v as HalfDay }"
-                                {{ half.label }}
+                        />
-                            </option>
-                        </select>
                     </div>
                 </div>
             </div>
@@ -110,13 +88,12 @@
                 </button>
             </div>
             <div v-else class="flex justify-center pt-2">
-                <button
+                <MalioButton
                     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"
+                    label="Valider"
-                    :class="submitButtonClass"
+                    button-class="w-[200px]"
-                >
+                    :disabled="props.isSubmitting || !isFormValid"
-                    + Ajouter
+                />
-                </button>
             </div>
         </form>
     </AppDrawer>
@@ -189,20 +166,23 @@ const submitButtonClass = computed(() => {
     return ''
 })
 
-const baseSelectClass =
+const employeeOptions = computed(() =>
-    'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
+    props.employees.map((e) => ({ label: `${e.firstName} ${e.lastName}`, value: e.id }))
-const employeeFieldClass = computed(() => {
+)
-    if (showEmployeeError.value) {
+const typeOptions = computed(() =>
-        return `${baseSelectClass} border-red-500`
+    props.absenceTypes.map((t) => ({ label: `${t.label} (${t.code})`, value: t.id }))
-    }
+)
-    return `${baseSelectClass} border-neutral-300`
+const halfDayOptions = HALF_DAYS.map((h) => ({ label: h.label, value: h.value }))
-})
+
-const typeFieldClass = computed(() => {
+const dateInputBaseClass =
-    if (showTypeError.value) {
+    'h-10 w-full rounded-md border px-3 text-md text-black outline-none focus:border-2 focus:border-m-primary'
-        return `${baseSelectClass} border-red-500`
+
-    }
+const onEmployeeChange = (value: string | number | null) => {
-    return `${baseSelectClass} border-neutral-300`
+    absenceForm.value.employeeId = value === null ? '' : Number(value)
-})
+}
+const onTypeChange = (value: string | number | null) => {
+    absenceForm.value.typeId = value === null ? '' : Number(value)
+}
 
 watch(
     () => props.modelValue,

frontend/components/AppDrawer.vue

@@ -17,7 +17,7 @@
             <Icon name="mdi:close" size="24"/>
           </button>
         </div>
-        <div class="min-h-0 flex-1 overflow-y-auto px-[20px] pb-4">
+        <div class="min-h-0 flex-1 overflow-y-auto px-[20px] pb-4 pt-1">
           <slot />
         </div>
       </div>

frontend/components/EmployeeNameFilterInput.vue

@@ -1,26 +0,0 @@
-<template>
-    <div class="relative w-full max-w-[340px]">
-        <input
-            id="employee-search"
-            v-model="model"
-            type="text"
-            :placeholder="placeholder"
-            class="h-10 w-full rounded-md border border-neutral-300 bg-white pl-3 pr-10 text-md text-neutral-900"
-        />
-        <Icon
-            name="mdi:magnify"
-            size="18"
-            class="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-neutral-500"
-        />
-    </div>
-</template>
-
-<script setup lang="ts">
-const model = defineModel<string>({required: true})
-
-withDefaults(defineProps<{
-    placeholder?: string
-}>(), {
-    placeholder: "Recherche d'un employé"
-})
-</script>

frontend/components/SiteFilterSelector.vue

@@ -1,69 +0,0 @@
-<template>
-  <div ref="root" class="relative inline-block w-fit max-w-full">
-    <button
-      type="button"
-      class="inline-flex w-[320px] min-h-10 items-center justify-between gap-2 rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500 hover:bg-tertiary-500"
-      @click="isOpen = !isOpen"
-    >
-      <span>Sites</span>
-      <span class="inline-flex items-center gap-2">
-        <span class="text-sm font-medium text-neutral-600">{{ selectedCount }}/{{ sites.length }}</span>
-        <Icon :name="isOpen ? 'mdi:chevron-up' : 'mdi:chevron-down'" size="18" />
-      </span>
-    </button>
-
-    <div
-      v-if="isOpen"
-      class="z-50 absolute left-0 top-full z-20 mt-2 max-h-80 w-full overflow-auto rounded-md border border-neutral-200 bg-white p-3 shadow-lg"
-    >
-      <div class="flex flex-col gap-2">
-        <label
-          v-for="site in sites"
-          :key="site.id"
-          :for="`site-${site.id}`"
-          class="flex cursor-pointer items-center gap-2 rounded px-2 py-1 hover:bg-tertiary-500"
-        >
-          <input
-            :id="`site-${site.id}`"
-            v-model="selectedSiteIds"
-            :value="site.id"
-            type="checkbox"
-            class="h-4 w-4"
-          />
-          <span class="text-md text-neutral-800">{{ site.name }}</span>
-        </label>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
-import type { Site } from '~/services/dto/site'
-
-const selectedSiteIds = defineModel<number[]>({ required: true })
-const isOpen = ref(false)
-const root = ref<HTMLElement | null>(null)
-
-defineProps<{
-  sites: Site[]
-}>()
-
-const selectedCount = computed(() => selectedSiteIds.value.length)
-
-const handleClickOutside = (event: MouseEvent) => {
-  const target = event.target as Node | null
-  if (!root.value || !target) return
-  if (!root.value.contains(target)) {
-    isOpen.value = false
-  }
-}
-
-onMounted(() => {
-  document.addEventListener('click', handleClickOutside)
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('click', handleClickOutside)
-})
-</script>

frontend/components/driver-hours/DriverHoursDayView.vue

@@ -43,7 +43,7 @@
                         </p>
                         <p class="text-neutral-500 truncate inline-flex items-center gap-2">
                             <span>
-                                {{ employee.site?.name ?? 'Sans site' }}<span v-if="employee.currentContractNature"> — {{ contractNatureLabel(employee.currentContractNature) }}</span>
+                                {{ employee.site?.name ?? 'Sans site' }}<span v-if="getRowContractNature(employee.id)"> — {{ contractNatureLabel(getRowContractNature(employee.id) ?? undefined) }}</span>
                             </span>
                             <span
                                 v-if="isAdmin && (rows[employee.id]?.isSiteValid ?? false)"
@@ -205,6 +205,7 @@ const props = defineProps<{
     getRowMetrics: (employeeId: number) => { dayMinutes: number; nightMinutes: number; workshopMinutes: number; totalMinutes: number; virtualHolidayMinutes: number }
     getRowAbsenceLabel: (employeeId: number) => string
     getRowAbsenceStyle: (employeeId: number) => { backgroundColor: string } | undefined
+    getRowContractNature: (employeeId: number) => 'CDI' | 'CDD' | 'INTERIM' | null
     getRowUpdatedAt: (employeeId: number) => string
     onAbsenceClick: (employeeId: number) => void
     formatMinutes: (minutes: number) => string

frontend/components/driver-hours/DriverHoursWeekView.vue

@@ -33,8 +33,11 @@
             {{ row.firstName }} {{ row.lastName }}
             <span class="font-normal text-neutral-600">({{ row.contractName ?? '-' }})</span>
           </p>
-          <p class="text-[11px] text-neutral-500 truncate">
+          <p class="text-[11px] text-neutral-500 truncate inline-flex items-center gap-2">
-            {{ row.siteName ?? 'Sans site' }}<span v-if="row.contractNature"> — {{ contractNatureLabel(row.contractNature) }}</span>
+            <span>{{ row.siteName ?? 'Sans site' }}<span v-if="row.contractNature"> — {{ contractNatureLabel(row.contractNature) }}</span></span>
+            <button v-if="isAdmin" type="button" class="inline-flex items-center justify-center rounded-md p-1 text-white transition-colors" :class="row.comment ? 'bg-red-500 hover:bg-red-600' : 'bg-primary-500 hover:bg-secondary-500'" :title="row.comment ?? 'Ajouter un commentaire'" @click="$emit('open-comment', row)">
+              <Icon name="mdi:comment-text-outline" size="12"/>
+            </button>
           </p>
         </div>
 
@@ -44,7 +47,7 @@
           class="text-left leading-4 rounded-md px-2 py-1"
           :class="daily.hasAbsence ? 'text-white' : ''"
           :style="getDailyCellStyle(daily)"
-          :title="daily.absenceLabel ?? ''"
+          :title="cellTitle(daily)"
         >
           <div>J {{ formatMinutes(daily.dayMinutes) }}</div>
           <div>N {{ formatMinutes(daily.nightMinutes) }}</div>
@@ -93,19 +96,37 @@
 import type { WeeklyWorkHourSummary } from '~/services/dto/work-hour'
 import { contractNatureLabel } from '~/utils/contract'
 
+const HOLIDAY_BG_COLOR = '#b3e5fc'
+
 const getDailyCellStyle = (daily: {
   hasAbsence?: boolean
   absenceColor?: string | null
+  holidayLabel?: string | null
 }) => {
-  if (!daily.hasAbsence) return undefined
+  if (daily.hasAbsence) return { backgroundColor: daily.absenceColor || '#dc2626' }
-  return { backgroundColor: daily.absenceColor || '#dc2626' }
+  if (daily.holidayLabel) return { backgroundColor: HOLIDAY_BG_COLOR }
+  return undefined
+}
+
+const cellTitle = (daily: {
+  hasAbsence?: boolean
+  absenceLabel?: string | null
+  holidayLabel?: string | null
+}) => {
+  const parts: string[] = []
+  if (daily.absenceLabel) parts.push(daily.absenceLabel)
+  if (daily.holidayLabel) parts.push(`Férié : ${daily.holidayLabel}`)
+  return parts.join(' — ')
 }
 
 defineProps<{
   isWeekLoading: boolean
+  isAdmin: boolean
   weekGridCols: string
   weeklySummary: WeeklyWorkHourSummary | null
   weekDayHeaders: Array<{ date: string; weekday: string; dayDate: string }>
   formatMinutes: (minutes: number) => string
 }>()
+
+defineEmits<{ (e: 'open-comment', row: WeeklyWorkHourSummary['rows'][number]): void }>()
 </script>

frontend/components/employees/LeaveTab.vue

@@ -39,6 +39,8 @@
                 </div>
                 <button
                     class="flex items-center"
+                    :class="isHistoricalYear ? 'opacity-40 cursor-not-allowed' : ''"
+                    :disabled="isHistoricalYear"
                     @click="openPaidLeaveDrawer"
                 >
                     <Icon name="mdi:edit-box" size="24"/>
@@ -51,6 +53,8 @@
                 </div>
                 <button
                     class="flex items-center"
+                    :class="isHistoricalYear ? 'opacity-40 cursor-not-allowed' : ''"
+                    :disabled="isHistoricalYear"
                     @click="openFractionedDrawer"
                 >
                     <Icon name="mdi:edit-box" size="24"/>
@@ -90,6 +94,22 @@
                     </div>
                 </div>
             </div>
+            <div class="mt-6 flex items-center gap-3">
+                <label for="leave-year-select" class="text-md font-semibold text-primary-500 uppercase">
+                    {{ isForfaitRule ? 'Année :' : 'Exercice :' }}
+                </label>
+                <select
+                    id="leave-year-select"
+                    :value="selectedYear ?? ''"
+                    :disabled="!availableYears.length"
+                    class="border border-primary-500 rounded-md px-3 py-1 text-md font-semibold text-primary-500 bg-white focus:outline-none focus:ring-2 focus:ring-secondary-500/20 disabled:opacity-50"
+                    @change="handleYearChange"
+                >
+                    <option v-for="option in availableYears" :key="option.value" :value="option.value">
+                        {{ option.label }}
+                    </option>
+                </select>
+            </div>
         </div>
         <AppDrawer v-model="isFractionedDrawerOpen" title="Jours fractionnés">
             <form class="space-y-4" @submit.prevent="handleSubmitFractioned">
@@ -173,17 +193,39 @@ type DayLeaveState = {
     colors: string[]
 }
 
+type LeaveYearOption = {
+    value: number
+    label: string
+}
+
 const props = defineProps<{
     absences: Absence[]
     summary: EmployeeLeaveSummary | null
     publicHolidays: Record<string, string>
+    selectedYear: number | null
+    availableYears: LeaveYearOption[]
+    currentYear: number | null
 }>()
 
 const emit = defineEmits<{
     (event: 'update-fractioned-days', days: number): void
     (event: 'update-paid-leave-days', days: number): void
+    (event: 'update-selected-year', year: number): void
 }>()
 
+const isHistoricalYear = computed(() =>
+    props.selectedYear !== null
+    && props.currentYear !== null
+    && props.selectedYear !== props.currentYear
+)
+
+const handleYearChange = (event: Event) => {
+    const target = event.target as HTMLSelectElement
+    const value = Number(target.value)
+    if (Number.isNaN(value)) return
+    emit('update-selected-year', value)
+}
+
 const isFractionedDrawerOpen = ref(false)
 const fractionedForm = reactive({days: 0})
 
@@ -239,6 +281,7 @@ const currentYearTakenDays = computed(() => {
 })
 
 const displayedYear = computed(() => {
+    if (props.selectedYear) return props.selectedYear
     if (props.summary?.year) return props.summary.year
     const today = new Date()
     const year = today.getFullYear()

frontend/components/employees/RttTab.vue

@@ -11,7 +11,7 @@
           <Icon name="mdi:chevron-left" size="24"/>
         </button>
         <span class="text-lg font-bold tracking-wide min-w-[170px] text-center">
-          {{ currentMonthLabel }} {{ currentYear }}
+          {{ currentMonthLabel }} {{ displayedMonthYear }}
         </span>
         <button
           class="rounded px-2 py-1 font-bold hover:bg-primary-600 disabled:opacity-40 disabled:cursor-not-allowed flex items-center"
@@ -27,7 +27,8 @@
       </p>
         <div class="flex justify-center">
             <button
-                class="rounded-md bg-primary-500 px-8 py-2 font-bold text-white hover:bg-primary-600"
+                class="rounded-md bg-primary-500 px-8 py-2 font-bold text-white hover:bg-primary-600 disabled:opacity-40 disabled:cursor-not-allowed"
+                :disabled="isPayDisabled"
                 @click="openPaymentDrawer"
             >
                 + Payer les RTT
@@ -40,14 +41,15 @@
       <table class="w-full table-fixed border-collapse text-[18px]">
         <colgroup>
           <col />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
         </colgroup>
         <thead>
           <tr>
@@ -59,7 +61,8 @@
             <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">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>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Total</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Cumul</th>
           </tr>
         </thead>
         <tbody>
@@ -73,6 +76,7 @@
             <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 border-r-2">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryFromPreviousYearMinutes) }}</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>
 
@@ -86,6 +90,7 @@
             <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 border-r-2">{{ formatMinutes(monthReport.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total) }}</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>
 
@@ -126,10 +131,14 @@
               <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">
+            <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.totalMinutes) }}</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.cumulativeBalanceMinutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(week.cumulativeBalanceMinutes) }}</span></span>
+              <span v-else>&nbsp;</span>
+            </td>
           </tr>
 
           <!-- Total row -->
@@ -142,20 +151,22 @@
             <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-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>
+            <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.total) }}</td>
+            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-t-2">-</td>
           </tr>
 
           <!-- Payé row -->
           <tr>
             <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">{{ currentPayment ? formatMinutes(-currentPayment.paidBase25Minutes) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -currentPayment.paidBase25Minutes : 0) }}</span></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">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus25Minutes) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -currentPayment.paidBonus25Minutes : 0) }}</span></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 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase25Minutes + currentPayment.paidBonus25Minutes)) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -(currentPayment.paidBase25Minutes + currentPayment.paidBonus25Minutes) : 0) }}</span></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">{{ currentPayment ? formatMinutes(-currentPayment.paidBase50Minutes) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -currentPayment.paidBase50Minutes : 0) }}</span></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">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -currentPayment.paidBonus50Minutes : 0) }}</span></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 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase50Minutes + currentPayment.paidBonus50Minutes)) : '0 h' }} <span class="text-neutral-400">/ {{ formatCentiemes(currentPayment ? -(currentPayment.paidBase50Minutes + currentPayment.paidBonus50Minutes) : 0) }}</span></td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(paidTotal) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(paidTotal) }} <span class="text-neutral-400">/ {{ formatCentiemes(paidTotal) }}</span></td>
+            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500">-</td>
           </tr>
 
           <!-- Reste row -->
@@ -168,10 +179,27 @@
             <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>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total) }}</span></td>
+            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500">-</td>
           </tr>
         </tbody>
       </table>
+      <div class="mt-6 flex items-center gap-3">
+        <label for="rtt-year-select" class="text-md font-semibold text-primary-500 uppercase">
+          Exercice :
+        </label>
+        <select
+          id="rtt-year-select"
+          :value="selectedYear ?? ''"
+          :disabled="!availableYears.length"
+          class="border border-primary-500 rounded-md px-3 py-1 text-md font-semibold text-primary-500 bg-white focus:outline-none focus:ring-2 focus:ring-secondary-500/20 disabled:opacity-50"
+          @change="handleYearChange"
+        >
+          <option v-for="option in availableYears" :key="option.value" :value="option.value">
+            {{ option.label }}
+          </option>
+        </select>
+      </div>
     </div>
 
     <!-- Payment Drawer -->
@@ -187,41 +215,41 @@
           </select>
         </div>
         <div class="mb-4">
-          <label class="block text-sm font-medium text-neutral-700">Base 25% (heures)</label>
+          <label class="block text-sm font-medium text-neutral-700">Base 25% (centièmes)</label>
           <input
             v-model.number="paymentForm.base25Hours"
             type="number"
-            step="0.5"
+            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"
           />
         </div>
         <div class="mb-4">
-          <label class="block text-sm font-medium text-neutral-700">Heures 25% (heures)</label>
+          <label class="block text-sm font-medium text-neutral-700">Heures 25% (centièmes)</label>
           <input
             v-model.number="paymentForm.bonus25Hours"
             type="number"
-            step="0.5"
+            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"
           />
         </div>
         <div class="mb-4">
-          <label class="block text-sm font-medium text-neutral-700">Base 50% (heures)</label>
+          <label class="block text-sm font-medium text-neutral-700">Base 50% (centièmes)</label>
           <input
             v-model.number="paymentForm.base50Hours"
             type="number"
-            step="0.5"
+            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"
           />
         </div>
         <div class="mb-6">
-          <label class="block text-sm font-medium text-neutral-700">Heures 50% (heures)</label>
+          <label class="block text-sm font-medium text-neutral-700">Heures 50% (centièmes)</label>
           <input
             v-model.number="paymentForm.bonus50Hours"
             type="number"
-            step="0.5"
+            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"
           />
@@ -248,16 +276,54 @@
 
 <script setup lang="ts">
 import type { EmployeeRttSummary, EmployeeRttWeekSummary } from '~/services/dto/employee-rtt-summary'
+import type { ContractPhase } from '~/services/dto/contract-phase'
 import AppDrawer from '~/components/AppDrawer.vue'
 
+type RttYearOption = {
+  value: number
+  label: string
+}
+
 const props = defineProps<{
   summary: EmployeeRttSummary | null
+  selectedYear: number | null
+  availableYears: RttYearOption[]
+  currentYear: number | null
+  selectedPhase: ContractPhase | null
 }>()
 
 const emit = defineEmits<{
   (event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
+  (event: 'update-selected-year', year: number): void
 }>()
 
+const isHistoricalYear = computed(() =>
+  props.selectedYear !== null
+  && props.currentYear !== null
+  && props.selectedYear !== props.currentYear
+)
+
+const isLastExerciseOfPhase = computed(() => {
+  if (!props.selectedPhase || props.selectedPhase.isCurrent) return false
+  if (!props.selectedPhase.endDate) return false
+  const endDate = new Date(`${props.selectedPhase.endDate}T00:00:00`)
+  const endYear = endDate.getMonth() >= 5
+    ? endDate.getFullYear() + 1
+    : endDate.getFullYear()
+  return props.selectedYear === endYear
+})
+
+const isPayDisabled = computed(() =>
+  isHistoricalYear.value && !isLastExerciseOfPhase.value
+)
+
+const handleYearChange = (event: Event) => {
+  const target = event.target as HTMLSelectElement
+  const value = Number(target.value)
+  if (Number.isNaN(value)) return
+  emit('update-selected-year', value)
+}
+
 // --- Last complete week number ---
 
 const lastCompleteWeek = computed(() => {
@@ -313,7 +379,7 @@ const currentMonth = computed(() => orderedMonths[currentMonthIndex.value])
 
 const currentMonthLabel = computed(() => monthLabels[currentMonth.value])
 
-const currentYear = computed(() => {
+const displayedMonthYear = computed(() => {
   if (!props.summary) return ''
   return currentMonth.value >= 6 ? props.summary.year - 1 : props.summary.year
 })
@@ -500,10 +566,10 @@ const paymentForm = reactive({
 const prefillFromExistingPayment = (month: number) => {
   const existing = props.summary?.monthPayments.find((p) => p.month === month) ?? null
   if (existing) {
-    paymentForm.base25Hours = existing.paidBase25Minutes / 60
+    paymentForm.base25Hours = Math.round(existing.paidBase25Minutes / 60 * 100) / 100
-    paymentForm.bonus25Hours = existing.paidBonus25Minutes / 60
+    paymentForm.bonus25Hours = Math.round(existing.paidBonus25Minutes / 60 * 100) / 100
-    paymentForm.base50Hours = existing.paidBase50Minutes / 60
+    paymentForm.base50Hours = Math.round(existing.paidBase50Minutes / 60 * 100) / 100
-    paymentForm.bonus50Hours = existing.paidBonus50Minutes / 60
+    paymentForm.bonus50Hours = Math.round(existing.paidBonus50Minutes / 60 * 100) / 100
   } else {
     paymentForm.base25Hours = 0
     paymentForm.bonus25Hours = 0
@@ -516,6 +582,14 @@ watch(() => paymentForm.month, (newMonth) => {
   prefillFromExistingPayment(newMonth)
 })
 
+watch(() => paymentForm.base25Hours, (value) => {
+  paymentForm.bonus25Hours = Math.round(value * 0.25 * 100) / 100
+})
+
+watch(() => paymentForm.base50Hours, (value) => {
+  paymentForm.bonus50Hours = Math.round(value * 0.50 * 100) / 100
+})
+
 const openPaymentDrawer = () => {
   paymentForm.month = currentMonth.value
   prefillFromExistingPayment(currentMonth.value)

frontend/components/hours/HoursDayView.vue

@@ -14,7 +14,7 @@
                         <span class="font-normal text-neutral-600 text-sm">({{ contractLabel(employee) }})</span>
                     </p>
                     <p class="text-sm text-neutral-500 truncate">
-                        {{ employee.site?.name ?? 'Sans site' }}<span v-if="employee.currentContractNature"> — {{ contractNatureLabel(employee.currentContractNature) }}</span>
+                        {{ employee.site?.name ?? 'Sans site' }}<span v-if="getRowContractNature(employee.id)"> — {{ contractNatureLabel(getRowContractNature(employee.id) ?? undefined) }}</span>
                     </p>
                 </div>
 
@@ -212,7 +212,7 @@
                     </p>
                     <p class="text-neutral-500 truncate inline-flex items-center gap-2">
                         <span>
-                            {{ employee.site?.name ?? 'Sans site' }}<span v-if="employee.currentContractNature"> — {{ contractNatureLabel(employee.currentContractNature) }}</span>
+                            {{ employee.site?.name ?? 'Sans site' }}<span v-if="getRowContractNature(employee.id)"> — {{ contractNatureLabel(getRowContractNature(employee.id) ?? undefined) }}</span>
                         </span>
                         <span
                             v-if="isAdmin && (rows[employee.id]?.isSiteValid ?? false)"
@@ -405,6 +405,7 @@ const props = defineProps<{
     getRowAbsenceStyle: (employeeId: number) => { backgroundColor: string } | undefined
     hasRowFormation: (employeeId: number) => boolean
     getRowFormationLabel: (employeeId: number) => string
+    getRowContractNature: (employeeId: number) => 'CDI' | 'CDD' | 'INTERIM' | null
     getRowUpdatedAt: (employeeId: number) => string
     getPresenceDayValue: (employeeId: number) => string
     onAbsenceClick: (employeeId: number) => void

frontend/components/hours/HoursToolbar.vue

@@ -1,17 +1,33 @@
 <template>
   <div class="py-4 flex flex-col gap-3 lg:py-6">
       <!-- Desktop: filters row -->
-      <div class="hidden lg:flex lg:gap-4">
+      <div class="hidden lg:flex lg:items-center lg:gap-4">
-          <SiteFilterSelector v-if="sites.length > 0 && isAdmin" v-model="selectedSiteIds" :sites="sites" />
+          <div v-if="sites.length > 0 && isAdmin" class="relative z-50 w-80">
+              <MalioSelectCheckbox
+                  v-model="selectedSiteIds"
+                  :options="siteOptions"
+                  groupClass="w-80"
+                  label="Sites"
+                  display-select-all
+              />
+          </div>
           <div v-if="isAdmin" class="w-80">
-              <EmployeeNameFilterInput v-model="employeeFilter" />
+              <MalioInputText
+                  v-model="employeeFilter"
+                  label="Recherche d'un employé"
+                  icon-name="mdi:magnify"
+              />
           </div>
       </div>
 
       <!-- Mobile: search + filter button -->
-      <div v-if="isAdmin" class="flex gap-2 lg:hidden">
+      <div v-if="isAdmin" class="flex items-center gap-2 lg:hidden">
           <div class="flex-1 min-w-0">
-              <EmployeeNameFilterInput v-model="employeeFilter" />
+              <MalioInputText
+                  v-model="employeeFilter"
+                  label="Recherche d'un employé"
+                  icon-name="mdi:magnify"
+              />
           </div>
           <button
             type="button"
@@ -28,7 +44,13 @@
               <div v-if="sites.length > 0 && isAdmin">
                   <label class="text-md font-semibold text-neutral-700">Sites</label>
                   <div class="mt-2">
-                      <SiteFilterSelector v-model="selectedSiteIds" :sites="sites" />
+                      <MalioSelectCheckbox
+                          v-model="selectedSiteIds"
+                          :options="siteOptions"
+                          groupClass="w-80"
+                          label="Sites"
+                          display-select-all
+                      />
                   </div>
               </div>
               <div v-if="isAdmin">
@@ -172,8 +194,6 @@
 <script setup lang="ts">
 import type { Site } from '~/services/dto/site'
 import type { AbsenceType } from '~/services/dto/absence-type'
-import EmployeeNameFilterInput from '~/components/EmployeeNameFilterInput.vue'
-import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
 import PeriodStepperPicker from '~/components/PeriodStepperPicker.vue'
 import AppDrawer from '~/components/AppDrawer.vue'
 import { weekInputValueToYmd, ymdToWeekInputValue } from '~/utils/date'
@@ -183,7 +203,7 @@ const viewMode = defineModel<'day' | 'week'>('viewMode', { required: true })
 const selectedSiteIds = defineModel<number[]>('selectedSiteIds', { required: true })
 const employeeFilter = defineModel<string>('employeeFilter', { required: true })
 
-defineProps<{
+const props = defineProps<{
   isAdmin: boolean
   sites: Site[]
   absenceTypes: AbsenceType[]
@@ -193,6 +213,8 @@ defineProps<{
   getWeekShortcutLabel: (target: 'previousWeek' | 'thisWeek' | 'nextWeek') => string
 }>()
 
+const siteOptions = computed(() => props.sites.map((site) => ({ label: site.name, value: site.id })))
+
 const emit = defineEmits<{
   (e: 'set-yesterday'): void
   (e: 'set-today'): void

frontend/components/hours/HoursWeekView.vue

@@ -27,6 +27,7 @@
             class="flex items-center justify-between rounded-md px-2 py-1 text-xs"
             :class="daily.hasAbsence ? 'text-white' : 'text-primary-500'"
             :style="getDailyCellStyle(daily)"
+            :title="cellTitle(daily)"
           >
             <span class="font-semibold">{{ weekDayHeaders[i]?.label ?? '' }}</span>
             <span v-if="row.trackingMode === 'PRESENCE'">{{ daily.present ?? 0 }}</span>
@@ -93,8 +94,11 @@
             {{ row.firstName }} {{ row.lastName }}
             <span class="font-normal text-neutral-600">({{ row.contractName ?? '-' }})</span>
           </p>
-          <p class="text-[11px] text-neutral-500 truncate">
+          <p class="text-[11px] text-neutral-500 truncate inline-flex items-center gap-2">
-            {{ row.siteName ?? 'Sans site' }}<span v-if="row.contractNature"> — {{ contractNatureLabel(row.contractNature) }}</span>
+            <span>{{ row.siteName ?? 'Sans site' }}<span v-if="row.contractNature"> — {{ contractNatureLabel(row.contractNature) }}</span></span>
+            <button v-if="isAdmin" type="button" class="flex items-center text-white p-1" :class="row.comment ? 'bg-red-500 hover:bg-red-600' : 'bg-primary-500 hover:bg-secondary-500'" :title="row.comment ?? 'Ajouter un commentaire'" @click="$emit('open-comment', row)">
+              <Icon name="mdi:comment-text-outline" size="12"/>
+            </button>
           </p>
         </div>
 
@@ -104,7 +108,7 @@
           class="text-left leading-4 rounded-md px-2 py-1"
           :class="daily.hasAbsence ? 'text-white' : ''"
           :style="getDailyCellStyle(daily)"
-          :title="daily.absenceLabel ?? ''"
+          :title="cellTitle(daily)"
         >
           <template v-if="row.trackingMode === 'PRESENCE'">{{ daily.present ?? 0 }}</template>
           <template v-else>
@@ -153,19 +157,37 @@ const isInterimContract = (contractType?: ContractType | null) => {
   return contractType === CONTRACT_TYPES.INTERIM
 }
 
+const HOLIDAY_BG_COLOR = '#b3e5fc'
+
 const getDailyCellStyle = (daily: {
   hasAbsence?: boolean
   absenceColor?: string | null
+  holidayLabel?: string | null
 }) => {
-  if (!daily.hasAbsence) return undefined
+  if (daily.hasAbsence) return { backgroundColor: daily.absenceColor || '#dc2626' }
-  return { backgroundColor: daily.absenceColor || '#dc2626' }
+  if (daily.holidayLabel) return { backgroundColor: HOLIDAY_BG_COLOR }
+  return undefined
+}
+
+const cellTitle = (daily: {
+  hasAbsence?: boolean
+  absenceLabel?: string | null
+  holidayLabel?: string | null
+}) => {
+  const parts: string[] = []
+  if (daily.absenceLabel) parts.push(daily.absenceLabel)
+  if (daily.holidayLabel) parts.push(`Férié : ${daily.holidayLabel}`)
+  return parts.join(' — ')
 }
 
 defineProps<{
   isWeekLoading: boolean
+  isAdmin: boolean
   weekGridCols: string
   weeklySummary: WeeklyWorkHourSummary | null
   weekDayHeaders: Array<{ date: string; label: string }>
   formatMinutes: (minutes: number) => string
 }>()
+
+defineEmits<{ (e: 'open-comment', row: WeeklyWorkHourSummary['rows'][number]): void }>()
 </script>

frontend/components/hours/WeekCommentDrawer.vue

@@ -0,0 +1,81 @@
+<template>
+  <MalioDrawer v-model="drawerOpen" title="Commentaire">
+    <form class="space-y-4" @submit.prevent="onSave">
+      <div v-if="employeeLabel" class="text-md font-semibold text-neutral-700">{{ employeeLabel }}</div>
+      <div class="text-md font-semibold text-neutral-700">{{ formatWeekRange }}</div>
+      <MalioInputTextArea
+        v-model="content"
+        label="Commentaire"
+        :size="8"
+        :max-length="5000"
+        :show-counter="true"
+        resize="vertical"
+      />
+      <div class="sticky bottom-0 -mx-[20px] bg-white px-[20px] py-3 flex justify-between gap-3">
+        <MalioButton
+          v-if="commentId"
+          label="Supprimer"
+          variant="danger"
+          :disabled="isSubmitting"
+          @click="onDelete"
+        />
+        <MalioButton
+          label="Enregistrer"
+          button-class="ml-auto"
+          :disabled="isSubmitting || !canSubmit"
+          @click="onSave"
+        />
+      </div>
+    </form>
+  </MalioDrawer>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { createWeekComment, deleteWeekComment, updateWeekComment } from '~/services/employee-week-comments'
+import { getIsoWeekNumber, parseYmd } from '~/utils/date'
+
+const props = defineProps<{
+  modelValue: boolean
+  employeeId: number | null
+  weekStart: string
+  weekEnd: string
+  initialContent: string
+  commentId: number | null
+  employeeLabel?: string
+}>()
+const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'saved'): void }>()
+
+const drawerOpen = computed({ get: () => props.modelValue, set: (v) => emit('update:modelValue', v) })
+const content = ref('')
+const isSubmitting = ref(false)
+
+watch(() => [props.modelValue, props.initialContent] as const, ([open, init]) => { if (open) content.value = init ?? '' }, { immediate: true })
+
+const formatWeekRange = computed(() => {
+  const fmt = (ymd: string) => { const p = ymd.split('-'); return p.length === 3 ? `${p[2]}/${p[1]}/${p[0]}` : ymd }
+  const start = parseYmd(props.weekStart)
+  const weekLabel = start ? `S${getIsoWeekNumber(start)}` : ''
+  return weekLabel ? `${weekLabel} du ${fmt(props.weekStart)} au ${fmt(props.weekEnd)}` : `${fmt(props.weekStart)} → ${fmt(props.weekEnd)}`
+})
+
+const canSubmit = computed(() => content.value.trim().length > 0 || props.commentId !== null)
+
+const onSave = async () => {
+  if (!props.employeeId || isSubmitting.value) return
+  const trimmed = content.value.trim()
+  isSubmitting.value = true
+  try {
+    if (trimmed === '' && props.commentId) await deleteWeekComment(props.commentId)
+    else if (trimmed !== '' && props.commentId) await updateWeekComment(props.commentId, trimmed)
+    else if (trimmed !== '') await createWeekComment({ employeeId: props.employeeId, weekStartDate: props.weekStart, content: trimmed })
+    emit('saved'); drawerOpen.value = false
+  } finally { isSubmitting.value = false }
+}
+
+const onDelete = async () => {
+  if (!props.commentId || isSubmitting.value) return
+  isSubmitting.value = true
+  try { await deleteWeekComment(props.commentId); emit('saved'); drawerOpen.value = false } finally { isSubmitting.value = false }
+}
+</script>

frontend/composables/useDriverHoursPage.ts

@@ -417,6 +417,10 @@ export const useDriverHoursPage = () => {
     return date.toLocaleDateString('fr-FR', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })
   }
 
+  const getRowContractNature = (employeeId: number): 'CDI' | 'CDD' | 'INTERIM' | null => {
+    return dayContextByEmployeeId.value.get(employeeId)?.contractNature ?? null
+  }
+
   const hasContractAtSelectedDate = (employeeId: number) => {
     const dayRow = dayContextByEmployeeId.value.get(employeeId)
     if (!dayRow) return true
@@ -922,6 +926,15 @@ export const useDriverHoursPage = () => {
     }
   }
 
+  const isWeekCommentDrawerOpen = ref(false)
+  const weekCommentContext = ref<{ employeeId: number; employeeLabel: string; weekStart: string; weekEnd: string; content: string; commentId: number | null } | null>(null)
+  const openWeekCommentDrawer = (row: { employeeId: number; firstName: string; lastName: string; comment?: string | null; commentId?: number | null }) => {
+    if (!weeklySummary.value) return
+    weekCommentContext.value = { employeeId: row.employeeId, employeeLabel: `${row.firstName} ${row.lastName}`.trim(), weekStart: weeklySummary.value.weekStart, weekEnd: weeklySummary.value.weekEnd, content: row.comment ?? '', commentId: row.commentId ?? null }
+    isWeekCommentDrawerOpen.value = true
+  }
+  const reloadWeeklySummary = async () => { await loadWeeklySummary() }
+
   return {
     isAdmin,
     isSelfUser,
@@ -982,12 +995,17 @@ export const useDriverHoursPage = () => {
     getRowMetrics,
     getRowAbsenceLabel,
     getRowAbsenceStyle,
+    getRowContractNature,
     getRowUpdatedAt,
     openAbsenceDrawer,
     submitAbsence,
     deleteAbsenceFromDrawer,
     closeAbsenceDrawer,
     formatMinutes,
-    handleSave
+    handleSave,
+    isWeekCommentDrawerOpen,
+    weekCommentContext,
+    openWeekCommentDrawer,
+    reloadWeeklySummary
   }
 }

frontend/composables/useEmployeeContractPhase.ts

@@ -0,0 +1,83 @@
+import type { Ref } from 'vue'
+import type { Employee } from '~/services/dto/employee'
+import type { ContractPhase } from '~/services/dto/contract-phase'
+import { CONTRACT_TYPES } from '~/services/dto/contract'
+
+const formatDateFr = (iso: string | null): string => {
+  if (!iso) return ''
+  const [y, m, d] = iso.split('-')
+  return `${d}/${m}/${y}`
+}
+
+const formatContractTypeLabel = (phase: ContractPhase): string => {
+  switch (phase.contractType) {
+    case CONTRACT_TYPES.FORFAIT:
+      return 'FORFAIT'
+    case CONTRACT_TYPES.H35:
+      return '35h'
+    case CONTRACT_TYPES.H39:
+      return '39h'
+    case CONTRACT_TYPES.INTERIM:
+      return 'Intérim'
+    case CONTRACT_TYPES.CUSTOM:
+      return `CUSTOM (${phase.weeklyHours ?? '?'}h)`
+    default:
+      return String(phase.contractType)
+  }
+}
+
+export const formatPhaseLabel = (phase: ContractPhase): string => {
+  const base = formatContractTypeLabel(phase)
+  const driver = phase.isDriver ? ' (driver)' : ''
+  const dates = phase.endDate
+    ? `${formatDateFr(phase.startDate)} → ${formatDateFr(phase.endDate)}`
+    : `depuis ${formatDateFr(phase.startDate)}`
+  const suffix = phase.isCurrent ? ' (actuel)' : ''
+  return `${base}${driver} — ${dates}${suffix}`
+}
+
+export const useEmployeeContractPhase = (employee: Ref<Employee | null>) => {
+  const selectedPhaseId = ref<number | null>(null)
+
+  const availablePhases = computed<ContractPhase[]>(() => employee.value?.contractPhases ?? [])
+
+  const currentPhase = computed<ContractPhase | null>(() => {
+    return availablePhases.value.find((p) => p.isCurrent) ?? availablePhases.value[0] ?? null
+  })
+
+  const selectedPhase = computed<ContractPhase | null>(() => {
+    if (selectedPhaseId.value === null) return currentPhase.value
+    return availablePhases.value.find((p) => p.id === selectedPhaseId.value) ?? currentPhase.value
+  })
+
+  const isViewingPastPhase = computed<boolean>(() => {
+    if (!selectedPhase.value || !currentPhase.value) return false
+    return selectedPhase.value.id !== currentPhase.value.id
+  })
+
+  const phaseOptions = computed(() =>
+    availablePhases.value.map((p) => ({ value: p.id, label: formatPhaseLabel(p) }))
+  )
+
+  const showPicker = computed(() => availablePhases.value.length > 1)
+
+  const setSelectedPhase = (phaseId: number) => {
+    selectedPhaseId.value = phaseId
+  }
+
+  const resetToCurrent = () => {
+    selectedPhaseId.value = null
+  }
+
+  return {
+    selectedPhaseId,
+    selectedPhase,
+    currentPhase,
+    availablePhases,
+    phaseOptions,
+    showPicker,
+    isViewingPastPhase,
+    setSelectedPhase,
+    resetToCurrent,
+  }
+}

frontend/composables/useEmployeeDetailPage.ts

@@ -1,6 +1,7 @@
 import type { Employee } from '~/services/dto/employee'
 import { CONTRACT_TYPES } from '~/services/dto/contract'
 import { getEmployee } from '~/services/employees'
+import { useEmployeeContractPhase } from '~/composables/useEmployeeContractPhase'
 
 export const useEmployeeDetailPage = () => {
   const route = useRoute()
@@ -8,12 +9,15 @@ export const useEmployeeDetailPage = () => {
   const isLoading = ref(false)
   const activeTab = ref<'contract' | 'leave' | 'rtt' | 'mileage' | 'formation' | 'bonus' | 'observation'>('contract')
 
+  const phase = useEmployeeContractPhase(employee)
+
   const showLeaveTab = computed(() => employee.value?.currentContractNature !== 'INTERIM')
-  const showRttTab = computed(() => employee.value?.contract?.type !== CONTRACT_TYPES.FORFAIT)
+  const showRttTab = computed(() => phase.selectedPhase.value?.contractType !== CONTRACT_TYPES.FORFAIT)
+  const isForfait = computed(() => phase.selectedPhase.value?.contractType === CONTRACT_TYPES.FORFAIT)
   const employeeContractWorkLabel = computed(() => {
     const contract = employee.value?.contract
     if (!contract) return '-'
-    if (contract.type === CONTRACT_TYPES.FORFAIT) return 'Forfait'
+    if (contract.type === CONTRACT_TYPES.FORFAIT) return 'Forfait - 218 jours'
     if (contract.weeklyHours !== null && contract.weeklyHours !== undefined) return `${contract.weeklyHours} heures`
     return contract.name || '-'
   })
@@ -28,6 +32,7 @@ export const useEmployeeDetailPage = () => {
     isLoading.value = true
     try {
       employee.value = await getEmployee(employeeId)
+      phase.resetToCurrent()
 
       if (!showLeaveTab.value && activeTab.value === 'leave') {
         activeTab.value = 'contract'
@@ -55,6 +60,9 @@ export const useEmployeeDetailPage = () => {
         await bonus.loadBonusData()
       } else if (activeTab.value === 'observation') {
         await observation.loadObservationData()
+      } else if (isForfait.value && showLeaveTab.value) {
+        // Eager load: needed for the "X jours restants" header label on forfait employees.
+        await leave.loadLeaveData()
       }
     } finally {
       isLoading.value = false
@@ -62,13 +70,34 @@ export const useEmployeeDetailPage = () => {
   }
 
   const contract = useEmployeeContract(employee, loadEmployee)
-  const leave = useEmployeeLeave(employee, loadEmployee)
+  const leave = useEmployeeLeave(employee, loadEmployee, phase.selectedPhase)
-  const rtt = useEmployeeRtt(employee, loadEmployee)
+  const forfaitRemainingDaysLabel = computed(() => {
+    if (!isForfait.value) return ''
+    const presence = leave.leaveSummary.value?.presenceDaysToToday
+    if (presence === undefined || presence === null) return ''
+    const remaining = 218 - presence
+    return ` (${remaining} restants)`
+  })
+  const rtt = useEmployeeRtt(employee, loadEmployee, phase.selectedPhase)
   const mileage = useEmployeeMileage(employee, loadEmployee)
   const formation = useEmployeeFormation(employee, loadEmployee)
   const bonus = useEmployeeBonus(employee, loadEmployee)
   const observation = useEmployeeObservation(employee, loadEmployee)
 
+  watch(() => phase.selectedPhase.value?.id, (newId, oldId) => {
+    if (newId === oldId || oldId === undefined) return
+    // Bascule onglet si on entre dans une phase qui ne supporte plus le tab actuel
+    if (!showRttTab.value && activeTab.value === 'rtt') {
+      activeTab.value = 'leave'
+    }
+    // Recharger l'onglet courant
+    if (activeTab.value === 'leave' && showLeaveTab.value) {
+      leave.loadLeaveData()
+    } else if (activeTab.value === 'rtt' && showRttTab.value) {
+      rtt.loadRttData()
+    }
+  })
+
   watch(activeTab, (tab) => {
     if (tab === 'leave' && !leave.leaveDataLoaded.value && showLeaveTab.value) {
       leave.loadLeaveData()
@@ -97,6 +126,8 @@ export const useEmployeeDetailPage = () => {
     showLeaveTab,
     showRttTab,
     employeeContractWorkLabel,
+    forfaitRemainingDaysLabel,
+    ...phase,
     ...contract,
     ...leave,
     ...rtt,

frontend/composables/useEmployeeLeave.ts

@@ -1,5 +1,6 @@
 import type { Ref } from 'vue'
 import type { Absence } from '~/services/dto/absence'
+import type { ContractPhase } from '~/services/dto/contract-phase'
 import type { EmployeeLeaveSummary } from '~/services/dto/employee-leave-summary'
 import type { Employee } from '~/services/dto/employee'
 import { CONTRACT_TYPES } from '~/services/dto/contract'
@@ -7,34 +8,99 @@ import { listAbsences } from '~/services/absences'
 import { getEmployeeLeaveSummary, updateFractionedDays, updatePaidLeaveDays } from '~/services/employee-leave-summary'
 import { listPublicHolidays } from '~/services/public-holidays'
 
-export const useEmployeeLeave = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
+export type LeaveYearOption = {
+  value: number
+  label: string
+}
+
+export const useEmployeeLeave = (
+  employee: Ref<Employee | null>,
+  reloadEmployee: () => Promise<void>,
+  selectedPhase: Ref<ContractPhase | null>,
+) => {
   const employeeAbsences = ref<Absence[]>([])
   const leaveSummary = ref<EmployeeLeaveSummary | null>(null)
   const publicHolidays = ref<Record<string, string>>({})
   const isLeaveLoading = ref(false)
   const leaveDataLoaded = ref(false)
+  const selectedLeaveYear = ref<number | null>(null)
 
-  const getLeaveYear = () => {
+  const isForfaitOnPhase = computed(() =>
-    const now = new Date()
+    selectedPhase.value?.contractType === CONTRACT_TYPES.FORFAIT
-    const isForfait = employee.value?.contract?.type === CONTRACT_TYPES.FORFAIT
+  )
-    return isForfait
+
-      ? now.getFullYear()
+  const computeLeaveYearForDate = (date: Date): number => {
-      : (now.getMonth() >= 5 ? now.getFullYear() + 1 : now.getFullYear())
+    if (isForfaitOnPhase.value) return date.getFullYear()
+    return date.getMonth() >= 5 ? date.getFullYear() + 1 : date.getFullYear()
+  }
+
+  const currentLeaveYear = computed<number | null>(() => {
+    if (!employee.value) return null
+    return computeLeaveYearForDate(new Date())
+  })
+
+  const formatLeaveYearLabel = (year: number, isForfait: boolean): string => {
+    if (isForfait) return String(year)
+    return `Juin ${year - 1} → Mai ${year}`
+  }
+
+  const availableLeaveYears = computed<LeaveYearOption[]>(() => {
+    if (!employee.value || !selectedPhase.value || currentLeaveYear.value === null) return []
+    const isForfait = isForfaitOnPhase.value
+    const phase = selectedPhase.value
+
+    // Plage = exercices intersectant la phase.
+    const phaseStartYear = computeLeaveYearForDate(new Date(`${phase.startDate}T00:00:00`))
+    const phaseEndYear = phase.endDate
+      ? computeLeaveYearForDate(new Date(`${phase.endDate}T00:00:00`))
+      : currentLeaveYear.value
+
+    // Hard floor : data-start-date (env RTT_START_DATE) — le logiciel n'a pas
+    // d'historique avant cette date, inutile de proposer des années antérieures.
+    let dataFloor: number | null = null
+    const dataStart = leaveSummary.value?.dataStartDate
+    if (dataStart) {
+      const dataStartDate = new Date(`${dataStart.substring(0, 10)}T00:00:00`)
+      if (!Number.isNaN(dataStartDate.getTime())) {
+        dataFloor = computeLeaveYearForDate(dataStartDate)
+      }
+    }
+
+    const minYear = dataFloor !== null ? Math.max(phaseStartYear, dataFloor) : phaseStartYear
+    const maxYear = phaseEndYear
+
+    const years: LeaveYearOption[] = []
+    for (let y = maxYear; y >= minYear; y -= 1) {
+      years.push({ value: y, label: formatLeaveYearLabel(y, isForfait) })
+    }
+    return years
+  })
+
+  const initSelectedLeaveYear = () => {
+    if (selectedLeaveYear.value !== null) return
+    if (currentLeaveYear.value !== null) {
+      selectedLeaveYear.value = currentLeaveYear.value
+    }
   }
 
   const loadLeaveData = async () => {
     if (!employee.value || isLeaveLoading.value) return
+    initSelectedLeaveYear()
+    if (selectedLeaveYear.value === null) return
     isLeaveLoading.value = true
     try {
-      const isForfait = employee.value.contract?.type === CONTRACT_TYPES.FORFAIT
+      const isForfait = isForfaitOnPhase.value
-      const leaveYear = getLeaveYear()
+      const leaveYear = selectedLeaveYear.value
-      const from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01`
+      let from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01`
-      const to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31`
+      let to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31`
+      const phase = selectedPhase.value
+      if (phase?.startDate && phase.startDate > from) from = phase.startDate
+      if (phase?.endDate && phase.endDate < to) to = phase.endDate
       const holidayYears = isForfait ? [leaveYear] : [leaveYear - 1, leaveYear]
 
       const [absences, summary, ...holidayResults] = await Promise.all([
         listAbsences({ from, to, employeeId: employee.value.id }),
-        getEmployeeLeaveSummary(employee.value.id, leaveYear),
+        getEmployeeLeaveSummary(employee.value.id, leaveYear, selectedPhase.value?.id),
         ...holidayYears.map((y) => listPublicHolidays('metropole', y))
       ])
       employeeAbsences.value = absences
@@ -46,10 +112,25 @@ export const useEmployeeLeave = (employee: Ref<Employee | null>, reloadEmployee:
     }
   }
 
+  const setSelectedLeaveYear = async (year: number) => {
+    if (selectedLeaveYear.value === year) return
+    selectedLeaveYear.value = year
+    leaveDataLoaded.value = false
+    await loadLeaveData()
+  }
+
   const resetLoaded = () => {
     leaveDataLoaded.value = false
+    selectedLeaveYear.value = null
   }
 
+  watch(() => selectedPhase.value?.id, () => {
+    // Reset l'année car la plage a peut-être changé.
+    selectedLeaveYear.value = null
+    leaveDataLoaded.value = false
+    // Le rechargement effectif est piloté par useEmployeeDetailPage.
+  })
+
   const submitFractionedDays = async (days: number) => {
     if (!employee.value) return
     const year = leaveSummary.value?.year ?? undefined
@@ -70,6 +151,10 @@ export const useEmployeeLeave = (employee: Ref<Employee | null>, reloadEmployee:
     publicHolidays,
     isLeaveLoading,
     leaveDataLoaded,
+    selectedLeaveYear,
+    currentLeaveYear,
+    availableLeaveYears,
+    setSelectedLeaveYear,
     loadLeaveData,
     resetLoaded,
     submitFractionedDays,

frontend/composables/useEmployeeRtt.ts

@@ -1,29 +1,107 @@
 import type { Ref } from 'vue'
+import type { ContractPhase } from '~/services/dto/contract-phase'
 import type { EmployeeRttSummary } from '~/services/dto/employee-rtt-summary'
 import type { Employee } from '~/services/dto/employee'
 import { getEmployeeRttSummary, createRttPayment } from '~/services/employee-rtt-summary'
 
-export const useEmployeeRtt = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
+export type RttYearOption = {
+  value: number
+  label: string
+}
+
+export const useEmployeeRtt = (
+  employee: Ref<Employee | null>,
+  reloadEmployee: () => Promise<void>,
+  selectedPhase: Ref<ContractPhase | null>,
+) => {
   const rttSummary = ref<EmployeeRttSummary | null>(null)
   const isRttLoading = ref(false)
   const rttDataLoaded = ref(false)
+  const selectedRttYear = ref<number | null>(null)
+
+  // Exercice RTT : Juin (Y-1) → Mai (Y). Toujours, peu importe le type de contrat
+  // (l'onglet RTT est masqué pour les FORFAIT côté page).
+  const computeRttYearForDate = (date: Date): number =>
+    date.getMonth() >= 5 ? date.getFullYear() + 1 : date.getFullYear()
+
+  const currentRttYear = computed<number | null>(() => {
+    if (!employee.value) return null
+    return computeRttYearForDate(new Date())
+  })
+
+  const availableRttYears = computed<RttYearOption[]>(() => {
+    if (!employee.value || !selectedPhase.value || currentRttYear.value === null) return []
+    const phase = selectedPhase.value
+
+    // Plage = exercices intersectant la phase.
+    const phaseStartYear = computeRttYearForDate(new Date(`${phase.startDate}T00:00:00`))
+    const phaseEndYear = phase.endDate
+      ? computeRttYearForDate(new Date(`${phase.endDate}T00:00:00`))
+      : currentRttYear.value
+
+    // Hard floor : rttStartDate (env RTT_START_DATE) — pas d'historique avant.
+    let dataFloor: number | null = null
+    const dataStart = rttSummary.value?.rttStartDate
+    if (dataStart) {
+      const dataStartDate = new Date(`${dataStart.substring(0, 10)}T00:00:00`)
+      if (!Number.isNaN(dataStartDate.getTime())) {
+        dataFloor = computeRttYearForDate(dataStartDate)
+      }
+    }
+
+    const minYear = dataFloor !== null ? Math.max(phaseStartYear, dataFloor) : phaseStartYear
+    const maxYear = phaseEndYear
+
+    const years: RttYearOption[] = []
+    for (let y = maxYear; y >= minYear; y -= 1) {
+      years.push({ value: y, label: `Juin ${y - 1} → Mai ${y}` })
+    }
+    return years
+  })
+
+  const initSelectedRttYear = () => {
+    if (selectedRttYear.value !== null) return
+    if (currentRttYear.value !== null) {
+      selectedRttYear.value = currentRttYear.value
+    }
+  }
 
   const loadRttData = async () => {
     if (!employee.value || isRttLoading.value) return
+    initSelectedRttYear()
+    if (selectedRttYear.value === null) return
     isRttLoading.value = true
     try {
-      const rttYear = new Date().getMonth() >= 5 ? new Date().getFullYear() + 1 : new Date().getFullYear()
+      rttSummary.value = await getEmployeeRttSummary(
-      rttSummary.value = await getEmployeeRttSummary(employee.value.id, rttYear)
+        employee.value.id,
+        selectedRttYear.value,
+        selectedPhase.value?.id,
+      )
       rttDataLoaded.value = true
     } finally {
       isRttLoading.value = false
     }
   }
 
+  const setSelectedRttYear = async (year: number) => {
+    if (selectedRttYear.value === year) return
+    selectedRttYear.value = year
+    rttDataLoaded.value = false
+    await loadRttData()
+  }
+
   const resetLoaded = () => {
     rttDataLoaded.value = false
+    selectedRttYear.value = null
   }
 
+  watch(() => selectedPhase.value?.id, () => {
+    // Reset l'année car la plage a peut-être changé.
+    selectedRttYear.value = null
+    rttDataLoaded.value = false
+    // Le rechargement effectif est piloté par useEmployeeDetailPage.
+  })
+
   const submitRttPayment = async (month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number) => {
     if (!employee.value) return
     const year = rttSummary.value?.year ?? undefined
@@ -35,6 +113,10 @@ export const useEmployeeRtt = (employee: Ref<Employee | null>, reloadEmployee: (
     rttSummary,
     isRttLoading,
     rttDataLoaded,
+    selectedRttYear,
+    currentRttYear,
+    availableRttYears,
+    setSelectedRttYear,
     loadRttData,
     resetLoaded,
     submitRttPayment

frontend/composables/useHoursPage.ts

@@ -494,6 +494,10 @@ export const useHoursPage = () => {
     return dayContextByEmployeeId.value.get(employeeId)?.formationLabel ?? ''
   }
 
+  const getRowContractNature = (employeeId: number): 'CDI' | 'CDD' | 'INTERIM' | null => {
+    return dayContextByEmployeeId.value.get(employeeId)?.contractNature ?? null
+  }
+
   const getRowUpdatedAt = (employeeId: number): string => {
     const raw = rows.value[employeeId]?.updatedAt
     if (!raw) return ''
@@ -1108,6 +1112,15 @@ export const useHoursPage = () => {
     }
   }
 
+  const isWeekCommentDrawerOpen = ref(false)
+  const weekCommentContext = ref<{ employeeId: number; employeeLabel: string; weekStart: string; weekEnd: string; content: string; commentId: number | null } | null>(null)
+  const openWeekCommentDrawer = (row: { employeeId: number; firstName: string; lastName: string; comment?: string | null; commentId?: number | null }) => {
+    if (!weeklySummary.value) return
+    weekCommentContext.value = { employeeId: row.employeeId, employeeLabel: `${row.firstName} ${row.lastName}`.trim(), weekStart: weeklySummary.value.weekStart, weekEnd: weeklySummary.value.weekEnd, content: row.comment ?? '', commentId: row.commentId ?? null }
+    isWeekCommentDrawerOpen.value = true
+  }
+  const reloadWeeklySummary = async () => { await loadWeeklySummary() }
+
   return {
     isAdmin,
     isSelfUser,
@@ -1174,6 +1187,7 @@ export const useHoursPage = () => {
     getRowAbsenceStyle,
     hasRowFormation,
     getRowFormationLabel,
+    getRowContractNature,
     getRowUpdatedAt,
     getPresenceDayValue,
     openAbsenceDrawer,
@@ -1181,6 +1195,10 @@ export const useHoursPage = () => {
     deleteAbsenceFromDrawer,
     closeAbsenceDrawer,
     formatMinutes,
-    handleSave
+    handleSave,
+    isWeekCommentDrawerOpen,
+    weekCommentContext,
+    openWeekCommentDrawer,
+    reloadWeeklySummary
   }
 }

frontend/data/documentation-content.ts

@@ -28,6 +28,7 @@ export const documentationSections: DocSection[] = [
           { type: 'paragraph', content: 'La vue jour est votre écran principal. Elle affiche les heures de travail pour une date donnée.' },
           { type: 'list', content: 'Boutons "Hier" / "Aujourd\'hui" / "Demain" pour naviguer rapidement\nSélecteur de date pour choisir une date spécifique\nFiltrage par site si vous avez accès à plusieurs sites' },
           { type: 'paragraph', content: 'Seuls les employés ayant un contrat actif à la date sélectionnée sont affichés.' },
+          { type: 'note', content: 'Sous le nom de l\'employé, la nature du contrat (CDI / CDD / Intérim) affichée correspond à la période couvrant la date filtrée, et non à aujourd\'hui.' },
         ],
       },
       {
@@ -79,6 +80,16 @@ export const documentationSections: DocSection[] = [
           { type: 'list', content: 'Jour : total des heures dans la plage 06:00–21:00\nNuit : total des heures dans les plages 00:00–06:00 et 21:00–24:00\nTotal : somme des heures de jour et de nuit' },
         ],
       },
+      {
+        id: 'commentaire-semaine',
+        title: 'Commentaires de semaine (admin)',
+        requiredLevel: 'admin',
+        blocks: [
+          { type: 'paragraph', content: 'Sur la vue semaine, un picto bulle permet d\'attacher un commentaire libre sur la semaine d\'un employé.' },
+          { type: 'list', content: 'Bulle bleue : pas de commentaire\nBulle rouge : un commentaire existe\nClic : ouvre le drawer avec textarea' },
+          { type: 'note', content: 'Les commentaires n\'affectent aucun calcul. Pour supprimer, videz la textarea puis Enregistrer, ou bouton Supprimer.' },
+        ],
+      },
     ],
   },
   {
@@ -290,6 +301,18 @@ export const documentationSections: DocSection[] = [
           { type: 'paragraph', content: 'Un employé conducteur apparaît uniquement sur l\'écran "Heures Conducteurs" et non sur l\'écran "Heures" classique.' },
         ],
       },
+      {
+        id: 'contract-phase-view',
+        title: 'Vue contrat — sélecteur de phase',
+        requiredLevel: 'admin',
+        blocks: [
+          { type: 'paragraph', content: 'Quand un employé change de type de contrat (ex. 39h → FORFAIT) ou enchaîne plusieurs CDD avec solde de tout compte, ses anciennes phases de contrat restent consultables via le sélecteur "Vue contrat" en haut de la fiche.' },
+          { type: 'paragraph', content: 'Choisir une phase passée fait basculer les onglets Congés et RTT sur les règles de cette phase. L\'onglet RTT réapparaît si la phase n\'est pas un FORFAIT. Un bandeau jaune indique que vous êtes en mode historique.' },
+          { type: 'paragraph', content: 'Sur une phase passée, vous pouvez :' },
+          { type: 'list', content: 'Solder les RTT restants — bouton "+ Payer les RTT" actif uniquement sur le dernier exercice de la phase (celui contenant la date de fin)\nSolder les CP restants via le champ "Solde de tout compte" sur la période de contrat correspondante (onglet Contrat)' },
+          { type: 'note', content: 'L\'édition d\'absences et des stocks de report (jours fractionnés, Année N-1) est désactivée en mode phase passée.' },
+        ],
+      },
     ],
   },
   {
@@ -331,7 +354,7 @@ export const documentationSections: DocSection[] = [
         requiredLevel: 'admin',
         blocks: [
           { type: 'paragraph', content: 'La vue semaine est réservée aux administrateurs. Elle affiche une synthèse hebdomadaire par employé avec les heures supplémentaires calculées.' },
-          { type: 'list', content: 'Filtrage par site et par employé\nDétail par jour avec totaux hebdomadaires\nColonnes de calcul : base, heures sup 25%, heures sup 50%, total récupération' },
+          { type: 'list', content: 'Filtrage par site et par employé\nDétail par jour avec totaux hebdomadaires\nColonnes de calcul : base, heures sup 25%, heures sup 50%, total récupération\nLes jours fériés sont signalés sur la cellule du jour : fond bleu clair quand pas d\'absence, nom du férié au survol' },
         ],
       },
       {
@@ -388,6 +411,7 @@ export const documentationSections: DocSection[] = [
         blocks: [
           { type: 'paragraph', content: 'Le calendrier offre une vue d\'ensemble mensuelle des absences de tous les employés.' },
           { type: 'list', content: 'Code couleur par type d\'absence\nDemi-journée : affichage en dégradé diagonal\nJournée complète : fond plein\nJours fériés : fond bleu clair (cliquable pour créer une absence)\nFiltres par site et par employé\nNavigation par mois (précédent / suivant)' },
+          { type: 'note', content: 'Seuls les employés ayant au moins un jour de contrat sur le mois affiché apparaissent. Un employé dont le contrat s\'est terminé avant le 1er du mois (ou qui commence après la fin du mois) est masqué.' },
           { type: 'note', content: 'Les absences peuvent être créées sur les jours fériés. Quand une absence est posée sur un férié, elle remplace l\'affichage « Férié » dans la cellule.' },
         ],
       },
@@ -445,6 +469,17 @@ export const documentationSections: DocSection[] = [
           { type: 'paragraph', content: 'Compteurs visibles sur l\'onglet Congé de la fiche employé : acquis, en cours d\'acquisition, pris, restant.' },
         ],
       },
+      {
+        id: 'onglet-conges-fiche-employe',
+        title: 'Onglet Congés (fiche employé)',
+        requiredLevel: 'admin',
+        blocks: [
+          { type: 'paragraph', content: 'L\'onglet "Congés" sur la fiche employé affiche un calendrier annuel des congés posés (12 mois en grille 4×3) ainsi que les compteurs (acquis, pris, reste, en cours d\'acquisition, N-1 ou samedis selon le contrat).' },
+          { type: 'paragraph', content: 'La période affichée dépend du type de contrat actuel : Janvier → Décembre pour FORFAIT, Juin (N-1) → Mai (N) pour les autres contrats.' },
+          { type: 'paragraph', content: 'Un sélecteur d\'année est disponible en bas du calendrier (zone scrollable, à gauche). Il permet de consulter les exercices passés. La plage proposée part de l\'exercice courant et remonte jusqu\'au plus récent entre (a) le premier exercice où l\'employé avait un contrat ouvert et (b) l\'exercice de mise en service du logiciel — il est inutile de remonter plus loin, aucune donnée n\'a été saisie avant.' },
+          { type: 'note', content: 'Sur un exercice passé, les boutons d\'édition "Jours fractionnés" et "Année N-1 payés" sont désactivés. La consultation reste possible, mais on n\'autorise pas la modification rétroactive d\'un exercice clos.' },
+        ],
+      },
       {
         id: 'ecran-recap-conges',
         title: 'Écran Récap. congés',
@@ -480,6 +515,7 @@ export const documentationSections: DocSection[] = [
         blocks: [
           { type: 'list', content: 'Report N-1 : solde de l\'exercice précédent\nAcquis : cumul des heures supplémentaires de l\'exercice en cours\nDisponible : report + acquis − payé\nPayé : RTT convertis en salaire (soustraits du disponible)' },
           { type: 'note', content: 'Les contrats INTERIM et le mode PRESENCE n\'accumulent pas de RTT (affiché à 0).' },
+          { type: 'paragraph', content: 'La colonne "Cumul" affiche le solde RTT à la fin de chaque semaine : Report N-1 + somme des heures hebdomadaires jusqu\'à la semaine concernée − paiements RTT des mois précédents. Un paiement enregistré sur le mois M n\'est déduit qu\'à partir des semaines du mois M+1. Permet la comparaison ligne à ligne avec un suivi RH externe (Excel).' },
         ],
       },
       {
@@ -491,6 +527,15 @@ export const documentationSections: DocSection[] = [
           { type: 'list', content: 'Saisie : mois, nombre de minutes, taux (25% ou 50%)\nPlusieurs paiements possibles par mois\nLes heures payées sont soustraites du solde disponible' },
         ],
       },
+      {
+        id: 'rtt-selecteur-exercice',
+        title: 'Consulter un exercice passé',
+        requiredLevel: 'admin',
+        blocks: [
+          { type: 'paragraph', content: 'Un sélecteur d\'exercice est disponible en bas du tableau RTT (zone scrollable, à gauche). Il permet de consulter les exercices passés (Juin → Mai). La plage proposée part de l\'exercice courant et remonte jusqu\'au plus récent entre (a) le premier exercice où l\'employé avait un contrat ouvert et (b) l\'exercice de mise en service du logiciel.' },
+          { type: 'note', content: 'Sur un exercice passé, le bouton « + Payer les RTT » est désactivé. Aucun paiement rétroactif n\'est autorisé pour préserver la cohérence du report N-1.' },
+        ],
+      },
       {
         id: 'rtt-semaines-mois',
         title: 'Attribution des semaines aux mois',
@@ -568,7 +613,7 @@ export const documentationSections: DocSection[] = [
         requiredLevel: 'admin',
         blocks: [
           { type: 'paragraph', content: 'Génère un PDF A4 paysage avec le détail mensuel pour la paie.' },
-          { type: 'list', content: 'Sélecteur de mois (défaut = mois courant)\nDonnées groupées par site\nColonnes : nom, base contrat, jours de présence cadre, heures de nuit, panier de nuit, heures RTT payées, congés (nombre + dates), maladie/AT (nombre + dates), primes conducteur (PDJ, repas, nuitée, samedi), observations' },
+          { type: 'list', content: 'Sélecteur de mois (défaut = mois courant)\nDonnées groupées par site\nColonnes : nom, base contrat, jours de présence cadre, heures de nuit, panier de nuit, heures RTT payées, congés (nombre + dates), maladie/AT (nombre + dates), primes conducteur (PDJ, repas, nuitée, samedi), observations\nColonne « Repas » chauffeur : somme déjeuner + dîner sur le mois (un jour avec les deux compte 2 repas)' },
         ],
       },
       {
@@ -586,7 +631,7 @@ export const documentationSections: DocSection[] = [
         requiredLevel: 'admin',
         blocks: [
           { type: 'paragraph', content: 'Génère un PDF par employé avec le détail jour par jour de ses heures sur une année.' },
-          { type: 'list', content: 'Accessible depuis la fiche employé (bouton imprimante)\nChoix de l\'année civile (janvier à décembre)\nColonnes adaptées au mode de suivi (TIME, PRESENCE, conducteur)\nSections séparées en cas de changement de contrat en cours d\'année' },
+          { type: 'list', content: 'Accessible depuis la fiche employé (bouton imprimante)\nChoix de l\'année civile (janvier à décembre)\nColonnes adaptées au mode de suivi (TIME, PRESENCE, conducteur)\nSections séparées en cas de changement de contrat en cours d\'année\nLes jours fériés apparaissent toujours (ligne bleue) avec la mention « Férié : {nom} » dans la colonne Absence ; le total reprend les heures contractuelles créditées (hors Forfait)' },
         ],
       },
     ],

frontend/i18n/locales/fr.json

@@ -59,6 +59,10 @@
         },
         "leaveRecap": {
             "load": "Impossible de charger le récap des congés."
+        },
+        "weekComment": {
+            "save": "Impossible d'enregistrer le commentaire de semaine.",
+            "delete": "Impossible de supprimer le commentaire de semaine."
         }
     },
     "success": {
@@ -110,6 +114,10 @@
             "create": "Observation créée.",
             "update": "Observation mise à jour.",
             "delete": "Observation supprimée."
+        },
+        "weekComment": {
+            "save": "Commentaire enregistré.",
+            "delete": "Commentaire supprimé."
         }
     }
 }

frontend/layouts/default.vue

@@ -174,7 +174,7 @@
 
             <div class="h-full flex-1 overflow-hidden flex flex-col min-w-0">
                 <AppTopNav :user="auth.user" @toggle-sidebar="sidebarOpen = !sidebarOpen" />
-                <main class="flex-1 overflow-y-auto px-4 py-6 lg:px-8 lg:py-12">
+                <main class="flex-1 overflow-y-auto [scrollbar-gutter:stable] px-4 py-6 lg:px-8 lg:py-12">
                     <slot/>
                 </main>
             </div>

frontend/nuxt.config.ts

@@ -2,6 +2,7 @@ export default defineNuxtConfig({
     compatibilityDate: '2025-07-15',
     devtools: {enabled: false},
     ssr: false,
+    extends: ['@malio/layer-ui'],
     app: {
         baseURL: process.env.NODE_ENV === 'production'
           ? (process.env.NUXT_PUBLIC_APP_BASE || '/')

frontend/package.json

@@ -13,6 +13,7 @@
     "dependencies": {
         "@nuxt/icon": "^2.2.1",
         "@nuxtjs/i18n": "^10.2.1",
+        "@malio/layer-ui": "^1.4.6",
         "@pinia/nuxt": "^0.11.3",
         "nuxt": "^4.3.0",
         "nuxt-toast": "^1.4.0",

frontend/pages/absence-types.vue

@@ -2,13 +2,12 @@
   <div class="h-full flex flex-col overflow-hidden">
     <div class="flex items-center justify-between pb-6">
       <h1 class="text-4xl font-bold text-primary-500">Types de statut</h1>
-      <button
+      <MalioButton
-        type="button"
+        label="Ajouter un type"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+        icon-name="mdi:plus"
+        icon-position="left"
         @click="openCreate"
-      >
+      />
-        + Ajouter un type
-      </button>
     </div>
 
     <div
@@ -56,60 +55,40 @@
       </div>
     </div>
 
-    <AppDrawer v-model="isDrawerOpen" :title="drawerTitle">
+    <MalioDrawer v-model="isDrawerOpen" :title="drawerTitle">
       <form class="space-y-4" @submit.prevent="handleSubmit">
-        <div>
+        <MalioInputText
-          <label class="text-md font-semibold text-neutral-700" for="code">
-            Code <span class="text-red-600">*</span>
-          </label>
-          <input
-            id="code"
           v-model="form.code"
-            type="text"
+          label="Code *"
-            maxlength="10"
+          group-class="mt-2"
-            :class="codeFieldClass"
+          :max-length="10"
+          :error="showCodeError ? 'Le code est obligatoire.' : ''"
         />
-          <p v-if="showCodeError" class="mt-1 text-sm text-red-600">
+        <MalioInputText
-            Le code est obligatoire.
-          </p>
-        </div>
-        <div>
-          <label class="text-md font-semibold text-neutral-700" for="label">
-            Libellé <span class="text-red-600">*</span>
-          </label>
-          <input
-            id="label"
           v-model="form.label"
-            type="text"
+          label="Libellé *"
-            :class="labelFieldClass"
+          group-class="mt-2"
+          :error="showLabelError ? 'Le libellé est obligatoire.' : ''"
         />
-          <p v-if="showLabelError" class="mt-1 text-sm text-red-600">
-            Le libellé est obligatoire.
-          </p>
-        </div>
         <div>
           <label class="text-md font-semibold text-neutral-700">
             Compté comme travaillé
           </label>
           <div class="mt-2 flex items-center gap-6">
-            <label class="inline-flex items-center gap-2 text-md text-neutral-800">
+            <MalioRadioButton
-              <input
               v-model="form.countAsWorkedHours"
-                type="radio"
+              name="countAsWorkedHours"
-                class="h-4 w-4"
               :value="true"
+              label="Oui"
+              group-class="w-auto mt-0"
             />
-              Oui
+            <MalioRadioButton
-            </label>
-            <label class="inline-flex items-center gap-2 text-md text-neutral-800">
-              <input
               v-model="form.countAsWorkedHours"
-                type="radio"
+              name="countAsWorkedHours"
-                class="h-4 w-4"
               :value="false"
+              label="Non"
+              group-class="w-auto mt-0"
             />
-              Non
-            </label>
           </div>
         </div>
         <div>
@@ -130,32 +109,29 @@
           </p>
         </div>
         <div v-if="editingType" class="grid grid-cols-2 gap-3 pt-2">
-          <button
+          <MalioButton
-            type="button"
+            label="Supprimer"
-            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"
+            variant="danger"
+            button-class="w-full"
             @click="confirmDelete(editingType)"
-          >
+          />
-            Supprimer
+          <MalioButton
-          </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"
+            label="Modifier"
-            :class="submitButtonClass"
+            button-class="w-full"
-          >
+            :disabled="isSubmitting || !isFormValid"
-            Modifier
+          />
-          </button>
         </div>
         <div v-else class="flex justify-center pt-2">
-          <button
+          <MalioButton
             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"
+            label="Valider"
-            :class="submitButtonClass"
+            button-class="w-[200px]"
-          >
+            :disabled="isSubmitting || !isFormValid"
-            + Ajouter
+          />
-          </button>
         </div>
       </form>
-    </AppDrawer>
+    </MalioDrawer>
   </div>
 </template>
 
@@ -202,20 +178,6 @@ const showCodeError = computed(() => validationTouched.code && !isCodeValid.valu
 const showLabelError = computed(() => validationTouched.label && !isLabelValid.value)
 const showColorError = computed(() => validationTouched.color && !isColorValid.value)
 
-const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
-const codeFieldClass = computed(() => {
-  if (showCodeError.value) {
-    return `${baseInputClass} border-red-500`
-  }
-  return `${baseInputClass} border-neutral-300`
-})
-const labelFieldClass = computed(() => {
-  if (showLabelError.value) {
-    return `${baseInputClass} border-red-500`
-  }
-  return `${baseInputClass} border-neutral-300`
-})
 const colorFieldClass = computed(() => {
   const baseColorClass = 'h-10 w-16 cursor-pointer rounded-md border bg-white p-1'
   if (showColorError.value) {
@@ -224,13 +186,6 @@ const colorFieldClass = computed(() => {
   return `${baseColorClass} border-neutral-300`
 })
 
-const submitButtonClass = computed(() => {
-  if (isSubmitting.value || !isFormValid.value) {
-    return 'opacity-50 cursor-not-allowed'
-  }
-  return ''
-})
-
 const loadAbsenceTypes = async () => {
   isLoading.value = true
   try {

frontend/pages/calendar.vue

@@ -5,30 +5,37 @@
         </div>
         <div class="flex flex-col gap-3 py-6">
             <div class="flex items-center justify-between gap-4">
-                <div class="flex items-center gap-4">
+                    <MalioSelectCheckbox
-                    <SiteFilterSelector v-model="selectedSiteIds" :sites="sites"/>
+                        v-model="selectedSiteIds"
-                </div>
+                        :options="siteOptions"
+                        label="Sites"
+                        groupClass="relative z-50 w-80 h-10"
+                        display-select-all
+                    />
                 <div class="flex gap-4">
-                    <button
+                    <MalioButton
-                        type="button"
+                        label="Ajouter une absence"
-                        class="h-10 rounded-lg bg-primary-500 px-4 text-md font-semibold text-white hover:bg-secondary-500"
+                        icon-name="mdi:plus"
+                        icon-position="left"
                         @click="openCreateFromToday"
-                    >
+                    />
-                        + Ajouter une absence
+                    <MalioButton
-                    </button>
+                        label="Imprimer"
-                    <button
+                        variant="secondary"
-                        type="button"
+                        icon-name="mdi:printer"
-                        class="h-10 rounded-lg bg-primary-500 px-4 text-md font-semibold text-white hover:bg-secondary-500"
+                        icon-position="left"
                         @click="openPrint"
-                    >
+                    />
-                        Imprimer
-                    </button>
                 </div>
             </div>
             <div class="flex justify-between">
                 <div class="flex items-center gap-4">
                     <div class="w-80">
-                        <EmployeeNameFilterInput v-model="employeeFilter"/>
+                        <MalioInputText
+                            v-model="employeeFilter"
+                            label="Recherche d'un employé"
+                            icon-name="mdi:magnify"
+                        />
                     </div>
                     <PeriodStepperPicker
                         width-class="w-[260px]"
@@ -111,9 +118,7 @@ import {compareEmployeesInSite, sortEmployeesBySiteAndOrder} from '~/utils/emplo
 import CalendarGrid from '~/components/CalendarGrid.vue'
 import AbsenceFormDrawer from '~/components/AbsenceFormDrawer.vue'
 import AbsencePrintDrawer from '~/components/AbsencePrintDrawer.vue'
-import EmployeeNameFilterInput from '~/components/EmployeeNameFilterInput.vue'
 import PeriodStepperPicker from '~/components/PeriodStepperPicker.vue'
-import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
 
 useHead({
     title: 'Calendrier'
@@ -136,6 +141,8 @@ const sites = computed(() => {
     })
 })
 
+const siteOptions = computed(() => sites.value.map((site) => ({ label: site.name, value: site.id })))
+
 // Filtres de sites (par défaut: tous sélectionnés à l'init).
 const selectedSiteIds = ref<number[]>([])
 const sitesInitialized = ref(false)
@@ -154,12 +161,27 @@ const sortedEmployees = computed(() => {
 // Employés visibles selon le filtre de sites.
 const employeeFilter = ref('')
 
+// Un employé est considéré "présent" sur le mois affiché si au moins une de ses
+// périodes de contrat intersecte [début du mois ; fin du mois]. Sinon il est masqué.
+const hasContractInSelectedMonth = (employee: Employee): boolean => {
+    const monthStart = toYmd(selectedYear.value, selectedMonth.value, 1)
+    const monthEnd = toYmd(selectedYear.value, selectedMonth.value + 1, 0)
+    const history = employee.contractHistory ?? []
+    if (history.length === 0) return false
+    return history.some((period) => {
+        const start = period.startDate
+        const end = period.endDate ?? '9999-12-31'
+        return start <= monthEnd && end >= monthStart
+    })
+}
+
 const visibleEmployees = computed(() => {
     if (selectedSiteIds.value.length === 0) return []
     const filter = employeeFilter.value.trim().toLowerCase()
     return sortedEmployees.value.filter((employee) => {
         const siteOk = employee.site?.id && selectedSiteIds.value.includes(employee.site.id)
         if (!siteOk) return false
+        if (!hasContractInSelectedMonth(employee)) return false
         if (!filter) return true
         const first = employee.firstName?.toLowerCase() ?? ''
         const last = employee.lastName?.toLowerCase() ?? ''

frontend/pages/driver-hours.vue

@@ -64,6 +64,7 @@
                     :get-row-metrics="getRowMetrics"
                     :get-row-absence-label="getRowAbsenceLabel"
                     :get-row-absence-style="getRowAbsenceStyle"
+                    :get-row-contract-nature="getRowContractNature"
                     :get-row-updated-at="getRowUpdatedAt"
                     :on-absence-click="openAbsenceDrawer"
                     :format-minutes="formatMinutes"
@@ -73,11 +74,13 @@
                 <DriverHoursWeekView
                     v-else-if="isAdmin && viewMode === 'week'"
                     :is-week-loading="isWeekLoading"
+                    :is-admin="isAdmin"
                     :week-grid-cols="weekGridCols"
                     :weekly-summary="filteredWeeklySummary"
                     :week-day-headers="weekDayHeaders"
                     :format-minutes="formatMinutes"
                     class="max-h-[calc(100vh-300px)]"
+                    @open-comment="openWeekCommentDrawer"
                 />
             </div>
 
@@ -109,6 +112,17 @@
             @cancel="closeAbsenceDrawer"
         />
 
+        <HoursWeekCommentDrawer
+            v-if="weekCommentContext"
+            v-model="isWeekCommentDrawerOpen"
+            :employee-id="weekCommentContext.employeeId"
+            :employee-label="weekCommentContext.employeeLabel"
+            :week-start="weekCommentContext.weekStart"
+            :week-end="weekCommentContext.weekEnd"
+            :initial-content="weekCommentContext.content"
+            :comment-id="weekCommentContext.commentId"
+            @saved="reloadWeeklySummary"
+        />
     </div>
 </template>
 
@@ -169,6 +183,7 @@ const {
   getRowMetrics,
   getRowAbsenceLabel,
   getRowAbsenceStyle,
+  getRowContractNature,
   getRowUpdatedAt,
   openAbsenceDrawer,
   submitAbsence,
@@ -177,7 +192,11 @@ const {
   formatMinutes,
   isSelectedDateHoliday,
   selectedHolidayLabel,
-  handleSave
+  handleSave,
+  isWeekCommentDrawerOpen,
+  weekCommentContext,
+  openWeekCommentDrawer,
+  reloadWeeklySummary
 } = useDriverHoursPage()
 
 useHead({

frontend/pages/employees/[id].vue

@@ -26,10 +26,28 @@
                     <p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
                 </div>
                 <div class="text-right">
-                    <p class="font-bold text-[22px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}</p>
+                    <p class="font-bold text-[22px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}{{ forfaitRemainingDaysLabel }}</p>
                     <p class="text-[18px]">{{ employee.site?.name ?? '-' }}</p>
                 </div>
             </div>
+            <div v-if="showPicker" class="mt-3 flex items-center gap-3">
+                <MalioSelect
+                    label="Contrat"
+                    :model-value="selectedPhase?.id ?? null"
+                    :options="phaseOptions"
+                    group-class="w-[420px]"
+                    min-width=""
+                    @update:model-value="(v) => { if (v !== null) setSelectedPhase(Number(v)) }"
+                />
+            </div>
+            <div
+                v-if="isViewingPastPhase && selectedPhase"
+                class="mt-3 rounded-md border border-amber-300 bg-amber-100 px-4 py-2 text-sm text-amber-900"
+            >
+                Vous consultez l'historique
+                <strong>{{ formatPhaseLabel(selectedPhase) }}</strong>.
+                Les paiements de solde sont possibles ; l'édition d'absences et des stocks de report est désactivée.
+            </div>
             <div class="mt-[44px] border-b border-primary-500">
                 <div class="flex justify-center gap-16 text-2xl font-bold">
                     <button
@@ -160,15 +178,29 @@
                         :absences="employeeAbsences"
                         :summary="leaveSummary"
                         :public-holidays="publicHolidays"
+                        :selected-year="selectedLeaveYear"
+                        :available-years="availableLeaveYears"
+                        :current-year="currentLeaveYear"
                         @update-fractioned-days="submitFractionedDays"
                         @update-paid-leave-days="submitPaidLeaveDays"
+                        @update-selected-year="setSelectedLeaveYear"
                     />
                 </div>
                 <div v-else-if="showRttTab && activeTab === 'rtt'" class="h-full">
                     <div v-if="isRttLoading" class="mt-6 rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
                         Chargement...
                     </div>
-                    <EmployeesRttTab v-else class="h-full" :summary="rttSummary" @submit-rtt-payment="submitRttPayment" />
+                    <EmployeesRttTab
+                        v-else
+                        class="h-full"
+                        :summary="rttSummary"
+                        :selected-year="selectedRttYear"
+                        :available-years="availableRttYears"
+                        :current-year="currentRttYear"
+                        :selected-phase="selectedPhase"
+                        @submit-rtt-payment="submitRttPayment"
+                        @update-selected-year="setSelectedRttYear"
+                    />
                 </div>
                 <div v-else-if="activeTab === 'mileage'" class="h-full">
                     <div v-if="isMileageLoading" class="mt-6 rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
@@ -240,6 +272,7 @@
 import { ref } from 'vue'
 import EmployeeYearlyHoursDrawer from '~/components/EmployeeYearlyHoursDrawer.vue'
 import { usePdfPrinter } from '~/composables/usePdfPrinter'
+import { formatPhaseLabel } from '~/composables/useEmployeeContractPhase'
 
 const { printPdf } = usePdfPrinter()
 const isYearlyHoursDrawerOpen = ref(false)
@@ -253,10 +286,19 @@ const {
     leaveSummary,
     rttSummary,
     publicHolidays,
+    selectedLeaveYear,
+    currentLeaveYear,
+    availableLeaveYears,
+    setSelectedLeaveYear,
+    selectedRttYear,
+    currentRttYear,
+    availableRttYears,
+    setSelectedRttYear,
     showLeaveTab,
     showRttTab,
     contractHistory,
     employeeContractWorkLabel,
+    forfaitRemainingDaysLabel,
     contractForm,
     createContractForm,
     isContractDrawerOpen,
@@ -320,7 +362,12 @@ const {
     isObservationLoading,
     submitCreateObservation,
     submitUpdateObservation,
-    submitDeleteObservation
+    submitDeleteObservation,
+    selectedPhase,
+    showPicker,
+    phaseOptions,
+    setSelectedPhase,
+    isViewingPastPhase,
 } = useEmployeeDetailPage()
 
 const handleYearlyHoursPrint = async (payload: { year: number; month: number | null }) => {

frontend/pages/employees/index.vue

@@ -4,49 +4,45 @@
             <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
+                    <MalioButton
-                        type="button"
+                        label="Export"
-                        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"
+                        variant="secondary"
-                        @click="handleLeaveRecapPrint"
+                        icon-name="mdi:download"
-                    >
+                        icon-position="left"
-                        Export récap. congés
+                        @click="openExportDrawer"
-                    </button>
+                    />
-                    <button
+                    <MalioButton
-                        type="button"
+                        label="Ajouter un employé"
-                        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"
+                        icon-name="mdi:plus"
-                        @click="isSalaryRecapOpen = true"
+                        icon-position="left"
-                    >
-                        Export récap. salaire
-                    </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"
-                        @click="isYearlyHoursBulkOpen = true"
-                    >
-                        Export heures
-                    </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"
                         @click="openCreate"
-                    >
+                    />
-                        + Ajouter un employé
-                    </button>
                 </div>
             </div>
-            <div class="flex gap-3 py-7">
+            <div class="flex items-center gap-3 py-7">
                 <div class="w-80">
-                    <EmployeeNameFilterInput v-model="employeeFilter"/>
+                    <MalioInputText
+                        v-model="employeeFilter"
+                        label="Recherche d'un employé"
+                        icon-name="mdi:magnify"
+                    />
                 </div>
-                <SiteFilterSelector v-if="sites.length > 0" v-model="selectedSiteIds" :sites="sites"/>
+                <div v-if="sites.length > 0" class="relative z-50 w-80">
-                <select
+                    <MalioSelectCheckbox
+                        v-model="selectedSiteIds"
+                        :options="siteOptions"
+                        groupClass="w-80"
+                        label="Sites"
+                        display-select-all
+                    />
+                </div>
+
+                <MalioSelect
                     v-model="contractStatusFilter"
-                    class="rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500 cursor-pointer"
+                    label="Statut contrat"
-                >
+                    :options="contractStatusOptions"
-                    <option value="active">Avec contrat</option>
+                    group-class="w-40"
-                    <option value="inactive">Sans contrat</option>
+                />
-                    <option value="all">Tous</option>
-                </select>
             </div>
         </div>
 
@@ -88,105 +84,53 @@
             </NuxtLink>
         </div>
 
-        <AppDrawer v-model="isDrawerOpen" :title="drawerTitle">
+        <MalioDrawer v-model="isDrawerOpen" :title="drawerTitle">
             <form class="space-y-4" @submit.prevent="handleSubmit">
-                <div>
+                <MalioInputText
-                    <label class="text-md font-semibold text-neutral-700" for="first-name">
-                        Prénom <span class="text-red-600">*</span>
-                    </label>
-                    <input
-                        id="first-name"
                     v-model="form.firstName"
-                        type="text"
+                    label="Prénom *"
-                        :class="firstNameFieldClass"
+                    group-class="mt-2"
+                    :error="showFirstNameError ? 'Le prénom est obligatoire.' : ''"
                 />
-                    <p v-if="showFirstNameError" class="mt-1 text-sm text-red-600">
+                <MalioInputText
-                        Le prénom est obligatoire.
-                    </p>
-                </div>
-                <div>
-                    <label class="text-md font-semibold text-neutral-700" for="last-name">
-                        Nom <span class="text-red-600">*</span>
-                    </label>
-                    <input
-                        id="last-name"
                     v-model="form.lastName"
-                        type="text"
+                    label="Nom *"
-                        :class="lastNameFieldClass"
+                    group-class="mt-2"
+                    :error="showLastNameError ? 'Le nom est obligatoire.' : ''"
+                />
+                <MalioSelect
+                    :model-value="form.siteId === '' ? null : form.siteId"
+                    :options="formSiteOptions"
+                    label="Site *"
+                    min-width=""
+                    :error="showSiteError ? 'Le site est obligatoire.' : ''"
+                    @update:model-value="(v) => { form.siteId = v === null ? '' : Number(v) }"
                 />
-                    <p v-if="showLastNameError" class="mt-1 text-sm text-red-600">
-                        Le nom est obligatoire.
-                    </p>
-                </div>
-                <div>
-                    <label class="text-md font-semibold text-neutral-700" for="site">
-                        Site <span class="text-red-600">*</span>
-                    </label>
-                    <select
-                        id="site"
-                        v-model="form.siteId"
-                        :class="siteFieldClass"
-                    >
-                        <option value="">Aucun site</option>
-                        <option v-for="site in sites" :key="site.id" :value="site.id">
-                            {{ site.name }}
-                        </option>
-                    </select>
-                    <p v-if="showSiteError" class="mt-1 text-sm text-red-600">
-                        Le site est obligatoire.
-                    </p>
-                </div>
                 <template v-if="!editingEmployee">
-                    <div>
+                    <MalioSelect
-                        <label class="text-md font-semibold text-neutral-700" for="contract-nature">
+                        :model-value="form.contractNature"
-                            Type de contrat <span class="text-red-600">*</span>
+                        :options="contractNatureFormOptions"
-                        </label>
+                        label="Type de contrat *"
-                        <select
+                        min-width=""
-                            id="contract-nature"
+                        :error="showContractNatureError ? 'Le type de contrat est obligatoire.' : ''"
-                            v-model="form.contractNature"
+                        @update:model-value="(v) => { if (v !== null) form.contractNature = v as 'CDI' | 'CDD' | 'INTERIM' }"
-                            :class="contractNatureFieldClass"
+                    />
-                        >
+                    <MalioSelect
-                            <option value="CDI">CDI</option>
+                        v-if="form.contractNature === 'INTERIM'"
-                            <option value="CDD">CDD</option>
+                        :model-value="form.interimAgencyId === '' ? null : form.interimAgencyId"
-                            <option value="INTERIM">Intérim</option>
+                        :options="interimAgencyOptions"
-                        </select>
+                        label="Agence d'intérim"
-                        <p v-if="showContractNatureError" class="mt-1 text-sm text-red-600">
+                        min-width=""
-                            Le type de contrat est obligatoire.
+                        @update:model-value="(v) => { form.interimAgencyId = v === null ? '' : Number(v) }"
-                        </p>
+                    />
-                    </div>
+                    <MalioSelect
-                    <div v-if="form.contractNature === 'INTERIM'">
+                        :model-value="form.contractId === '' ? null : form.contractId"
-                        <label class="text-md font-semibold text-neutral-700" for="interim-agency">
+                        :options="contractFormOptions"
-                            Agence d'intérim
+                        label="Temps de travail *"
-                        </label>
+                        min-width=""
-                        <select
+                        :error="showContractError ? 'Le temps de travail est obligatoire.' : ''"
-                            id="interim-agency"
+                        @update:model-value="(v) => { form.contractId = v === null ? '' : Number(v) }"
-                            v-model="form.interimAgencyId"
+                    />
-                            class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
-                        >
-                            <option value="">Aucune</option>
-                            <option v-for="agency in interimAgencies" :key="agency.id" :value="agency.id">
-                                {{ agency.name }}
-                            </option>
-                        </select>
-                    </div>
-                    <div>
-                        <label class="text-md font-semibold text-neutral-700" for="contract">
-                            Temps de travail <span class="text-red-600">*</span>
-                        </label>
-                        <select
-                            id="contract"
-                            v-model="form.contractId"
-                            :class="contractFieldClass"
-                        >
-                            <option value="">Sélectionner un contrat</option>
-                            <option v-for="contract in contracts" :key="contract.id" :value="contract.id">
-                                {{ contract.name }}
-                            </option>
-                        </select>
-                        <p v-if="showContractError" class="mt-1 text-sm text-red-600">
-                            Le temps de travail est obligatoire.
-                        </p>
-                    </div>
                     <div>
                         <label class="text-md font-semibold text-neutral-700" for="contract-start-date">
                             Début contrat <span class="text-red-600">*</span>
@@ -195,7 +139,7 @@
                             id="contract-start-date"
                             v-model="form.contractStartDate"
                             type="date"
-                            :class="contractStartDateFieldClass"
+                            :class="[dateInputBaseClass, form.contractStartDate ? 'border-black' : 'border-m-muted', showContractStartDateError ? '!border-m-danger' : '']"
                         />
                         <p v-if="showContractStartDateError" class="mt-1 text-sm text-red-600">
                             La date de début est obligatoire.
@@ -210,22 +154,18 @@
                             id="contract-end-date"
                             v-model="form.contractEndDate"
                             type="date"
-                            :class="contractEndDateFieldClass"
+                            :class="[dateInputBaseClass, form.contractEndDate ? 'border-black' : 'border-m-muted', showContractEndDateError ? '!border-m-danger' : '']"
                         />
                         <p v-if="showContractEndDateError" class="mt-1 text-sm text-red-600">
                             La date de fin est obligatoire pour un CDD ou un Intérim.
                         </p>
                     </div>
-                    <div class="rounded-md border border-neutral-200 bg-neutral-50 p-3">
+                    <div class="flex h-10 items-center rounded-md border border-neutral-200 bg-neutral-50 px-3">
-                        <label class="inline-flex items-center gap-2 text-md font-semibold text-neutral-700" for="is-driver">
+                        <MalioCheckbox
-                            <input
-                                id="is-driver"
                             v-model="form.isDriver"
-                                type="checkbox"
+                            label="Chauffeur"
-                                class="h-4 w-4 rounded border-neutral-300 text-primary-500 focus:ring-primary-500"
+                            group-class="flex items-center"
                         />
-                            Chauffeur
-                        </label>
                     </div>
                     <WorkDaysHoursInput
                         v-if="requiresSchedule"
@@ -234,35 +174,73 @@
                     />
                 </template>
                 <div class="flex justify-end gap-3 pt-2">
-                    <button
+                    <MalioButton
-                        type="button"
+                        label="Annuler"
-                        class="rounded-lg border border-neutral-200 px-4 py-2 text-md font-semibold text-neutral-700 hover:bg-neutral-100"
+                        variant="tertiary"
                         @click="isDrawerOpen = false"
-                    >
+                    />
-                        Annuler
+                    <MalioButton
-                    </button>
-                    <button
                         type="submit"
-                        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                        label="Enregistrer"
-                        :class="submitButtonClass"
+                        :disabled="isSubmitting || !isFormValid"
-                    >
+                    />
-                        Enregistrer
-                    </button>
                 </div>
             </form>
-        </AppDrawer>
+        </MalioDrawer>
 
-        <SalaryRecapDrawer
+        <MalioDrawer v-model="isExportDrawerOpen" title="Export">
-            v-model="isSalaryRecapOpen"
+            <div class="space-y-4">
-            @submit="handleSalaryRecapPrint"
+                <MalioSelect
+                    :model-value="exportChoice === '' ? null : exportChoice"
+                    :options="exportTypeOptions"
+                    label="Type d'export"
+                    empty-option-label="Choisir un export"
+                    group-class="mt-2"
+                    min-width=""
+                    @update:model-value="onExportChoiceChange"
                 />
 
-        <BulkYearlyHoursDrawer
+                <div v-if="exportChoice === 'salary-recap'">
-            v-model="isYearlyHoursBulkOpen"
+                    <label class="text-md font-semibold text-neutral-700" for="export-salary-month">
-            :is-loading="isYearlyHoursBulkLoading"
+                        Mois <span class="text-red-600">*</span>
-            @submit="handleBulkYearlyHoursPrint"
+                    </label>
+                    <input
+                        id="export-salary-month"
+                        v-model="exportSalaryMonth"
+                        type="month"
+                        class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
                     />
                 </div>
+
+                <template v-else-if="exportChoice === 'yearly-hours'">
+                    <MalioSelect
+                        :model-value="exportYear"
+                        :options="exportYearOptions"
+                        label="Année *"
+                        min-width=""
+                        @update:model-value="(v) => { if (v !== null) exportYear = Number(v) }"
+                    />
+                    <MalioSelect
+                        :model-value="exportMonth === '' ? null : exportMonth"
+                        :options="exportMonthOptions"
+                        label="Mois *"
+                        empty-option-label="Choisir un mois"
+                        min-width=""
+                        @update:model-value="(v) => { exportMonth = v === null ? '' : Number(v) }"
+                    />
+                </template>
+
+                <div class="flex justify-center pt-2">
+                    <MalioButton
+                        label="Valider"
+                        button-class="w-[200px]"
+                        :disabled="!isExportValid"
+                        @click="handleExportValidate"
+                    />
+                </div>
+            </div>
+        </MalioDrawer>
+    </div>
 </template>
 
 <script setup lang="ts">
@@ -275,9 +253,6 @@ import {listContracts} from '~/services/contracts'
 import {createEmployee, deleteEmployee, listEmployees, updateEmployee} from '~/services/employees'
 import {listSites} from '~/services/sites'
 import {listInterimAgencies, type InterimAgency} from '~/services/interim-agencies'
-import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
-import SalaryRecapDrawer from '~/components/SalaryRecapDrawer.vue'
-import BulkYearlyHoursDrawer from '~/components/BulkYearlyHoursDrawer.vue'
 import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
 import {usePdfPrinter} from '~/composables/usePdfPrinter'
 
@@ -288,9 +263,50 @@ useHead({
 const isDrawerOpen = ref(false)
 const isSubmitting = ref(false)
 const isLoading = ref(false)
-const isSalaryRecapOpen = ref(false)
+const isExportDrawerOpen = ref(false)
-const isYearlyHoursBulkOpen = ref(false)
+const exportChoice = ref<'leave-recap' | 'salary-recap' | 'yearly-hours' | ''>('')
-const isYearlyHoursBulkLoading = ref(false)
+const exportYear = ref<number>(new Date().getFullYear())
+const exportMonth = ref<number | ''>(new Date().getMonth() + 1)
+const exportSalaryMonth = ref<string>(`${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`)
+
+const exportTypeOptions = [
+    { label: 'Récap. congés', value: 'leave-recap' },
+    { label: 'Récap. salaire', value: 'salary-recap' },
+    { label: 'Heures annuelles', value: 'yearly-hours' }
+]
+const exportYearOptions = computed(() => {
+    const current = new Date().getFullYear()
+    return Array.from({ length: 6 }, (_, i) => ({ label: String(current - i), value: current - i }))
+})
+const exportMonthOptions = [
+    { label: 'Janvier', value: 1 },
+    { label: 'Février', value: 2 },
+    { label: 'Mars', value: 3 },
+    { label: 'Avril', value: 4 },
+    { label: 'Mai', value: 5 },
+    { label: 'Juin', value: 6 },
+    { label: 'Juillet', value: 7 },
+    { label: 'Août', value: 8 },
+    { label: 'Septembre', value: 9 },
+    { label: 'Octobre', value: 10 },
+    { label: 'Novembre', value: 11 },
+    { label: 'Décembre', value: 12 }
+]
+
+const isExportValid = computed(() => {
+    if (!exportChoice.value) return false
+    if (exportChoice.value === 'salary-recap') {
+        return exportSalaryMonth.value.trim() !== ''
+    }
+    if (exportChoice.value === 'yearly-hours') {
+        return exportYear.value > 0 && exportMonth.value !== ''
+    }
+    return true
+})
+
+const onExportChoiceChange = (value: string | number | null) => {
+    exportChoice.value = (value === null ? '' : String(value)) as 'leave-recap' | 'salary-recap' | 'yearly-hours' | ''
+}
 const { printPdf } = usePdfPrinter()
 const sitesInitialized = ref(false)
 const editingEmployee = ref<Employee | null>(null)
@@ -304,7 +320,13 @@ const contracts = ref<Contract[]>([])
 const interimAgencies = ref<InterimAgency[]>([])
 const employeeFilter = ref('')
 const contractStatusFilter = ref<'active' | 'inactive' | 'all'>('active')
+const contractStatusOptions = [
+    { label: 'Avec contrat', value: 'active' },
+    { label: 'Sans contrat', value: 'inactive' },
+    { label: 'Tous', value: 'all' }
+]
 const selectedSiteIds = ref<number[]>([])
+const siteOptions = computed(() => sites.value.map((site) => ({ label: site.name, value: site.id })))
 
 const filteredEmployees = computed<Employee[]>(() => {
     if (selectedSiteIds.value.length === 0) return []
@@ -410,63 +432,23 @@ const showContractEndDateError = computed(
     () => !editingEmployee.value && validationTouched.contractEndDate && !isContractEndDateValid.value
 )
 
-const baseInputClass =
+const dateInputBaseClass =
-    'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
+    'mt-2 h-10 w-full rounded-md border px-3 text-md text-black outline-none focus:border-2 focus:border-m-primary'
-const firstNameFieldClass = computed(() => {
-    if (showFirstNameError.value) {
-        return `${baseInputClass} border-red-500`
-    }
-    return `${baseInputClass} border-neutral-300`
-})
-const lastNameFieldClass = computed(() => {
-    if (showLastNameError.value) {
-        return `${baseInputClass} border-red-500`
-    }
-    return `${baseInputClass} border-neutral-300`
-})
-const siteFieldClass = computed(() => {
-    const baseSelectClass =
-        'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
-    if (showSiteError.value) {
-        return `${baseSelectClass} border-red-500`
-    }
-    return `${baseSelectClass} border-neutral-300`
-})
-const contractFieldClass = computed(() => {
-    const baseClass =
-        'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
-    if (showContractError.value) {
-        return `${baseClass} border-red-500`
-    }
-    return `${baseClass} border-neutral-300`
-})
-const contractNatureFieldClass = computed(() => {
-    const baseClass =
-        'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
-    if (showContractNatureError.value) {
-        return `${baseClass} border-red-500`
-    }
-    return `${baseClass} border-neutral-300`
-})
-const contractStartDateFieldClass = computed(() => {
-    if (showContractStartDateError.value) {
-        return `${baseInputClass} border-red-500`
-    }
-    return `${baseInputClass} border-neutral-300`
-})
-const contractEndDateFieldClass = computed(() => {
-    if (showContractEndDateError.value) {
-        return `${baseInputClass} border-red-500`
-    }
-    return `${baseInputClass} border-neutral-300`
-})
 
-const submitButtonClass = computed(() => {
+const formSiteOptions = computed(() =>
-    if (isSubmitting.value || !isFormValid.value) {
+    sites.value.map((site) => ({ label: site.name, value: site.id }))
-        return 'opacity-50 cursor-not-allowed'
+)
-    }
+const interimAgencyOptions = computed(() =>
-    return ''
+    interimAgencies.value.map((agency) => ({ label: agency.name, value: agency.id }))
-})
+)
+const contractFormOptions = computed(() =>
+    contracts.value.map((contract) => ({ label: contract.name, value: contract.id }))
+)
+const contractNatureFormOptions = [
+    { label: 'CDI', value: 'CDI' },
+    { label: 'CDD', value: 'CDD' },
+    { label: 'Intérim', value: 'INTERIM' }
+]
 
 const loadEmployees = async () => {
     isLoading.value = true
@@ -617,26 +599,29 @@ const openCreate = () => {
     isDrawerOpen.value = true
 }
 
-const handleLeaveRecapPrint = async () => {
+const openExportDrawer = () => {
+    exportChoice.value = ''
+    const now = new Date()
+    exportYear.value = now.getFullYear()
+    exportMonth.value = now.getMonth() + 1
+    exportSalaryMonth.value = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
+    isExportDrawerOpen.value = true
+}
+
+const handleExportValidate = async () => {
+    if (!isExportValid.value) return
+    const choice = exportChoice.value
+    isExportDrawerOpen.value = false
+    if (choice === 'leave-recap') {
         await printPdf('/leave-recap/print')
-}
+    } else if (choice === 'salary-recap') {
-
+        await printPdf(`/salary-recap/print?month=${exportSalaryMonth.value}`)
-const handleSalaryRecapPrint = async (month: string) => {
+    } else if (choice === 'yearly-hours') {
-    await printPdf(`/salary-recap/print?month=${month}`)
+        await printPdf(`/yearly-hours/print-all?year=${exportYear.value}&month=${exportMonth.value}`)
-    isSalaryRecapOpen.value = false
-}
-
-const handleBulkYearlyHoursPrint = async (payload: { year: number; month: number | null }) => {
-    isYearlyHoursBulkLoading.value = true
-    try {
-        const monthParam = null !== payload.month ? `&month=${payload.month}` : ''
-        await printPdf(`/yearly-hours/print-all?year=${payload.year}${monthParam}`)
-        isYearlyHoursBulkOpen.value = false
-    } finally {
-        isYearlyHoursBulkLoading.value = false
     }
 }
 
+
 const confirmDelete = async (employee: Employee) => {
     const ok = window.confirm(`Supprimer ${employee.firstName} ${employee.lastName} ?`)
     if (!ok) return

frontend/pages/hours.vue

@@ -70,6 +70,7 @@
                 :get-row-absence-style="getRowAbsenceStyle"
                 :has-row-formation="hasRowFormation"
                 :get-row-formation-label="getRowFormationLabel"
+                :get-row-contract-nature="getRowContractNature"
                 :get-row-updated-at="getRowUpdatedAt"
                 :get-presence-day-value="getPresenceDayValue"
                 :on-absence-click="openAbsenceDrawer"
@@ -80,11 +81,13 @@
                 <HoursWeekView
                     v-else-if="isAdmin && viewMode === 'week'"
                     :is-week-loading="isWeekLoading"
+                    :is-admin="isAdmin"
                     :week-grid-cols="weekGridCols"
                     :weekly-summary="filteredWeeklySummary"
                     :week-day-headers="weekDayHeaders"
                     :format-minutes="formatMinutes"
                     class="max-h-[calc(100vh-300px)]"
+                    @open-comment="openWeekCommentDrawer"
                 />
             </div>
 
@@ -116,6 +119,17 @@
             @cancel="closeAbsenceDrawer"
         />
 
+        <HoursWeekCommentDrawer
+            v-if="weekCommentContext"
+            v-model="isWeekCommentDrawerOpen"
+            :employee-id="weekCommentContext.employeeId"
+            :employee-label="weekCommentContext.employeeLabel"
+            :week-start="weekCommentContext.weekStart"
+            :week-end="weekCommentContext.weekEnd"
+            :initial-content="weekCommentContext.content"
+            :comment-id="weekCommentContext.commentId"
+            @saved="reloadWeeklySummary"
+        />
     </div>
 </template>
 
@@ -184,6 +198,7 @@ const {
   getRowAbsenceStyle,
   hasRowFormation,
   getRowFormationLabel,
+  getRowContractNature,
   getRowUpdatedAt,
   getPresenceDayValue,
   openAbsenceDrawer,
@@ -191,7 +206,11 @@ const {
   deleteAbsenceFromDrawer,
   closeAbsenceDrawer,
   formatMinutes,
-  handleSave
+  handleSave,
+  isWeekCommentDrawerOpen,
+  weekCommentContext,
+  openWeekCommentDrawer,
+  reloadWeeklySummary
 } = useHoursPage()
 
 useHead({

frontend/pages/login.vue

@@ -9,31 +9,18 @@
             class="mt-8 space-y-6 rounded-lg border border-neutral-200 bg-white p-6 shadow-sm"
             @submit.prevent="handleSubmit"
         >
-            <div>
+            <MalioInputText
-                <label class="text-sm font-semibold text-neutral-700" for="username">
-                    Nom d'utilisateur
-                </label>
-                <input
-                    id="username"
                 v-model="username"
-                    type="text"
+                label="Nom d'utilisateur"
                 autocomplete="username"
-                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
+                group-class="mt-2"
             />
-            </div>
 
-            <div>
+            <MalioInputPassword
-                <label class="text-sm font-semibold text-neutral-700" for="password">
-                    Mot de passe
-                </label>
-                <input
-                    id="password"
                 v-model="password"
-                    type="password"
+                label="Mot de passe"
                 autocomplete="current-password"
-                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white 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>
 
             <button
                 type="submit"

frontend/pages/sites.vue

@@ -2,13 +2,12 @@
   <div class="h-full flex flex-col overflow-hidden">
     <div class="flex items-center justify-between pb-6">
       <h1 class="text-4xl font-bold text-primary-500">Sites</h1>
-      <button
+      <MalioButton
-        type="button"
+        label="Ajouter un site"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+        icon-name="mdi:plus"
+        icon-position="left"
         @click="openCreate"
-      >
+      />
-        + Ajouter un site
-      </button>
     </div>
 
     <div
@@ -52,22 +51,14 @@
       </div>
     </div>
 
-    <AppDrawer v-model="isDrawerOpen" :title="drawerTitle">
+    <MalioDrawer v-model="isDrawerOpen" :title="drawerTitle">
       <form class="space-y-4" @submit.prevent="handleSubmit">
-        <div>
+        <MalioInputText
-          <label class="text-md font-semibold text-neutral-700" for="name">
-            Nom <span class="text-red-600">*</span>
-          </label>
-          <input
-            id="name"
           v-model="form.name"
-            type="text"
+          label="Nom *"
-            :class="nameFieldClass"
+          group-class="mt-2"
+          :error="showNameError ? 'Le nom du site est obligatoire.' : ''"
         />
-          <p v-if="showNameError" class="mt-1 text-sm text-red-600">
-            Le nom du site est obligatoire.
-          </p>
-        </div>
         <div>
           <label class="text-md font-semibold text-neutral-700" for="color">
             Couleur <span class="text-red-600">*</span>
@@ -83,32 +74,29 @@
           </div>
         </div>
         <div v-if="editingSite" class="grid grid-cols-2 gap-3 pt-2">
-          <button
+          <MalioButton
-            type="button"
+            label="Supprimer"
-            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"
+            variant="danger"
+            button-class="w-full"
             @click="confirmDelete(editingSite)"
-          >
+          />
-            Supprimer
+          <MalioButton
-          </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"
+            label="Modifier"
-            :class="submitButtonClass"
+            button-class="w-full"
-          >
+            :disabled="isSubmitting || !isFormValid"
-            Modifier
+          />
-          </button>
         </div>
         <div v-else class="flex justify-center pt-2">
-          <button
+          <MalioButton
             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"
+            label="Valider"
-            :class="submitButtonClass"
+            button-class="w-[200px]"
-          >
+            :disabled="isSubmitting || !isFormValid"
-            + Ajouter
+          />
-          </button>
         </div>
       </form>
-    </AppDrawer>
+    </MalioDrawer>
   </div>
 </template>
 
@@ -146,22 +134,6 @@ const isFormValid = computed(() => isNameValid.value)
 
 const showNameError = computed(() => validationTouched.name && !isNameValid.value)
 
-const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
-const nameFieldClass = computed(() => {
-  if (showNameError.value) {
-    return `${baseInputClass} border-red-500`
-  }
-  return `${baseInputClass} border-neutral-300`
-})
-
-const submitButtonClass = computed(() => {
-  if (isSubmitting.value || !isFormValid.value) {
-    return 'opacity-50 cursor-not-allowed'
-  }
-  return ''
-})
-
 const loadSites = async () => {
   isLoading.value = true
   try {

frontend/pages/users.vue

@@ -2,13 +2,12 @@
   <div class="h-full flex flex-col overflow-hidden">
     <div class="flex items-center justify-between pb-6">
       <h1 class="text-2xl font-bold text-primary-500 lg:text-4xl">Utilisateurs</h1>
-      <button
+      <MalioButton
-        type="button"
+        label="Ajouter"
-        class="rounded-lg bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-secondary-500 lg:px-4 lg:text-md"
+        icon-name="mdi:plus"
+        icon-position="left"
         @click="openCreate"
-      >
+      />
-        + Ajouter
-      </button>
     </div>
 
     <div
@@ -93,43 +92,25 @@
       </div>
     </div>
 
-    <AppDrawer
+    <MalioDrawer
       v-model="isDrawerOpen"
       :title="editingUser ? 'Modifier un utilisateur' : 'Ajouter un utilisateur'"
     >
       <form class="space-y-4" @submit.prevent="handleSubmit">
-        <div>
+        <MalioInputText
-          <label class="text-md font-semibold text-neutral-700" for="username">
-            Nom d'utilisateur <span class="text-red-600">*</span>
-          </label>
-          <input
-            id="username"
           v-model="form.username"
-            type="text"
+          :label="editingUser ? `Nom d'utilisateur` : `Nom d'utilisateur *`"
-            :class="usernameFieldClass"
+          group-class="mt-2"
+          :error="showUsernameError ? `Le nom d'utilisateur est obligatoire.` : ''"
         />
-          <p v-if="showUsernameError" class="mt-1 text-sm text-red-600">
-            Le nom d'utilisateur est obligatoire.
-          </p>
-        </div>
 
         <div>
-          <label class="text-md font-semibold text-neutral-700" for="password">
+          <MalioInputPassword
-            Mot de passe
-            <span v-if="!editingUser" class="text-red-600">*</span>
-          </label>
-          <input
-            id="password"
             v-model="form.password"
-            type="password"
+            :label="editingUser ? 'Mot de passe' : 'Mot de passe *'"
-            :class="passwordFieldClass"
+            :hint="editingUser ? 'Laisse vide pour ne pas changer le mot de passe.' : ''"
+            :error="!editingUser && showPasswordError ? 'Le mot de passe est obligatoire.' : ''"
           />
-          <p v-if="editingUser" class="mt-1 text-sm text-neutral-500">
-            Laisse vide pour ne pas changer le mot de passe.
-          </p>
-          <p v-else-if="showPasswordError" class="mt-1 text-sm text-red-600">
-            Le mot de passe est obligatoire.
-          </p>
         </div>
 
         <div>
@@ -172,40 +153,32 @@
         </div>
 
         <div v-if="form.accessMode === 'self'">
-          <label class="text-md font-semibold text-neutral-700" for="employee">
+          <MalioSelect
-            Employé lié
+            :model-value="form.employeeId === '' ? null : form.employeeId"
-          </label>
+            :options="employeeOptions"
-          <select
+            label="Employé lié"
-            id="employee"
+            empty-option-label="Aucun"
-            v-model="form.employeeId"
+            min-width=""
-            class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
+            :error="showSelfEmployeeError ? 'Sélectionne un employé.' : ''"
-          >
+            @update:model-value="onEmployeeChange"
-            <option value="">Aucun</option>
+          />
-            <option v-for="employee in employees" :key="employee.id" :value="employee.id">
-              {{ employee.firstName }} {{ employee.lastName }}
-            </option>
-          </select>
-          <p v-if="showSelfEmployeeError" class="mt-1 text-sm text-red-600">
-            Sélectionne un employé.
-          </p>
         </div>
 
         <div v-if="form.accessMode === 'sites'">
           <p class="text-md font-semibold text-neutral-700">Sites autorisés</p>
           <div class="mt-2 grid gap-2 sm:grid-cols-2">
-            <label
+            <div
               v-for="site in sites"
               :key="site.id"
-              class="flex items-center gap-2 rounded-md border border-neutral-200 px-3 py-2 text-sm text-neutral-700 cursor-pointer"
+              class="flex h-10 items-center rounded-md border border-neutral-200 px-3"
             >
-              <input
+              <MalioCheckbox
-                type="checkbox"
+                :model-value="form.siteIds.includes(site.id)"
-                class="cursor-pointer"
+                :label="site.name"
-                :checked="form.siteIds.includes(site.id)"
+                group-class="flex items-center"
-                @change="toggleSite(site.id)"
+                @update:model-value="toggleSite(site.id)"
               />
-              <span>{{ site.name }}</span>
+            </div>
-            </label>
           </div>
           <p v-if="showSitesError" class="mt-1 text-sm text-red-600">
             Sélectionne au moins un site.
@@ -213,44 +186,31 @@
         </div>
 
         <div>
-          <label class="flex items-center gap-2 cursor-pointer">
+          <MalioCheckbox
-            <input
             v-model="form.isLocked"
-              type="checkbox"
+            label="Verrouiller le compte"
-              class="cursor-pointer"
+            hint="Un compte verrouillé ne peut plus se connecter."
           />
-            <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>
-          <label class="flex items-center gap-2 cursor-pointer">
+          <MalioCheckbox
-            <input
             v-model="form.hasLeaveRecapAccess"
-              type="checkbox"
+            label="Accès à l'écran Récap. congés"
-              class="cursor-pointer"
+            hint="Affiche l'onglet dans la sidebar et donne accès au tableau récap."
           />
-            <span class="text-md font-semibold text-neutral-700">Accès à l'écran Récap. congés</span>
-          </label>
-          <p class="mt-1 text-sm text-neutral-500">
-            Affiche l'onglet dans la sidebar et donne accès au tableau récap.
-          </p>
         </div>
 
         <div class="flex justify-center pt-2">
-          <button
+          <MalioButton
             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"
+            :label="editingUser ? 'Modifier' : 'Valider'"
-            :class="submitButtonClass"
+            button-class="w-[200px]"
-          >
+            :disabled="isSubmitting || !isFormValid"
-            {{ editingUser ? 'Modifier' : '+ Ajouter' }}
+          />
-          </button>
         </div>
       </form>
-    </AppDrawer>
+    </MalioDrawer>
   </div>
 </template>
 
@@ -348,27 +308,13 @@ const getSiteLabels = (user: User) => {
   return names.length > 0 ? names.join(', ') : 'Sites sélectionnés'
 }
 
-const baseInputClass =
+const employeeOptions = computed(() =>
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
+  employees.value.map((e) => ({ label: `${e.firstName} ${e.lastName}`, value: e.id }))
-const usernameFieldClass = computed(() => {
+)
-  if (showUsernameError.value) {
-    return `${baseInputClass} border-red-500`
-  }
-  return `${baseInputClass} border-neutral-300`
-})
-const passwordFieldClass = computed(() => {
-  if (showPasswordError.value) {
-    return `${baseInputClass} border-red-500`
-  }
-  return `${baseInputClass} border-neutral-300`
-})
 
-const submitButtonClass = computed(() => {
+const onEmployeeChange = (value: string | number | null) => {
-  if (isSubmitting.value || !isFormValid.value) {
+  form.employeeId = value === null ? '' : Number(value)
-    return 'opacity-50 cursor-not-allowed'
+}
-  }
-  return ''
-})
 
 const loadData = async () => {
   isLoading.value = true

frontend/services/dto/contract-phase.ts

@@ -0,0 +1,13 @@
+import type { ContractType } from './contract'
+
+export type ContractPhase = {
+  id: number
+  contractType: ContractType
+  weeklyHours: number | null
+  isDriver: boolean
+  startDate: string
+  endDate: string | null
+  periodIds: number[]
+  isCurrent: boolean
+  contractNature: 'CDI' | 'CDD' | 'INTERIM'
+}

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

@@ -15,5 +15,7 @@ export type EmployeeLeaveSummary = {
   previousYearRemainingDays: number
   previousYearPaidDays: number
   presenceDaysByMonth: Record<string, number>
+  presenceDaysToToday: number
+  dataStartDate: string | null
 }
 

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

@@ -9,6 +9,7 @@ export type EmployeeRttWeekSummary = {
   base50Minutes: number
   bonus50Minutes: number
   totalMinutes: number
+  cumulativeBalanceMinutes: number
 }
 
 export type RttMonthPayment = {

frontend/services/dto/employee.ts

@@ -1,5 +1,6 @@
 import type { Site } from './site'
 import type { Contract } from './contract'
+import type { ContractPhase } from './contract-phase'
 
 export type ContractSuspension = {
   id: number
@@ -41,4 +42,5 @@ export type Employee = {
   currentSuspensions?: ContractSuspension[]
   currentInterimAgencyId?: number | null
   currentInterimAgencyName?: string | null
+  contractPhases?: ContractPhase[]
 }

frontend/services/dto/work-hour.ts

@@ -60,6 +60,7 @@ export type WeeklyWorkHourDailySummary = {
   hasDinner?: boolean
   hasOvernight?: boolean
   virtualHolidayMinutes?: number
+  holidayLabel?: string | null
 }
 
 export type WeeklyWorkHourRowSummary = {
@@ -88,6 +89,8 @@ export type WeeklyWorkHourRowSummary = {
   weeklyOvernightCount?: number
   hasContractForWeek?: boolean
   contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
+  comment?: string | null
+  commentId?: number | null
 }
 
 export type WeeklyWorkHourSummary = {
@@ -111,6 +114,7 @@ export type WorkHourDayContextRow = {
   hasFormation?: boolean
   formationLabel?: string | null
   virtualHolidayMinutes?: number
+  contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
 }
 
 export type WorkHourDayContext = {

frontend/services/employee-leave-summary.ts

@@ -1,9 +1,10 @@
 import type { EmployeeLeaveSummary } from './dto/employee-leave-summary'
 
-export const getEmployeeLeaveSummary = async (employeeId: number, year?: number) => {
+export const getEmployeeLeaveSummary = async (employeeId: number, year?: number, phaseId?: number) => {
   const api = useApi()
   const query: Record<string, string> = {}
   if (year) query.year = String(year)
+  if (phaseId !== undefined) query.phaseId = String(phaseId)
 
   return api.get<EmployeeLeaveSummary>(`/employees/${employeeId}/leave-summary`, query, { toast: false })
 }

frontend/services/employee-rtt-summary.ts

@@ -1,8 +1,10 @@
 import type { EmployeeRttSummary } from './dto/employee-rtt-summary'
 
-export const getEmployeeRttSummary = async (employeeId: number, year?: number) => {
+export const getEmployeeRttSummary = async (employeeId: number, year?: number, phaseId?: number) => {
   const api = useApi()
-  const query = year ? { year } : {}
+  const query: Record<string, number> = {}
+  if (year) query.year = year
+  if (phaseId !== undefined) query.phaseId = phaseId
   return api.get<EmployeeRttSummary>(`/employees/${employeeId}/rtt-summary`, query, { toast: false })
 }
 

frontend/services/employee-week-comments.ts

@@ -0,0 +1,24 @@
+export type EmployeeWeekComment = {
+  id: number
+  weekStartDate: string
+  content: string
+}
+
+export const createWeekComment = async (payload: { employeeId: number; weekStartDate: string; content: string }) => {
+  const api = useApi()
+  return api.post<EmployeeWeekComment>('/employee_week_comments', {
+    employee: `/api/employees/${payload.employeeId}`,
+    weekStartDate: payload.weekStartDate,
+    content: payload.content
+  }, { toastSuccessKey: 'success.weekComment.save', toastErrorKey: 'errors.weekComment.save' })
+}
+
+export const updateWeekComment = async (id: number, content: string) => {
+  const api = useApi()
+  return api.patch<EmployeeWeekComment>(`/employee_week_comments/${id}`, { content }, { toastSuccessKey: 'success.weekComment.save', toastErrorKey: 'errors.weekComment.save' })
+}
+
+export const deleteWeekComment = async (id: number) => {
+  const api = useApi()
+  await api.delete(`/employee_week_comments/${id}`, {}, { toastSuccessKey: 'success.weekComment.delete', toastErrorKey: 'errors.weekComment.delete' })
+}

migrations/Version20260417100000.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260417100000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create employee_week_comments table for per-week admin annotations on the hours weekly view';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE employee_week_comments (id SERIAL NOT NULL, employee_id INT NOT NULL, week_start_date DATE NOT NULL, content TEXT NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE UNIQUE INDEX uniq_employee_week_comment ON employee_week_comments (employee_id, week_start_date)');
+        $this->addSql('CREATE INDEX idx_ewc_week_start ON employee_week_comments (week_start_date)');
+        $this->addSql('ALTER TABLE employee_week_comments ADD CONSTRAINT fk_ewc_employee FOREIGN KEY (employee_id) REFERENCES employees(id) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE employee_week_comments');
+    }
+}

src/ApiResource/EmployeeLeaveSummary.php

@@ -38,4 +38,10 @@ final class EmployeeLeaveSummary
 
     /** @var array<string, float> YYYY-MM => count (0.5 for half-days) */
     public array $presenceDaysByMonth = [];
+
+    /** Cumul des jours de présence depuis le début de l'année de congé jusqu'à aujourd'hui (forfait). */
+    public float $presenceDaysToToday = 0.0;
+
+    /** Date de mise en service du logiciel (env RTT_START_DATE) — borne minimale pour les sélecteurs d'historique. */
+    public ?string $dataStartDate = null;
 }

src/Dto/Contracts/ContractPhase.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Dto\Contracts;
+
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use DateTimeImmutable;
+
+final readonly class ContractPhase
+{
+    /**
+     * @param list<int> $periodIds
+     */
+    public function __construct(
+        public int $id,
+        public ContractType $contractType,
+        public ?int $weeklyHours,
+        public bool $isDriver,
+        public DateTimeImmutable $startDate,
+        public ?DateTimeImmutable $endDate,
+        public array $periodIds,
+        public bool $isCurrent,
+        public ContractNature $contractNature,
+    ) {}
+}

src/Dto/Rtt/EmployeeRttWeekSummary.php

@@ -17,5 +17,6 @@ final class EmployeeRttWeekSummary
         public int $base50Minutes = 0,
         public int $bonus50Minutes = 0,
         public int $totalMinutes = 0,
+        public int $cumulativeBalanceMinutes = 0,
     ) {}
 }

src/Dto/WorkHours/DayContextRow.php

@@ -20,6 +20,7 @@ final class DayContextRow
         public bool $hasFormation = false,
         public ?string $formationLabel = null,
         public int $virtualHolidayMinutes = 0,
+        public ?string $contractNature = null,
     ) {}
 
     public function setFormation(string $label): void
@@ -77,7 +78,8 @@ final class DayContextRow
      *     isDriverContract:bool,
      *     hasFormation:bool,
      *     formationLabel:?string,
-     *     virtualHolidayMinutes:int
+     *     virtualHolidayMinutes:int,
+     *     contractNature:?string
      * }
      */
     public function toArray(): array
@@ -96,6 +98,7 @@ final class DayContextRow
             'hasFormation'          => $this->hasFormation,
             'formationLabel'        => $this->formationLabel,
             'virtualHolidayMinutes' => $this->virtualHolidayMinutes,
+            'contractNature'        => $this->contractNature,
         ];
     }
 

src/Dto/WorkHours/WeeklyDaySummary.php

@@ -22,5 +22,6 @@ final class WeeklyDaySummary
         public bool $hasDinner = false,
         public bool $hasOvernight = false,
         public int $virtualHolidayMinutes = 0,
+        public ?string $holidayLabel = null,
     ) {}
 }

src/Dto/WorkHours/WeeklySummaryRow.php

@@ -35,5 +35,7 @@ final class WeeklySummaryRow
         public int $weeklyOvernightCount = 0,
         public bool $hasContractForWeek = true,
         public ?string $contractNature = null,
+        public ?string $comment = null,
+        public ?int $commentId = null,
     ) {}
 }

src/Entity/Employee.php

@@ -6,9 +6,11 @@ namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
+use App\Dto\Contracts\ContractPhase;
 use App\Dto\Employees\ContractHistoryItem;
 use App\Enum\ContractNature;
 use App\Repository\EmployeeRepository;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
 use App\State\EmployeeWriteProcessor;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -428,6 +430,43 @@ class Employee
         );
     }
 
+    /**
+     * @return list<array{
+     *   id: int,
+     *   contractType: string,
+     *   weeklyHours: ?int,
+     *   isDriver: bool,
+     *   startDate: string,
+     *   endDate: ?string,
+     *   periodIds: list<int>,
+     *   isCurrent: bool,
+     *   contractNature: string
+     * }>
+     */
+    #[Groups(['employee:read'])]
+    public function getContractPhases(): array
+    {
+        // Read RTT_START_DATE directly here: the entity has no DI but must filter
+        // out contract phases that ended before the application's data start.
+        $rawDate  = $_SERVER['RTT_START_DATE'] ?? $_ENV['RTT_START_DATE'] ?? '';
+        $resolver = new EmployeeContractPhaseResolver(is_string($rawDate) ? $rawDate : '');
+
+        return array_map(
+            static fn (ContractPhase $phase): array => [
+                'id'             => $phase->id,
+                'contractType'   => $phase->contractType->value,
+                'weeklyHours'    => $phase->weeklyHours,
+                'isDriver'       => $phase->isDriver,
+                'startDate'      => $phase->startDate->format('Y-m-d'),
+                'endDate'        => $phase->endDate?->format('Y-m-d'),
+                'periodIds'      => $phase->periodIds,
+                'isCurrent'      => $phase->isCurrent,
+                'contractNature' => $phase->contractNature->value,
+            ],
+            $resolver->resolvePhases($this),
+        );
+    }
+
     private function resolveCurrentContractPeriod(): ?EmployeeContractPeriod
     {
         $today   = new DateTimeImmutable('today');

src/Entity/EmployeeWeekComment.php

@@ -0,0 +1,136 @@
+<?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\EmployeeWeekCommentRepository;
+use App\State\EmployeeWeekCommentWriteProcessor;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
+
+#[ApiResource(
+    operations: [
+        new Get(security: "is_granted('ROLE_ADMIN')"),
+        new GetCollection(security: "is_granted('ROLE_ADMIN')"),
+        new Post(security: "is_granted('ROLE_ADMIN')", processor: EmployeeWeekCommentWriteProcessor::class),
+        new Patch(security: "is_granted('ROLE_ADMIN')", processor: EmployeeWeekCommentWriteProcessor::class),
+        new Delete(security: "is_granted('ROLE_ADMIN')", processor: EmployeeWeekCommentWriteProcessor::class),
+    ],
+    normalizationContext: ['groups' => ['week_comment:read'], 'datetime_format' => 'Y-m-d'],
+    denormalizationContext: ['groups' => ['week_comment:write'], 'datetime_format' => 'Y-m-d'],
+    order: ['weekStartDate' => 'DESC'],
+    paginationEnabled: false,
+)]
+#[ApiFilter(DateFilter::class, properties: ['weekStartDate'])]
+#[ApiFilter(SearchFilter::class, properties: ['employee' => 'exact'])]
+#[ORM\Entity(repositoryClass: EmployeeWeekCommentRepository::class)]
+#[ORM\Table(name: 'employee_week_comments')]
+#[ORM\UniqueConstraint(name: 'uniq_employee_week_comment', columns: ['employee_id', 'week_start_date'])]
+class EmployeeWeekComment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    #[Groups(['week_comment:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: Employee::class)]
+    #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
+    #[Groups(['week_comment:read', 'week_comment:write'])]
+    #[Assert\NotNull]
+    private ?Employee $employee = null;
+
+    #[ORM\Column(type: 'date_immutable')]
+    #[Groups(['week_comment:read', 'week_comment:write'])]
+    #[Assert\NotNull]
+    private ?DateTimeImmutable $weekStartDate = null;
+
+    #[ORM\Column(type: 'text')]
+    #[Groups(['week_comment:read', 'week_comment:write'])]
+    #[Assert\NotBlank]
+    #[Assert\Length(max: 5000)]
+    private string $content = '';
+
+    #[ORM\Column(type: 'datetime_immutable')]
+    #[Groups(['week_comment:read'])]
+    private DateTimeImmutable $createdAt;
+
+    #[ORM\Column(type: 'datetime_immutable')]
+    #[Groups(['week_comment:read'])]
+    private DateTimeImmutable $updatedAt;
+
+    public function __construct()
+    {
+        $now             = new DateTimeImmutable();
+        $this->createdAt = $now;
+        $this->updatedAt = $now;
+    }
+
+    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 getWeekStartDate(): ?DateTimeImmutable
+    {
+        return $this->weekStartDate;
+    }
+
+    public function setWeekStartDate(?DateTimeImmutable $weekStartDate): self
+    {
+        $this->weekStartDate = $weekStartDate;
+
+        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;
+    }
+
+    public function getUpdatedAt(): DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function touchUpdatedAt(): void
+    {
+        $this->updatedAt = new DateTimeImmutable();
+    }
+}

src/Repository/EmployeeWeekCommentRepository.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repository;
+
+use App\Entity\Employee;
+use App\Entity\EmployeeWeekComment;
+use DateTimeImmutable;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<EmployeeWeekComment>
+ */
+class EmployeeWeekCommentRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, EmployeeWeekComment::class);
+    }
+
+    public function findOneByEmployeeAndWeek(Employee $employee, DateTimeImmutable $weekStart): ?EmployeeWeekComment
+    {
+        return $this->findOneBy(['employee' => $employee, 'weekStartDate' => $weekStart]);
+    }
+
+    /**
+     * @param list<Employee> $employees
+     *
+     * @return array<int, EmployeeWeekComment> employee_id → comment
+     */
+    public function findByWeekAndEmployees(DateTimeImmutable $weekStart, array $employees): array
+    {
+        if ([] === $employees) {
+            return [];
+        }
+
+        $rows = $this->createQueryBuilder('c')
+            ->andWhere('c.weekStartDate = :weekStart')
+            ->andWhere('c.employee IN (:employees)')
+            ->setParameter('weekStart', $weekStart)
+            ->setParameter('employees', $employees)
+            ->innerJoin('c.employee', 'e')->addSelect('e')
+            ->getQuery()->getResult()
+        ;
+
+        $map = [];
+        foreach ($rows as $row) {
+            $eid = $row->getEmployee()?->getId();
+            if (null !== $eid) {
+                $map[$eid] = $row;
+            }
+        }
+
+        return $map;
+    }
+}

src/Service/Contracts/EmployeeContractPhaseResolver.php

@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Contracts;
+
+use App\Dto\Contracts\ContractPhase;
+use App\Entity\Employee;
+use App\Entity\EmployeeContractPeriod;
+use DateTimeImmutable;
+use LogicException;
+
+final readonly class EmployeeContractPhaseResolver
+{
+    private ?DateTimeImmutable $dataStartDate;
+
+    public function __construct(string $dataStartDate = '')
+    {
+        $trimmed = trim($dataStartDate);
+        if ('' === $trimmed) {
+            $this->dataStartDate = null;
+
+            return;
+        }
+
+        $parsed              = DateTimeImmutable::createFromFormat('!Y-m-d', $trimmed);
+        $this->dataStartDate = $parsed instanceof DateTimeImmutable ? $parsed : null;
+    }
+
+    /**
+     * @return list<ContractPhase>
+     */
+    public function resolvePhases(Employee $employee): array
+    {
+        $periods = $employee->getContractPeriods()->toArray();
+        usort(
+            $periods,
+            static fn (EmployeeContractPeriod $a, EmployeeContractPeriod $b): int => $a->getStartDate() <=> $b->getStartDate()
+        );
+
+        $today     = new DateTimeImmutable('today');
+        $phases    = [];
+        $group     = [];
+        $signature = null;
+
+        foreach ($periods as $period) {
+            $currentSignature = $this->signature($period);
+            if (null !== $signature && $currentSignature !== $signature) {
+                $phases[] = $this->buildPhase($group, $today);
+                $group    = [];
+            }
+            $group[]   = $period;
+            $signature = $currentSignature;
+        }
+
+        if ([] !== $group) {
+            $phases[] = $this->buildPhase($group, $today);
+        }
+
+        // Hide phases entirely before the application's data start date: no usable
+        // work-hour or absence data exists before that date, so exposing them would
+        // confuse HR (e.g. legacy contract periods predating the software launch).
+        if (null !== $this->dataStartDate) {
+            $dataStart = $this->dataStartDate;
+            $phases    = array_values(array_filter(
+                $phases,
+                static fn (ContractPhase $phase): bool => null === $phase->endDate || $phase->endDate >= $dataStart,
+            ));
+        }
+
+        // Most recent first.
+        return array_reverse($phases);
+    }
+
+    private function signature(EmployeeContractPeriod $period): string
+    {
+        $contract = $period->getContract();
+        $type     = $contract?->getType()->value ?? '';
+        $hours    = $contract?->getWeeklyHours() ?? -1;
+        $driver   = $period->getIsDriver() ? '1' : '0';
+
+        return sprintf('%s|%d|%s', $type, $hours, $driver);
+    }
+
+    /**
+     * @param non-empty-list<EmployeeContractPeriod> $group
+     */
+    private function buildPhase(array $group, DateTimeImmutable $today): ContractPhase
+    {
+        $first = $group[0];
+        $last  = end($group);
+
+        $endDate   = $last->getEndDate();
+        $isCurrent = null === $endDate || $endDate >= $today;
+
+        $contract = $first->getContract();
+
+        return new ContractPhase(
+            id: (int) $first->getId(),
+            contractType: $contract?->getType() ?? throw new LogicException('Phase requires a contract type'),
+            weeklyHours: $contract?->getWeeklyHours(),
+            isDriver: $first->getIsDriver(),
+            startDate: $first->getStartDate(),
+            endDate: $endDate,
+            periodIds: array_map(static fn (EmployeeContractPeriod $p): int => (int) $p->getId(), $group),
+            isCurrent: $isCurrent,
+            contractNature: $first->getContractNatureEnum(),
+        );
+    }
+}

src/Service/Exercise/ExerciseYearResolver.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Exercise;
+
+use DateTimeImmutable;
+
+final readonly class ExerciseYearResolver
+{
+    /**
+     * Convert a date to its leave/RTT exercise year.
+     *
+     * - Forfait: calendar year (Jan→Dec) — returns $date.Y.
+     * - Non-forfait: leave year (Juin N-1 → Mai N) — returns $date.Y+1 if month >= 6, else $date.Y.
+     */
+    public function forDate(DateTimeImmutable $date, bool $isForfait = false): int
+    {
+        if ($isForfait) {
+            return (int) $date->format('Y');
+        }
+
+        return (int) $date->format('n') >= 6
+            ? (int) $date->format('Y') + 1
+            : (int) $date->format('Y');
+    }
+}

src/Service/Leave/LeaveRecapRowBuilder.php

@@ -73,7 +73,7 @@ final readonly class LeaveRecapRowBuilder
                         }
                     }
                     $cpN1Remaining     = round($yearSummary['previousYearRemainingDays'], 2);
-                    $cpN               = (string) round($yearSummary['acquiredDays'], 2);
+                    $cpN               = (string) round($yearSummary['remainingDays'], 2);
                     $acquiredSaturdays = '-';
                 } else {
                     $cpN1Remaining     = round($yearSummary['remainingDays'], 2);

src/Service/Rtt/RttRecoveryComputationService.php

@@ -416,7 +416,14 @@ final readonly class RttRecoveryComputationService
             $isoDay   = (int) new DateTimeImmutable($date)->format('N');
             $contract = $contractsByDate[$date] ?? null;
             $hours    = $contract?->getWeeklyHours();
-            $startHours = (null !== $hours && $hours >= 39) ? 39 : 35;
+            // Days without an active contract (pre-hire, post-termination, contract
+            // gaps) must NOT contribute to the weekly 25% overtime threshold —
+            // otherwise hiring mid-week artificially inflates the threshold and
+            // erases legitimate overtime.
+            if (null === $hours || $hours <= 0) {
+                continue;
+            }
+            $startHours = $hours >= 39 ? 39 : 35;
             $total += $this->resolveDailyReferenceMinutes($startHours, $isoDay);
         }
 

src/Service/WorkHours/YearlyHoursExportBuilder.php

@@ -14,8 +14,10 @@ use App\Enum\TrackingMode;
 use App\Repository\AbsenceRepository;
 use App\Repository\WorkHourRepository;
 use App\Service\Contracts\EmployeeContractResolver;
+use App\Service\PublicHolidayServiceInterface;
 use DateInterval;
 use DateTimeImmutable;
+use Throwable;
 
 class YearlyHoursExportBuilder
 {
@@ -25,6 +27,8 @@ class YearlyHoursExportBuilder
         private EmployeeContractResolver $contractResolver,
         private AbsenceSegmentsResolver $absenceSegmentsResolver,
         private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
+        private PublicHolidayServiceInterface $publicHolidayService,
+        private HolidayVirtualHoursResolver $holidayVirtualHoursResolver,
     ) {}
 
     /**
@@ -56,6 +60,8 @@ class YearlyHoursExportBuilder
         $absences    = $this->absenceRepository->findForPrint($from, $to, $employees);
         $contractMap = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
         $driverMap   = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
+        $workDaysMap = $this->contractResolver->resolveWorkDaysMinutesForEmployeesAndDays($employees, $days);
+        $holidayMap  = $this->buildHolidayMap($from, $to);
 
         $workHourMap = $this->buildWorkHourMap($workHours);
         $absenceMap  = $this->buildAbsenceMap($absences, $days);
@@ -71,6 +77,8 @@ class YearlyHoursExportBuilder
                 $driverMap[$employeeId] ?? [],
                 $workHourMap[$employeeId] ?? [],
                 $absenceData,
+                $workDaysMap[$employeeId] ?? [],
+                $holidayMap,
             );
 
             if ([] === $segments) {
@@ -205,6 +213,9 @@ class YearlyHoursExportBuilder
     }
 
     /**
+     * @param array<string, ?array<int, int>> $workDaysMinutesByDate
+     * @param array<string, string>           $holidayMap
+     *
      * @return list<array{mode: string, contractName: ?string, rows: list<array>}>
      */
     private function buildSegments(
@@ -213,6 +224,8 @@ class YearlyHoursExportBuilder
         array $driverByDate,
         array $workHoursByDate,
         array $absenceData,
+        array $workDaysMinutesByDate,
+        array $holidayMap,
     ): array {
         $segments    = [];
         $currentMode = null;
@@ -222,7 +235,8 @@ class YearlyHoursExportBuilder
         $firstDataDate = null;
         foreach ($days as $date) {
             $hasRow = null !== ($workHoursByDate[$date] ?? null)
-                || ($absenceData['hasDayAbsence'][$date] ?? false);
+                || ($absenceData['hasDayAbsence'][$date] ?? false)
+                || isset($holidayMap[$date]);
             if ($hasRow) {
                 $firstDataDate = $date;
 
@@ -245,10 +259,12 @@ class YearlyHoursExportBuilder
             $isDriver     = $driverByDate[$date] ?? false;
             $wh           = $workHoursByDate[$date] ?? null;
             $hasData      = null !== $wh || ($absenceData['hasDayAbsence'][$date] ?? false);
+            $holidayLabel = $holidayMap[$date] ?? null;
+            $isHoliday    = null !== $holidayLabel;
             $isoDay       = (int) new DateTimeImmutable($date)->format('N');
             $isWeekend    = $isoDay >= 6;
 
-            if (!$hasData && !$isWeekend) {
+            if (!$hasData && !$isWeekend && !$isHoliday) {
                 continue;
             }
 
@@ -275,10 +291,18 @@ class YearlyHoursExportBuilder
 
             $creditedMinutes = $absenceData['credited'][$date] ?? 0;
             $absenceLabel    = $absenceData['labels'][$date] ?? null;
+            $hasAbsence      = $absenceData['hasDayAbsence'][$date] ?? false;
+            $virtualMinutes  = $this->holidayVirtualHoursResolver->resolveVirtualCredit(
+                $contract,
+                new DateTimeImmutable($date),
+                $hasAbsence,
+                $workDaysMinutesByDate[$date] ?? null,
+            );
 
             $row = [
                 'date'         => new DateTimeImmutable($date)->format('d/m/Y'),
                 'absenceLabel' => $absenceLabel,
+                'holidayLabel' => $holidayLabel,
                 'isWeekend'    => $isWeekend,
             ];
 
@@ -297,6 +321,9 @@ class YearlyHoursExportBuilder
                 $nightMin    = $wh?->getNightHoursMinutes() ?? 0;
                 $workshopMin = $wh?->getWorkshopHoursMinutes() ?? 0;
                 $totalMin    = $dayMin + $nightMin + $workshopMin + $creditedMinutes;
+                if ($virtualMinutes > $totalMin) {
+                    $totalMin = $virtualMinutes;
+                }
 
                 $row['dayHours']      = $this->formatMinutes($dayMin);
                 $row['nightHours']    = $this->formatMinutes($nightMin);
@@ -305,6 +332,10 @@ class YearlyHoursExportBuilder
             } else {
                 $metrics = null !== $wh ? $this->computeMetrics($wh) : new WorkMetrics();
                 $metrics->addCreditedMinutes($creditedMinutes);
+                $totalMin = $metrics->totalMinutes;
+                if ($virtualMinutes > $totalMin) {
+                    $totalMin = $virtualMinutes;
+                }
 
                 $row['morningFrom']   = $wh?->getMorningFrom() ?? '';
                 $row['morningTo']     = $wh?->getMorningTo() ?? '';
@@ -312,7 +343,7 @@ class YearlyHoursExportBuilder
                 $row['afternoonTo']   = $wh?->getAfternoonTo() ?? '';
                 $row['eveningFrom']   = $wh?->getEveningFrom() ?? '';
                 $row['eveningTo']     = $wh?->getEveningTo() ?? '';
-                $row['total']         = $this->formatMinutes($metrics->totalMinutes);
+                $row['total']         = $this->formatMinutes($totalMin);
             }
 
             $currentRows[] = $row;
@@ -329,6 +360,29 @@ class YearlyHoursExportBuilder
         return $segments;
     }
 
+    /**
+     * @return array<string, string> Y-m-d => label
+     */
+    private function buildHolidayMap(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        $map       = [];
+        $startYear = (int) $from->format('Y');
+        $endYear   = (int) $to->format('Y');
+
+        try {
+            for ($year = $startYear; $year <= $endYear; ++$year) {
+                $holidays = $this->publicHolidayService->getHolidaysDayByYears('metropole', (string) $year);
+                foreach ($holidays as $date => $label) {
+                    $map[(string) $date] = (string) $label;
+                }
+            }
+        } catch (Throwable) {
+            return [];
+        }
+
+        return $map;
+    }
+
     private function resolveSegmentMode(string $trackingMode, bool $isDriver): string
     {
         if ($isDriver) {

src/State/EmployeeLeaveSummaryProvider.php

@@ -7,6 +7,7 @@ namespace App\State;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use App\ApiResource\EmployeeLeaveSummary;
+use App\Dto\Contracts\ContractPhase;
 use App\Entity\Absence;
 use App\Entity\ContractSuspension;
 use App\Entity\Employee;
@@ -20,6 +21,8 @@ use App\Repository\EmployeeLeaveBalanceRepository;
 use App\Repository\EmployeeRepository;
 use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
 use App\Service\Leave\LeaveBalanceComputationService;
 use App\Service\Leave\LongMaladieService;
 use App\Service\Leave\SuspensionDaysCalculator;
@@ -45,6 +48,8 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     private const float CDI_NON_FORFAIT_4H_SATURDAY_ACCRUAL_PER_MONTH       = 0.0;
     private const float LONG_MALADIE_MONTHLY_ACCRUAL                        = 2.0;
 
+    private ?string $dataStartDate;
+
     public function __construct(
         private Security $security,
         private RequestStack $requestStack,
@@ -58,7 +63,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         private PublicHolidayServiceInterface $publicHolidayService,
         private SuspensionDaysCalculator $suspensionDaysCalculator,
         private WorkHourRepository $workHourRepository,
-    ) {}
+        private EmployeeContractPhaseResolver $phaseResolver,
+        private ExerciseYearResolver $exerciseYearResolver,
+        string $dataStartDate = '',
+    ) {
+        $this->dataStartDate = '' !== $dataStartDate ? $dataStartDate : null;
+    }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): EmployeeLeaveSummary
     {
@@ -81,13 +91,15 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             throw new AccessDeniedHttpException('Employee outside your scope.');
         }
 
-        $year = $this->resolveYear($employee);
+        $phase = $this->resolveTargetPhase($employee);
+        $year  = $this->resolveYear($employee, $phase);
 
         $summary                = new EmployeeLeaveSummary();
         $summary->year          = $year;
         $summary->ruleCode      = LeaveRuleCode::UNSUPPORTED->value;
+        $summary->dataStartDate = $this->dataStartDate;
 
-        $yearSummary = $this->computeYearSummary($employee, $year);
+        $yearSummary = $this->computeYearSummary($employee, $year, 0.0, null, $phase);
         if (null === $yearSummary) {
             return $summary;
         }
@@ -98,7 +110,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         // For forfait contracts, paid days reduce N-1 stock before taken-day attribution.
         // Recompute with paidLeaveDays so taken days shift from N-1 to N when N-1 is consumed by payment.
         if ($paidLeaveDays > 0.0) {
-            $yearSummary = $this->computeYearSummary($employee, $year, $paidLeaveDays);
+            $yearSummary = $this->computeYearSummary($employee, $year, $paidLeaveDays, null, $phase);
             if (null === $yearSummary) {
                 return $summary;
             }
@@ -119,8 +131,29 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $summary->previousYearRemainingDays = $yearSummary['previousYearRemainingDays'];
         $summary->previousYearPaidDays      = $paidLeaveDays;
 
-        [$periodFrom, $periodTo]      = $this->resolvePeriodBounds($employee, $year);
+        [$periodFrom, $periodTo] = $this->resolvePeriodBounds($employee, $year, $phase);
-        $summary->presenceDaysByMonth = $this->computePresenceDaysByMonth($employee, $periodFrom, $periodTo);
+        // Forfait-only: leaves taken from N-1 stock do NOT decrement presence days.
+        // For non-forfait, previousYearTakenDays is always 0, so the budget has no effect.
+        $n1AbsencesBudget             = $yearSummary['previousYearTakenDays'];
+        $summary->presenceDaysByMonth = $this->computePresenceDaysByMonth(
+            $employee,
+            $periodFrom,
+            $periodTo,
+            $n1AbsencesBudget
+        );
+
+        // Same logic as presenceDaysByMonth but bounded at today: number of presence days
+        // accumulated from leave year start up to today (inclusive).
+        $today                        = new DateTimeImmutable('today');
+        $cappedTo                     = $today < $periodTo ? $today : $periodTo;
+        $summary->presenceDaysToToday = $today < $periodFrom
+            ? 0.0
+            : array_sum($this->computePresenceDaysByMonth(
+                $employee,
+                $periodFrom,
+                $cappedTo,
+                $n1AbsencesBudget
+            ));
 
         return $summary;
     }
@@ -140,9 +173,20 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
      *   previousYearRemainingDays: float
      * }
      */
-    public function computeYearSummary(Employee $employee, int $targetYear, float $paidLeaveDays = 0.0, ?DateTimeImmutable $asOfDate = null): ?array
+    public function computeYearSummary(Employee $employee, int $targetYear, float $paidLeaveDays = 0.0, ?DateTimeImmutable $asOfDate = null, ?ContractPhase $phase = null): ?array
     {
-        $firstYear = max($this->resolveFirstComputationYear($employee), $targetYear - 1);
+        // Track whether a phase was provided explicitly. When the caller supplies $phase,
+        // we apply the phase-end cap on period bounds. When we fall back to resolveCurrentPhase
+        // (legacy callers without phase awareness, e.g. LeaveRecapRowBuilder), we preserve
+        // the pre-phase-cap behavior to avoid changing observable results for terminated
+        // employees (the resolved fallback phase would otherwise unduly cap `to`).
+        $applyPhaseEndCap = null !== $phase;
+        $phase ??= $this->resolveCurrentPhase($employee);
+        if (null === $phase) {
+            return null;
+        }
+
+        $firstYear = max($this->resolveFirstComputationYear($employee, $phase), $targetYear - 1);
         if ($targetYear < $firstYear) {
             $targetYear = $firstYear;
         }
@@ -152,8 +196,8 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $targetSummary              = null;
 
         for ($year = $firstYear; $year <= $targetYear; ++$year) {
-            [$from, $to] = $this->resolvePeriodBounds($employee, $year);
+            [$from, $to] = $this->resolvePeriodBounds($employee, $year, $phase, $applyPhaseEndCap);
-            $leavePolicy = $this->resolveLeavePolicy($employee, $from, $to);
+            $leavePolicy = $this->resolveLeavePolicy($employee, $phase, $from, $to);
             if (null === $leavePolicy) {
                 if ($year === $targetYear) {
                     return null;
@@ -197,8 +241,8 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             }
 
             $effectiveAsOfDate     = ($year === $targetYear) ? $asOfDate : null;
-            $accrualCalculationEnd = $this->resolveAccrualCalculationEndDate($leavePolicy['ruleCode'], $year, $to, $employee, $effectiveAsOfDate);
+            $accrualCalculationEnd = $this->resolveAccrualCalculationEndDate($leavePolicy['ruleCode'], $year, $to, $employee, $phase, $effectiveAsOfDate, $applyPhaseEndCap);
-            $takenCalculationEnd   = $this->resolveTakenCalculationEndDate($to, $employee, $effectiveAsOfDate);
+            $takenCalculationEnd   = $this->resolveTakenCalculationEndDate($to, $employee, $phase, $effectiveAsOfDate, $applyPhaseEndCap);
             $suspensions           = $this->suspensionDaysCalculator->applyFirstMonthGrace(
                 $this->resolveSuspensionsForPeriod($employee, $effectiveFrom, $to)
             );
@@ -206,7 +250,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             $longMaladiePeriods         = [];
             $longMaladieReductionFactor = 1.0;
             if (LeaveRuleCode::CDI_CDD_NON_FORFAIT->value === $leavePolicy['ruleCode']
-                && 4 !== $employee->getContract()?->getWeeklyHours()
+                && 4 !== $phase->weeklyHours
                 && null !== $accrualCalculationEnd
             ) {
                 $longMaladiePeriods = $this->longMaladieService->findReducedRatePeriods($employee, $effectiveFrom, $accrualCalculationEnd);
@@ -393,16 +437,29 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $earliest;
     }
 
-    private function resolveYear(Employee $employee): int
+    private function resolveYear(Employee $employee, ContractPhase $phase): int
     {
+        $isForfait       = ContractType::FORFAIT === $phase->contractType;
         $raw             = (string) ($this->requestStack->getCurrentRequest()?->query->get('year') ?? '');
+        $phaseIdRaw      = $this->requestStack->getCurrentRequest()?->query->get('phaseId');
+        $phaseIdProvided = null !== $phaseIdRaw && '' !== (string) $phaseIdRaw;
+
         if ('' === $raw) {
-            $today = new DateTimeImmutable('today');
+            // When a phaseId is explicitly provided, default to the year derived from
-            if (ContractType::FORFAIT === $employee->getContract()?->getType()) {
+            // the phase's end date (or today if the phase is still current).
-                return (int) $today->format('Y');
+            if ($phaseIdProvided) {
+                $reference = $phase->endDate ?? new DateTimeImmutable('today');
+
+                return $isForfait
+                    ? (int) $reference->format('Y')
+                    : $this->resolveCurrentLeaveYear($reference);
             }
 
-            return $this->resolveCurrentLeaveYear($today);
+            $today = new DateTimeImmutable('today');
+
+            return $isForfait
+                ? (int) $today->format('Y')
+                : $this->resolveCurrentLeaveYear($today);
         }
 
         if (!preg_match('/^\d{4}$/', $raw)) {
@@ -414,9 +471,79 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             throw new UnprocessableEntityHttpException('year must be between 2000 and 2100.');
         }
 
+        // When a phaseId is explicit, silently clamp the requested year to the
+        // first/last exercise covered by the phase.
+        if ($phaseIdProvided) {
+            $year = $this->clampYearToPhase($year, $phase, $isForfait);
+        }
+
         return $year;
     }
 
+    private function clampYearToPhase(int $year, ContractPhase $phase, bool $isForfait): int
+    {
+        $firstYear = $this->exerciseYearResolver->forDate($phase->startDate, $isForfait);
+        $lastYear  = $phase->endDate instanceof DateTimeImmutable
+            ? $this->exerciseYearResolver->forDate($phase->endDate, $isForfait)
+            : null;
+
+        if ($year < $firstYear) {
+            return $firstYear;
+        }
+        if (null !== $lastYear && $year > $lastYear) {
+            return $lastYear;
+        }
+
+        return $year;
+    }
+
+    private function resolveTargetPhase(Employee $employee): ContractPhase
+    {
+        $raw    = $this->requestStack->getCurrentRequest()?->query->get('phaseId');
+        $phases = $this->phaseResolver->resolvePhases($employee);
+        if ([] === $phases) {
+            throw new UnprocessableEntityHttpException('Employee has no contract phase.');
+        }
+
+        if (null === $raw || '' === (string) $raw) {
+            // Phase courante par défaut = celle marquée isCurrent ou, à défaut, la plus récente.
+            foreach ($phases as $phase) {
+                if ($phase->isCurrent) {
+                    return $phase;
+                }
+            }
+
+            return $phases[0];
+        }
+
+        if (!preg_match('/^\d+$/', (string) $raw)) {
+            throw new UnprocessableEntityHttpException('phaseId must be a positive integer.');
+        }
+        $phaseId = (int) $raw;
+        foreach ($phases as $phase) {
+            if ($phase->id === $phaseId) {
+                return $phase;
+            }
+        }
+
+        throw new UnprocessableEntityHttpException('phaseId does not match any phase of this employee.');
+    }
+
+    private function resolveCurrentPhase(Employee $employee): ?ContractPhase
+    {
+        $phases = $this->phaseResolver->resolvePhases($employee);
+        if ([] === $phases) {
+            return null;
+        }
+        foreach ($phases as $phase) {
+            if ($phase->isCurrent) {
+                return $phase;
+            }
+        }
+
+        return $phases[0];
+    }
+
     /**
      * @param list<ContractSuspension>                                      $suspensions
      * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $longMaladiePeriods
@@ -491,14 +618,21 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         int $year,
         DateTimeImmutable $periodEnd,
         Employee $employee,
-        ?DateTimeImmutable $asOfDate = null
+        ContractPhase $phase,
+        ?DateTimeImmutable $asOfDate = null,
+        bool $applyPhaseEndCap = true
     ): ?DateTimeImmutable {
         $reference   = $asOfDate ?? new DateTimeImmutable('today');
         $currentYear = LeaveRuleCode::FORFAIT_218->value === $ruleCode
             ? (int) $reference->format('Y')
             : $this->resolveCurrentLeaveYear($reference);
 
-        if ($year < $currentYear) {
+        // When viewing a closed phase explicitly, treat its end date as the reference cutoff:
+        // accrual is bounded to the phase end, never running to "today".
+        // Legacy callers (no explicit phase) skip this cap to preserve pre-phase behavior.
+        if ($applyPhaseEndCap && !$phase->isCurrent && null !== $phase->endDate) {
+            $end = $phase->endDate < $periodEnd ? $phase->endDate : $periodEnd;
+        } elseif ($year < $currentYear) {
             $end = $periodEnd;
         } elseif ($year > $currentYear) {
             $end = null;
@@ -511,7 +645,11 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             $end = $lastDayPreviousMonth < $periodEnd ? $lastDayPreviousMonth : $periodEnd;
         }
 
-        // Cap at contract end date if the employee has left.
+        // Cap at contract end date if the employee has left (only meaningful when
+        // viewing the current phase; closed phases are already capped above).
+        // Legacy callers (no explicit phase) always evaluate this branch to mimic
+        // the pre-phase behavior, which relied on getCurrentContractEndDate().
+        if (!$applyPhaseEndCap || $phase->isCurrent) {
             $contractEndRaw = $employee->getCurrentContractEndDate();
             if (null !== $end && null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
                 $contractEnd = $this->parseYmdDate($contractEndRaw);
@@ -519,6 +657,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     $end = $contractEnd;
                 }
             }
+        }
 
         return $end;
     }
@@ -526,7 +665,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     private function resolveTakenCalculationEndDate(
         DateTimeImmutable $periodEnd,
         Employee $employee,
-        ?DateTimeImmutable $asOfDate = null
+        ContractPhase $phase,
+        ?DateTimeImmutable $asOfDate = null,
+        bool $applyPhaseEndCap = true
     ): ?DateTimeImmutable {
         $end = $periodEnd;
 
@@ -534,7 +675,15 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             $end = $asOfDate;
         }
 
-        // Cap at contract end date if the employee has left.
+        // Closed phase: cap taken-absence accounting at the phase end.
+        // Skip for legacy callers (no explicit phase) to preserve pre-phase behavior.
+        if ($applyPhaseEndCap && !$phase->isCurrent && null !== $phase->endDate && $phase->endDate < $end) {
+            $end = $phase->endDate;
+        }
+
+        // Legacy callers (no explicit phase) always use the live contract end date,
+        // mirroring the pre-phase implementation.
+        if (!$applyPhaseEndCap || $phase->isCurrent) {
             $contractEndRaw = $employee->getCurrentContractEndDate();
             if (null !== $end && null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
                 $contractEnd = $this->parseYmdDate($contractEndRaw);
@@ -542,6 +691,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     $end = $contractEnd;
                 }
             }
+        }
 
         return $end;
     }
@@ -557,9 +707,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
      *   splitSaturdays: bool
      * }
      */
-    private function resolveLeavePolicy(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): ?array
+    private function resolveLeavePolicy(Employee $employee, ContractPhase $phase, DateTimeImmutable $from, DateTimeImmutable $to): ?array
     {
-        $type = $employee->getContract()?->getType();
+        $type = $phase->contractType;
         if (ContractType::FORFAIT === $type) {
             // Business days for forfait must use the RAW holiday list (excluded holidays like
             // "Lundi de Pentecôte" / journée de solidarité still count as non-working days for
@@ -588,12 +738,13 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             ];
         }
 
-        $nature = ContractNature::tryFrom($employee->getCurrentContractNature());
+        // Resolve nature directly from the phase DTO (populated by EmployeeContractPhaseResolver).
+        $nature = $phase->contractNature;
         if (ContractNature::CDI !== $nature && ContractNature::CDD !== $nature) {
             return null;
         }
 
-        $weeklyHours = $employee->getContract()?->getWeeklyHours();
+        $weeklyHours = $phase->weeklyHours;
         if (4 === $weeklyHours) {
             return [
                 'ruleCode'                => LeaveRuleCode::CDI_CDD_NON_FORFAIT->value,
@@ -686,8 +837,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
      *
      * @return array<string, float> YYYY-MM => presence day count
      */
-    private function computePresenceDaysByMonth(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): array
+    private function computePresenceDaysByMonth(
-    {
+        Employee $employee,
+        DateTimeImmutable $from,
+        DateTimeImmutable $to,
+        float $n1AbsencesBudget = 0.0
+    ): array {
         $publicHolidays    = $this->buildPublicHolidayMap($from, $to);
         $weekendWorkedDays = $this->workHourRepository->countWeekendWorkedDaysByMonth($employee, $from, $to);
         $absences          = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $from, $to);
@@ -697,10 +852,20 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             ? $this->workHourRepository->findWorkedDatesAmong($employee, array_keys($publicHolidays))
             : [];
 
+        // Sort absences chronologically so N-1 budget (forfait only) is consumed in date order:
+        // earliest absences attribute to N-1 first, later ones overflow to N and reduce presence.
+        $sortedAbsences = $absences;
+        usort(
+            $sortedAbsences,
+            static fn ($a, $b): int => $a->getStartDate() <=> $b->getStartDate()
+        );
+
+        $remainingN1Budget = $n1AbsencesBudget;
+
         // Count absence days per month, iterating day by day to handle multi-day absences
         // and properly distribute across months.
         $absenceDaysByMonth = [];
-        foreach ($absences as $absence) {
+        foreach ($sortedAbsences as $absence) {
             $start = DateTimeImmutable::createFromInterface($absence->getStartDate())->setTime(0, 0);
             $end   = DateTimeImmutable::createFromInterface($absence->getEndDate())->setTime(0, 0);
 
@@ -718,6 +883,17 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     continue;
                 }
 
+                // Forfait: leaves taken from N-1 stock do NOT decrement presence days.
+                // We chronologically consume the N-1 budget before counting any absence.
+                if ($remainingN1Budget > 0.0) {
+                    $consumed = min($remainingN1Budget, $dayAmount);
+                    $remainingN1Budget -= $consumed;
+                    $dayAmount -= $consumed;
+                    if ($dayAmount <= 0.0) {
+                        continue;
+                    }
+                }
+
                 $absenceDaysByMonth[$monthKey] = ($absenceDaysByMonth[$monthKey] ?? 0.0) + $dayAmount;
             }
         }
@@ -763,13 +939,33 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     /**
      * @return array{DateTimeImmutable, DateTimeImmutable}
      */
-    private function resolvePeriodBounds(Employee $employee, int $year): array
+    private function resolvePeriodBounds(Employee $employee, int $year, ContractPhase $phase, bool $applyPhaseEndCap = true): array
     {
-        if (ContractType::FORFAIT === $employee->getContract()?->getType()) {
+        if (ContractType::FORFAIT === $phase->contractType) {
-            return $this->resolveForfaitYearBounds($employee, $year);
+            [$from, $to] = $this->resolveForfaitYearBounds($employee, $year, $phase);
+
+            // For FORFAIT, cap from at phase.startDate: the 218-day FORFAIT accrual
+            // is calendar-year scoped and only counts the FORFAIT portion of the year.
+            if ($phase->startDate > $from) {
+                $from = $phase->startDate;
+            }
+        } else {
+            [$from, $to] = $this->resolveLeavePeriodBounds($year);
+
+            // For non-forfait, do NOT cap from at phase.startDate: CP accrual is
+            // annual (Juin→Mai) and continuous across signature changes within the
+            // same leave rule (e.g. 35h → 39h, driver flag flip, weeklyHours bump).
+            // The contract-entry-date cap is handled by resolveEffectivePeriodStart().
         }
 
-        return $this->resolveLeavePeriodBounds($year);
+        // End cap applies to both modes. Skipped when the phase was not explicitly
+        // provided (legacy callers) to preserve pre-phase-cap behavior for
+        // terminated employees.
+        if ($applyPhaseEndCap && null !== $phase->endDate && $phase->endDate < $to) {
+            $to = $phase->endDate;
+        }
+
+        return [$from, $to];
     }
 
     /**
@@ -787,11 +983,15 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     /**
      * @return array{DateTimeImmutable, DateTimeImmutable}
      */
-    private function resolveForfaitYearBounds(Employee $employee, int $year): array
+    private function resolveForfaitYearBounds(Employee $employee, int $year, ContractPhase $phase): array
     {
         $from = new DateTimeImmutable(sprintf('%d-01-01 00:00:00', $year));
         $to   = new DateTimeImmutable(sprintf('%d-12-31 00:00:00', $year));
 
+        // When viewing the current phase, prefer the live "current contract" dates
+        // for backward compat with existing tests/usage. Closed phases rely on the
+        // generic cap applied in resolvePeriodBounds().
+        if ($phase->isCurrent) {
             $contractStartRaw = $employee->getCurrentContractStartDate();
             if (null !== $contractStartRaw && '' !== trim($contractStartRaw)) {
                 $contractStart = $this->parseYmdDate($contractStartRaw);
@@ -807,6 +1007,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     $to = $contractEnd;
                 }
             }
+        }
 
         return [$from, $to];
     }
@@ -826,16 +1027,19 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $month >= 6 ? $year + 1 : $year;
     }
 
-    private function resolveFirstComputationYear(Employee $employee): int
+    private function resolveFirstComputationYear(Employee $employee, ContractPhase $phase): int
     {
-        $isForfait    = ContractType::FORFAIT === $employee->getContract()?->getType();
+        $isForfait    = ContractType::FORFAIT === $phase->contractType;
         $fallbackYear = $isForfait
             ? (int) new DateTimeImmutable('today')->format('Y')
             : $this->resolveCurrentLeaveYear(new DateTimeImmutable('today'));
 
+        // Do not go before the exercice containing $phase->startDate.
+        $phaseFirstYear = $this->exerciseYearResolver->forDate($phase->startDate, $isForfait);
+
         $history = $employee->getContractHistory();
         if ([] === $history) {
-            return $fallbackYear;
+            return max($phaseFirstYear, $fallbackYear);
         }
 
         $oldestStartDate = null;
@@ -851,22 +1055,19 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
         if (null === $oldestStartDate) {
             $oldestBalanceYear = $this->leaveBalanceRepository->findEarliestYearForEmployee($employee);
+            $candidate         = null === $oldestBalanceYear ? $fallbackYear : min($fallbackYear, $oldestBalanceYear);
 
-            return null === $oldestBalanceYear ? $fallbackYear : min($fallbackYear, $oldestBalanceYear);
+            return max($phaseFirstYear, $candidate);
         }
 
-        $firstYear = $isForfait
+        $firstYear = $this->exerciseYearResolver->forDate($oldestStartDate, $isForfait);
-            ? (int) $oldestStartDate->format('Y')
-            : ((int) $oldestStartDate->format('n') >= 6
-                ? (int) $oldestStartDate->format('Y') + 1
-                : (int) $oldestStartDate->format('Y'));
 
         $oldestBalanceYear = $this->leaveBalanceRepository->findEarliestYearForEmployee($employee);
         if (null !== $oldestBalanceYear && $oldestBalanceYear < $firstYear) {
-            return $oldestBalanceYear;
+            $firstYear = $oldestBalanceYear;
         }
 
-        return $firstYear;
+        return max($phaseFirstYear, $firstYear);
     }
 
     private function parseYmdDate(string $value): ?DateTimeImmutable

src/State/EmployeeRttPaymentProcessor.php

@@ -12,8 +12,10 @@ use App\Entity\EmployeeRttPayment;
 use App\Repository\EmployeeRepository;
 use App\Repository\EmployeeRttPaymentRepository;
 use App\Service\AuditLogger;
-use DateTimeImmutable;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
 use Doctrine\ORM\EntityManagerInterface;
+use Psr\Clock\ClockInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
@@ -24,6 +26,9 @@ final readonly class EmployeeRttPaymentProcessor implements ProcessorInterface
         private EmployeeRttPaymentRepository $rttPaymentRepository,
         private EntityManagerInterface $entityManager,
         private AuditLogger $auditLogger,
+        private EmployeeContractPhaseResolver $phaseResolver,
+        private ClockInterface $clock,
+        private ExerciseYearResolver $exerciseYearResolver,
     ) {}
 
     public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): EmployeeRttPaymentInput
@@ -48,6 +53,8 @@ final readonly class EmployeeRttPaymentProcessor implements ProcessorInterface
 
         $year = $data->year ?? $this->resolveCurrentExerciseYear();
 
+        $this->assertYearAllowedForPayment($employee, $year);
+
         $payment = $this->rttPaymentRepository->findOneByEmployeeYearMonth($employee, $year, $data->month);
 
         if (null === $payment) {
@@ -83,10 +90,33 @@ final readonly class EmployeeRttPaymentProcessor implements ProcessorInterface
 
     private function resolveCurrentExerciseYear(): int
     {
-        $today = new DateTimeImmutable('today');
+        return $this->exerciseYearResolver->forDate($this->clock->now());
-        $year  = (int) $today->format('Y');
+    }
-        $month = (int) $today->format('n');
 
-        return $month >= 6 ? $year + 1 : $year;
+    /**
+     * Allow payment when the requested exercise is either the current one
+     * or the last exercise of a closed contract phase (the one containing
+     * the phase end date). Reject any other exercise (past or future).
+     */
+    private function assertYearAllowedForPayment(Employee $employee, int $year): void
+    {
+        $currentExerciseYear = $this->resolveCurrentExerciseYear();
+        if ($year === $currentExerciseYear) {
+            return;
+        }
+
+        $phases = $this->phaseResolver->resolvePhases($employee);
+        foreach ($phases as $phase) {
+            if ($phase->isCurrent || null === $phase->endDate) {
+                continue;
+            }
+            if ($year === $this->exerciseYearResolver->forDate($phase->endDate)) {
+                return;
+            }
+        }
+
+        throw new UnprocessableEntityHttpException(
+            'RTT payment is only allowed on the current exercise or the last exercise of a closed contract phase.'
+        );
     }
 }

src/State/EmployeeRttSummaryProvider.php

@@ -7,6 +7,7 @@ namespace App\State;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use App\ApiResource\EmployeeRttSummary;
+use App\Dto\Contracts\ContractPhase;
 use App\Dto\Rtt\EmployeeRttWeekSummary;
 use App\Dto\Rtt\RttMonthPayment;
 use App\Dto\Rtt\WeekRecoveryDetail;
@@ -17,6 +18,8 @@ use App\Repository\EmployeeRttBalanceRepository;
 use App\Repository\EmployeeRttPaymentRepository;
 use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
 use App\Service\Rtt\RttRecoveryComputationService;
 use DateTimeImmutable;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -38,6 +41,8 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
         private EmployeeRttPaymentRepository $rttPaymentRepository,
         private RttRecoveryComputationService $rttRecoveryService,
         private WorkHourRepository $workHourRepository,
+        private EmployeeContractPhaseResolver $phaseResolver,
+        private ExerciseYearResolver $exerciseYearResolver,
         string $rttStartDate = '',
     ) {
         $this->rttStartDate = '' !== $rttStartDate ? $rttStartDate : null;
@@ -64,10 +69,23 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             throw new AccessDeniedHttpException('Employee outside your scope.');
         }
 
-        $year                    = $this->resolveYear();
+        $phase                   = $this->resolveTargetPhase($employee);
+        $year                    = $this->resolveYear($phase);
         $today                   = new DateTimeImmutable('today');
         $currentExerciseYear     = $this->resolveCurrentExerciseYear($today);
         [$periodFrom, $periodTo] = $this->rttRecoveryService->resolveExerciseBounds($year);
+
+        // Cap periodTo at the phase endDate for closed phases so the RTT table does
+        // not extend past the date the phase ended.
+        // Do NOT cap periodFrom at phase.startDate: keep the full exercise
+        // displayed so weeks before the employee's hire (or before a past phase
+        // started) appear at 0, matching the previous behavior. Weeks outside the
+        // contract range contribute 0 minutes to the cumul naturally (no contract
+        // ⇒ no reference, no worked hours).
+        if (!$phase->isCurrent && null !== $phase->endDate && $phase->endDate < $periodTo) {
+            $periodTo = $phase->endDate;
+        }
+
         $weeks      = $this->rttRecoveryService->buildWeeksForExercise($periodFrom, $periodTo);
         $weekRanges = array_map(
             static fn (array $week): array => [
@@ -96,6 +114,12 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             }
         }
 
+        // For a closed phase: cap the week-computation limit at the phase end date,
+        // so weeks beyond the phase are not counted.
+        if (!$phase->isCurrent && null !== $phase->endDate && $phase->endDate < $limitDate) {
+            $limitDate = $phase->endDate;
+        }
+
         $currentByWeekStart   = $this->rttRecoveryService->computeRecoveryByWeek($employee, $weekRanges, $periodFrom, $periodTo, $limitDate);
         [$carry, $carryMonth] = $this->resolveCarry($employee, $year);
 
@@ -110,13 +134,10 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
         $summary->currentYearRecoveryMinutes   = array_sum(array_map(static fn ($d) => $d->totalMinutes, $currentByWeekStart));
         $summary->availableMinutes             = $summary->carryFromPreviousYearMinutes + $summary->currentYearRecoveryMinutes;
 
-        // Pass rttStartDate only if it falls within this exercise
+        // Always expose rttStartDate so the frontend can use it as a hard floor
-        if (null !== $this->rttStartDate) {
+        // for the year selector. Frontend already uses month-level comparison
-            $startDate = new DateTimeImmutable($this->rttStartDate);
+        // to hide carry/report rows when the date is outside the exercise.
-            if ($startDate >= $periodFrom && $startDate <= $periodTo) {
         $summary->rttStartDate = $this->rttStartDate;
-            }
-        }
         $summary->weeks        = $this->buildWeekSummaries($weekRanges, $currentByWeekStart, $periodFrom, $periodTo);
 
         // Post-process: distribute deficit weeks across cumulative balance (50% first, then 25%)
@@ -164,6 +185,18 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             $monthBuckets[$m]['bonus50'] += $payment->getBonus50Minutes();
         }
 
+        $runningCumul = $summary->carryFromPreviousYearMinutes;
+        $prevMonth    = null;
+        foreach ($summary->weeks as $week) {
+            if (null !== $prevMonth && $week->month !== $prevMonth && isset($monthBuckets[$prevMonth])) {
+                $b = $monthBuckets[$prevMonth];
+                $runningCumul -= $b['base25'] + $b['bonus25'] + $b['base50'] + $b['bonus50'];
+            }
+            $runningCumul += $week->totalMinutes;
+            $week->cumulativeBalanceMinutes = $runningCumul;
+            $prevMonth                      = $week->month;
+        }
+
         $monthPayments    = [];
         $totalPaidMinutes = 0;
 
@@ -204,10 +237,21 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
         ];
     }
 
-    private function resolveYear(): int
+    private function resolveYear(ContractPhase $phase): int
     {
         $raw             = (string) ($this->requestStack->getCurrentRequest()?->query->get('year') ?? '');
+        $phaseIdRaw      = $this->requestStack->getCurrentRequest()?->query->get('phaseId');
+        $phaseIdProvided = null !== $phaseIdRaw && '' !== (string) $phaseIdRaw;
+
         if ('' === $raw) {
+            // When a phaseId is explicitly provided, default to the exercise year derived from
+            // the phase's end date (or today if the phase is still current).
+            if ($phaseIdProvided) {
+                $reference = $phase->endDate ?? new DateTimeImmutable('today');
+
+                return $this->resolveCurrentExerciseYear($reference);
+            }
+
             return $this->resolveCurrentExerciseYear(new DateTimeImmutable('today'));
         }
         if (!preg_match('/^\d{4}$/', $raw)) {
@@ -219,9 +263,64 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             throw new UnprocessableEntityHttpException('year must be between 2000 and 2100.');
         }
 
+        // When a phaseId is explicit, silently clamp the requested year to the
+        // first/last exercise covered by the phase.
+        if ($phaseIdProvided) {
+            $year = $this->clampYearToPhase($year, $phase);
+        }
+
         return $year;
     }
 
+    private function clampYearToPhase(int $year, ContractPhase $phase): int
+    {
+        $firstYear = $this->exerciseYearResolver->forDate($phase->startDate);
+        $lastYear  = $phase->endDate instanceof DateTimeImmutable
+            ? $this->exerciseYearResolver->forDate($phase->endDate)
+            : null;
+
+        if ($year < $firstYear) {
+            return $firstYear;
+        }
+        if (null !== $lastYear && $year > $lastYear) {
+            return $lastYear;
+        }
+
+        return $year;
+    }
+
+    private function resolveTargetPhase(Employee $employee): ContractPhase
+    {
+        $raw    = $this->requestStack->getCurrentRequest()?->query->get('phaseId');
+        $phases = $this->phaseResolver->resolvePhases($employee);
+        if ([] === $phases) {
+            throw new UnprocessableEntityHttpException('Employee has no contract phase.');
+        }
+
+        if (null === $raw || '' === (string) $raw) {
+            // Phase courante par défaut = celle marquée isCurrent ou, à défaut, la plus récente.
+            foreach ($phases as $phase) {
+                if ($phase->isCurrent) {
+                    return $phase;
+                }
+            }
+
+            return $phases[0];
+        }
+
+        if (!preg_match('/^\d+$/', (string) $raw)) {
+            throw new UnprocessableEntityHttpException('phaseId must be a positive integer.');
+        }
+        $phaseId = (int) $raw;
+        foreach ($phases as $phase) {
+            if ($phase->id === $phaseId) {
+                return $phase;
+            }
+        }
+
+        throw new UnprocessableEntityHttpException('phaseId does not match any phase of this employee.');
+    }
+
     private function resolveCurrentExerciseYear(DateTimeImmutable $today): int
     {
         $year  = (int) $today->format('Y');

src/State/EmployeeWeekCommentWriteProcessor.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\DeleteOperationInterface;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use App\Entity\Employee;
+use App\Entity\EmployeeWeekComment;
+use App\Service\AuditLogger;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+final readonly class EmployeeWeekCommentWriteProcessor implements ProcessorInterface
+{
+    public function __construct(
+        #[Autowire(service: 'api_platform.doctrine.orm.state.persist_processor')]
+        private ProcessorInterface $persistProcessor,
+        #[Autowire(service: 'api_platform.doctrine.orm.state.remove_processor')]
+        private ProcessorInterface $removeProcessor,
+        private EntityManagerInterface $entityManager,
+        private AuditLogger $auditLogger,
+    ) {}
+
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): mixed
+    {
+        if (!$data instanceof EmployeeWeekComment) {
+            return $data;
+        }
+
+        $employee = $data->getEmployee();
+
+        if ($operation instanceof DeleteOperationInterface) {
+            $this->auditLogger->log(
+                $employee,
+                'delete',
+                'week_comment',
+                $data->getId(),
+                sprintf('Commentaire semaine supprimé pour %s (semaine du %s)', $this->label($employee), $data->getWeekStartDate()?->format('d/m/Y') ?? '?'),
+                ['old' => ['content' => $data->getContent()]],
+                $data->getWeekStartDate(),
+            );
+            $result = $this->removeProcessor->process($data, $operation, $uriVariables, $context);
+            $this->entityManager->flush();
+
+            return $result;
+        }
+
+        $weekStart = $data->getWeekStartDate();
+        if (null === $weekStart || '1' !== $weekStart->format('N')) {
+            throw new UnprocessableEntityHttpException('weekStartDate must be a Monday (ISO weekday 1).');
+        }
+
+        $prev = null;
+        if (null !== $data->getId()) {
+            $prev = $this->entityManager->getUnitOfWork()->getOriginalEntityData($data)['content'] ?? null;
+            $data->touchUpdatedAt();
+        }
+
+        $result = $this->persistProcessor->process($data, $operation, $uriVariables, $context);
+
+        if (null === $prev) {
+            $this->auditLogger->log($employee, 'create', 'week_comment', $data->getId(), sprintf('Commentaire semaine créé pour %s (semaine du %s)', $this->label($employee), $weekStart->format('d/m/Y')), ['new' => ['content' => $data->getContent()]], $weekStart);
+        } elseif ($prev !== $data->getContent()) {
+            $this->auditLogger->log($employee, 'update', 'week_comment', $data->getId(), sprintf('Commentaire semaine modifié pour %s (semaine du %s)', $this->label($employee), $weekStart->format('d/m/Y')), ['old' => ['content' => $prev], 'new' => ['content' => $data->getContent()]], $weekStart);
+        }
+
+        $this->entityManager->flush();
+
+        return $result;
+    }
+
+    private function label(mixed $e): string
+    {
+        return $e instanceof Employee ? trim(($e->getLastName() ?? '').' '.($e->getFirstName() ?? '')) : '?';
+    }
+}

src/State/SalaryRecapPrintProvider.php

@@ -363,7 +363,10 @@ class SalaryRecapPrintProvider implements ProviderInterface
                 if ($wh->getHasBreakfast()) {
                     ++$driverBreakfast;
                 }
-                if ($wh->getHasLunch() || $wh->getHasDinner()) {
+                if ($wh->getHasLunch()) {
+                    ++$driverMeals;
+                }
+                if ($wh->getHasDinner()) {
                     ++$driverMeals;
                 }
                 if ($wh->getHasOvernight()) {

src/State/WorkHourDayContextProvider.php

@@ -59,11 +59,15 @@ final readonly class WorkHourDayContextProvider implements ProviderInterface
             // On initialise toutes les lignes, même sans absence ce jour-là.
             $contract        = $this->contractResolver->resolveForEmployeeAndDate($employee, $workDate);
             $workDaysMinutes = $this->contractResolver->resolveWorkDaysMinutesForEmployeeAndDate($employee, $workDate);
+            $contractNature  = null !== $contract
+                ? $this->contractResolver->resolveNatureForEmployeeAndDate($employee, $workDate)->value
+                : null;
             $rowsByEmployeeId[$employeeId] = new DayContextRow(
                 employeeId: $employeeId,
                 hasContractAtDate: null !== $contract,
                 isDriverContract: $this->contractResolver->resolveIsDriverForEmployeeAndDate($employee, $workDate),
                 virtualHolidayMinutes: $this->holidayVirtualHoursResolver->resolveVirtualCredit($contract, $workDate, false, $workDaysMinutes),
+                contractNature: $contractNature,
             );
         }
 

src/State/WorkHourWeeklySummaryProvider.php

@@ -13,6 +13,7 @@ use App\Dto\WorkHours\WorkMetrics;
 use App\Entity\Absence;
 use App\Entity\Contract;
 use App\Entity\Employee;
+use App\Entity\EmployeeWeekComment;
 use App\Entity\User;
 use App\Entity\WorkHour;
 use App\Enum\ContractNature;
@@ -21,7 +22,9 @@ use App\Enum\TrackingMode;
 use App\Repository\Contract\AbsenceReadRepositoryInterface;
 use App\Repository\Contract\EmployeeScopedRepositoryInterface;
 use App\Repository\Contract\WorkHourReadRepositoryInterface;
+use App\Repository\EmployeeWeekCommentRepository;
 use App\Service\Contracts\EmployeeContractResolver;
+use App\Service\PublicHolidayServiceInterface;
 use App\Service\WorkHours\AbsenceSegmentsResolver;
 use App\Service\WorkHours\DailyReferenceMinutesResolver;
 use App\Service\WorkHours\HolidayVirtualHoursResolver;
@@ -31,6 +34,7 @@ use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+use Throwable;
 
 final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
 {
@@ -45,6 +49,8 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
         private EmployeeContractResolver $contractResolver,
         private DailyReferenceMinutesResolver $dailyReferenceResolver,
         private HolidayVirtualHoursResolver $holidayVirtualHoursResolver,
+        private PublicHolidayServiceInterface $publicHolidayService,
+        private EmployeeWeekCommentRepository $weekCommentRepository,
     ) {}
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): WorkHourWeeklySummary
@@ -62,11 +68,13 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
         $workHours = $this->workHourRepository->findByDateRangeAndEmployees($weekStart, $weekEnd, $employees);
         $absences  = $this->absenceRepository->findForPrint($weekStart, $weekEnd, $employees);
 
+        $weekComments = $this->weekCommentRepository->findByWeekAndEmployees($weekStart, $employees);
+
         $summary            = new WorkHourWeeklySummary();
         $summary->weekStart = $weekStart->format('Y-m-d');
         $summary->weekEnd   = $weekEnd->format('Y-m-d');
         $summary->days      = $days;
-        $summary->rows      = $this->buildRows($employees, $workHours, $absences, $days, $anchorDate->format('Y-m-d'));
+        $summary->rows      = $this->buildRows($employees, $workHours, $absences, $days, $anchorDate->format('Y-m-d'), $weekComments);
 
         return $summary;
     }
@@ -113,15 +121,17 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
      * @param list<WorkHour>                  $workHours
      * @param list<Absence>                   $absences
      * @param list<string>                    $days
+     * @param array<int, EmployeeWeekComment> $weekComments
      *
      * @return list<WeeklySummaryRow>
      */
-    private function buildRows(array $employees, array $workHours, array $absences, array $days, string $anchorDateYmd): array
+    private function buildRows(array $employees, array $workHours, array $absences, array $days, string $anchorDateYmd, array $weekComments = []): array
     {
         $contractsByEmployeeDate       = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
         $contractNaturesByEmployeeDate = $this->contractResolver->resolveNaturesForEmployeesAndDays($employees, $days);
         $isDriverByEmployeeDate        = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
         $workDaysByEmployeeDate        = $this->contractResolver->resolveWorkDaysMinutesForEmployeesAndDays($employees, $days);
+        $holidayLabelsByDate           = $this->buildHolidayLabelsForDays($days);
         $metricsByEmployeeDate         = [];
         foreach ($workHours as $workHour) {
             $employeeId = $workHour->getEmployee()?->getId();
@@ -324,6 +334,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                     hasDinner: $hasDinner,
                     hasOvernight: $hasOvernight,
                     virtualHolidayMinutes: $virtualHolidayMinutes,
+                    holidayLabel: $holidayLabelsByDate[$date] ?? null,
                 );
             }
 
@@ -370,12 +381,46 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                 weeklyOvernightCount: $weeklyOvernightCount,
                 hasContractForWeek: $hasContractForWeek,
                 contractNature: $weekAnchorContractNature->value,
+                comment: ($weekComments[$employeeId] ?? null)?->getContent(),
+                commentId: ($weekComments[$employeeId] ?? null)?->getId(),
             );
         }
 
         return $rows;
     }
 
+    /**
+     * @param list<string> $days
+     *
+     * @return array<string, string>
+     */
+    private function buildHolidayLabelsForDays(array $days): array
+    {
+        if ([] === $days) {
+            return [];
+        }
+
+        $years = [];
+        foreach ($days as $day) {
+            $years[substr($day, 0, 4)] = true;
+        }
+
+        $map = [];
+
+        try {
+            foreach (array_keys($years) as $year) {
+                $holidays = $this->publicHolidayService->getHolidaysDayByYears('metropole', (string) $year);
+                foreach ($holidays as $date => $label) {
+                    $map[(string) $date] = (string) $label;
+                }
+            }
+        } catch (Throwable) {
+            return [];
+        }
+
+        return $map;
+    }
+
     private function computeMetrics(WorkHour $workHour): WorkMetrics
     {
         $ranges = [

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

@@ -76,11 +76,14 @@
         td { font-size: 9px; }
         td.date { text-align: left; font-weight: bold; }
         td.absence { text-align: left; color: #c00; }
+        td.absence .holiday { color: #0277bd; font-weight: 600; }
+        td.absence .holiday.with-absence { display: block; }
         td.time { text-align: center; }
         td.presence { text-align: center; }
         td.total { text-align: center; font-weight: bold; }
         tr.weekend td { background: #f3f3f3; color: #555; }
         tr.weekend td.date { color: #333; }
+        tr.holiday td { background: #e1f5fe; }
 
         .signature-footer {
             page-break-inside: avoid;
@@ -165,9 +168,12 @@
                 </thead>
                 <tbody>
                     {% for row in segment.rows %}
-                        <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                             <td class="date">{{ row.date }}</td>
-                            <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                            <td class="absence">
+                                {{ row.absenceLabel ?? '' }}
+                                {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                            </td>
                             <td class="presence">{{ row.presentMorning ? 'X' : '' }}</td>
                             <td class="presence">{{ row.presentAfternoon ? 'X' : '' }}</td>
                             <td class="total">{{ row.total }}</td>
@@ -189,9 +195,12 @@
                 </thead>
                 <tbody>
                     {% for row in segment.rows %}
-                        <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                             <td class="date">{{ row.date }}</td>
-                            <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                            <td class="absence">
+                                {{ row.absenceLabel ?? '' }}
+                                {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                            </td>
                             <td class="time">{{ row.dayHours }}</td>
                             <td class="time">{{ row.nightHours }}</td>
                             <td class="time">{{ row.workshopHours }}</td>
@@ -217,9 +226,12 @@
                 </thead>
                 <tbody>
                     {% for row in segment.rows %}
-                        <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                             <td class="date">{{ row.date }}</td>
-                            <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                            <td class="absence">
+                                {{ row.absenceLabel ?? '' }}
+                                {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                            </td>
                             <td class="time">{{ row.morningFrom }}</td>
                             <td class="time">{{ row.morningTo }}</td>
                             <td class="time">{{ row.afternoonFrom }}</td>

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

@@ -65,11 +65,14 @@
         td { font-size: 9px; }
         td.date { text-align: left; font-weight: bold; }
         td.absence { text-align: left; color: #c00; }
+        td.absence .holiday { color: #0277bd; font-weight: 600; }
+        td.absence .holiday.with-absence { display: block; }
         td.time { text-align: center; }
         td.presence { text-align: center; }
         td.total { text-align: center; font-weight: bold; }
         tr.weekend td { background: #f3f3f3; color: #555; }
         tr.weekend td.date { color: #333; }
+        tr.holiday td { background: #e1f5fe; }
 
         .signature-footer {
             page-break-inside: avoid;
@@ -151,9 +154,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                    <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                         <td class="date">{{ row.date }}</td>
-                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="absence">
+                            {{ row.absenceLabel ?? '' }}
+                            {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                        </td>
                         <td class="presence">{{ row.presentMorning ? 'X' : '' }}</td>
                         <td class="presence">{{ row.presentAfternoon ? 'X' : '' }}</td>
                         <td class="total">{{ row.total }}</td>
@@ -175,9 +181,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                    <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                         <td class="date">{{ row.date }}</td>
-                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="absence">
+                            {{ row.absenceLabel ?? '' }}
+                            {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                        </td>
                         <td class="time">{{ row.dayHours }}</td>
                         <td class="time">{{ row.nightHours }}</td>
                         <td class="time">{{ row.workshopHours }}</td>
@@ -203,9 +212,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr class="{{ row.isWeekend ? 'weekend' : '' }}">
+                    <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
                         <td class="date">{{ row.date }}</td>
-                        <td class="absence">{{ row.absenceLabel ?? '' }}</td>
+                        <td class="absence">
+                            {{ row.absenceLabel ?? '' }}
+                            {% if row.holidayLabel %}<span class="holiday {{ row.absenceLabel ? 'with-absence' : '' }}">Férié : {{ row.holidayLabel }}</span>{% endif %}
+                        </td>
                         <td class="time">{{ row.morningFrom }}</td>
                         <td class="time">{{ row.morningTo }}</td>
                         <td class="time">{{ row.afternoonFrom }}</td>

tests/Service/Contracts/EmployeeContractPhaseResolverTest.php

@@ -0,0 +1,196 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Service\Contracts;
+
+use App\Entity\Contract;
+use App\Entity\Employee;
+use App\Entity\EmployeeContractPeriod;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use App\Enum\TrackingMode;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
+
+/**
+ * @internal
+ */
+final class EmployeeContractPhaseResolverTest extends TestCase
+{
+    public function testSinglePeriodYieldsSinglePhaseMarkedCurrent(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2020-06-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(1, $phases);
+        self::assertSame(ContractType::H39, $phases[0]->contractType);
+        self::assertTrue($phases[0]->isCurrent);
+        self::assertNull($phases[0]->endDate);
+        self::assertSame(ContractNature::CDI, $phases[0]->contractNature);
+    }
+
+    public function testThreeConsecutivePeriodsSameSignatureCollapseIntoSinglePhase(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2020-06-01', 'end' => '2021-05-31'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2021-06-01', 'end' => '2022-05-31'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2022-06-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(1, $phases);
+        self::assertCount(3, $phases[0]->periodIds);
+        self::assertSame('2020-06-01', $phases[0]->startDate->format('Y-m-d'));
+        self::assertNull($phases[0]->endDate);
+    }
+
+    public function testSwitchFromH39ToForfaitProducesTwoPhasesMostRecentFirst(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2020-06-01', 'end' => '2026-04-30'],
+            ['type' => ContractType::FORFAIT, 'hours' => 39, 'driver' => false, 'start' => '2026-05-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+        self::assertSame(ContractType::FORFAIT, $phases[0]->contractType);
+        self::assertTrue($phases[0]->isCurrent);
+        self::assertSame(ContractType::H39, $phases[1]->contractType);
+        self::assertFalse($phases[1]->isCurrent);
+        self::assertSame('2026-04-30', $phases[1]->endDate?->format('Y-m-d'));
+    }
+
+    public function testInterimBetweenTwoH39PeriodsBreaksThePhases(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2020-06-01', 'end' => '2023-12-31'],
+            ['type' => ContractType::INTERIM, 'hours' => null, 'driver' => false, 'start' => '2024-01-01', 'end' => '2024-04-30'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2024-05-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(3, $phases);
+        self::assertSame(ContractType::H39, $phases[0]->contractType);
+        self::assertSame(ContractType::INTERIM, $phases[1]->contractType);
+        self::assertSame(ContractType::H39, $phases[2]->contractType);
+    }
+
+    public function testCustomPhasesSplitOnWeeklyHoursChange(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::CUSTOM, 'hours' => 28, 'driver' => false, 'start' => '2024-01-01', 'end' => '2024-12-31'],
+            ['type' => ContractType::CUSTOM, 'hours' => 30, 'driver' => false, 'start' => '2025-01-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+        self::assertSame(30, $phases[0]->weeklyHours);
+        self::assertSame(28, $phases[1]->weeklyHours);
+    }
+
+    public function testPhasesSplitOnIsDriverChange(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => false, 'start' => '2023-01-01', 'end' => '2024-12-31'],
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => true, 'start' => '2025-01-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+        self::assertTrue($phases[0]->isDriver);
+        self::assertFalse($phases[1]->isDriver);
+    }
+
+    public function testPhasesEntirelyBeforeDataStartDateAreFilteredOut(): void
+    {
+        // H35 phase ends before 2026-02-23 → must be hidden; H39 phase spans the date → kept.
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => false, 'start' => '2014-07-01', 'end' => '2025-10-31'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2025-11-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver('2026-02-23')->resolvePhases($employee);
+
+        self::assertCount(1, $phases);
+        self::assertSame(ContractType::H39, $phases[0]->contractType);
+    }
+
+    public function testPhaseEndingExactlyOnDataStartDateIsKept(): void
+    {
+        // Edge case: a phase whose endDate equals the data start date is kept
+        // (the inequality is `>= $dataStart`, not strict).
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => false, 'start' => '2020-01-01', 'end' => '2026-02-23'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2026-02-24', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver('2026-02-23')->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+    }
+
+    public function testNoFilteringWhenDataStartDateIsEmpty(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => false, 'start' => '2014-07-01', 'end' => '2020-12-31'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2021-01-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+    }
+
+    public function testInvalidDataStartDateStringIsTreatedAsNull(): void
+    {
+        $employee = $this->buildEmployee([
+            ['type' => ContractType::H35, 'hours' => 35, 'driver' => false, 'start' => '2014-07-01', 'end' => '2020-12-31'],
+            ['type' => ContractType::H39, 'hours' => 39, 'driver' => false, 'start' => '2021-01-01', 'end' => null],
+        ]);
+
+        $phases = new EmployeeContractPhaseResolver('not-a-date')->resolvePhases($employee);
+
+        self::assertCount(2, $phases);
+    }
+
+    /**
+     * @param list<array{type: ContractType, hours: ?int, driver: bool, start: string, end: ?string}> $periodsSpec
+     */
+    private function buildEmployee(array $periodsSpec): Employee
+    {
+        $employee = new Employee();
+        $id       = 0;
+        foreach ($periodsSpec as $spec) {
+            $contract = new Contract();
+            $contract->setName($spec['type']->value);
+            $contract->setTrackingMode(
+                ContractType::FORFAIT === $spec['type'] ? TrackingMode::PRESENCE->value : TrackingMode::TIME->value
+            );
+            $contract->setWeeklyHours($spec['hours']);
+
+            $period     = new EmployeeContractPeriod();
+            $reflection = new ReflectionProperty(EmployeeContractPeriod::class, 'id');
+            $reflection->setValue($period, ++$id);
+            $period->setEmployee($employee);
+            $period->setContract($contract);
+            $period->setStartDate(new DateTimeImmutable($spec['start']));
+            $period->setEndDate(null !== $spec['end'] ? new DateTimeImmutable($spec['end']) : null);
+            $period->setContractNature(ContractNature::CDI);
+            $period->setIsDriver($spec['driver']);
+            $employee->getContractPeriods()->add($period);
+        }
+
+        return $employee;
+    }
+}

tests/Service/Exercise/ExerciseYearResolverTest.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Service\Exercise;
+
+use App\Service\Exercise\ExerciseYearResolver;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ */
+final class ExerciseYearResolverTest extends TestCase
+{
+    public function testNonForfaitJuneMapsToNextYear(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        self::assertSame(2026, $resolver->forDate(new DateTimeImmutable('2025-06-01')));
+        self::assertSame(2026, $resolver->forDate(new DateTimeImmutable('2025-06-30')));
+    }
+
+    public function testNonForfaitMayMapsToSameYear(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-05-01')));
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-05-31')));
+    }
+
+    public function testNonForfaitDecemberMapsToNextYear(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        self::assertSame(2026, $resolver->forDate(new DateTimeImmutable('2025-12-31')));
+    }
+
+    public function testNonForfaitJanuaryMapsToSameYear(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-01-15')));
+    }
+
+    public function testForfaitReturnsCalendarYearRegardlessOfMonth(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-01-15'), true));
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-06-01'), true));
+        self::assertSame(2025, $resolver->forDate(new DateTimeImmutable('2025-12-31'), true));
+    }
+
+    public function testForfaitFlagDefaultsToFalse(): void
+    {
+        $resolver = new ExerciseYearResolver();
+
+        // June without explicit flag must follow non-forfait rule (year + 1).
+        self::assertSame(2026, $resolver->forDate(new DateTimeImmutable('2025-06-01')));
+    }
+}

tests/State/EmployeeLeaveSummaryProviderTest.php

@@ -4,16 +4,33 @@ declare(strict_types=1);
 
 namespace App\Tests\State;
 
+use App\Dto\Contracts\ContractPhase;
+use App\Entity\Contract;
+use App\Entity\Employee;
+use App\Entity\EmployeeContractPeriod;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use App\Enum\TrackingMode;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
 use App\State\EmployeeLeaveSummaryProvider;
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use ReflectionProperty;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 /**
  * @internal
  */
 final class EmployeeLeaveSummaryProviderTest extends TestCase
 {
+    // -----------------------------------------------------------------------
+    // Existing tests (unchanged) — verify accrual prorating arithmetic.
+    // -----------------------------------------------------------------------
+
     public function testComputeAccruedDaysFromStartProratesPartialFirstMonth(): void
     {
         $provider = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->newInstanceWithoutConstructor();
@@ -68,4 +85,393 @@ final class EmployeeLeaveSummaryProviderTest extends TestCase
 
         self::assertEqualsWithDelta(25.0 / 12.0, $result, 0.0001);
     }
+
+    // -----------------------------------------------------------------------
+    // Phase resolution tests (Task 3 — phaseId support).
+    // The repository / service dependencies are typed against final classes
+    // which PHPUnit cannot double, so phase resolution is exercised via
+    // reflection on private methods to avoid instantiating the full DI graph.
+    // -----------------------------------------------------------------------
+
+    public function testResolveTargetPhasePicksH39PhaseFromPhaseId(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1]; // oldest = 39h
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id]);
+        $resolved = $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+
+        self::assertInstanceOf(ContractPhase::class, $resolved);
+        self::assertSame($h39Phase->id, $resolved->id);
+        self::assertSame(ContractType::H39, $resolved->contractType);
+        self::assertFalse($resolved->isCurrent);
+    }
+
+    public function testResolveTargetPhaseDefaultsToCurrentPhaseWhenPhaseIdAbsent(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0]; // most recent = FORFAIT
+
+        $provider = $this->buildProvider([]);
+        $resolved = $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+
+        self::assertSame($currentPhase->id, $resolved->id);
+        self::assertSame(ContractType::FORFAIT, $resolved->contractType);
+        self::assertTrue($resolved->isCurrent);
+    }
+
+    public function testPastH39PhaseAppliesNonForfaitRuleCodeEvenWhenCurrentIsForfait(): void
+    {
+        // Verifies resolveLeavePolicy uses the phase's contractType (not the current contract).
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider    = $this->buildProvider(['phaseId' => (string) $h39Phase->id]);
+        $from        = new DateTimeImmutable('2025-06-01');
+        $to          = new DateTimeImmutable('2026-04-30');
+        $leavePolicy = $this->invokePrivate($provider, 'resolveLeavePolicy', $employee, $h39Phase, $from, $to);
+
+        self::assertNotNull($leavePolicy);
+        self::assertSame('CDI_CDD_NON_FORFAIT', $leavePolicy['ruleCode']);
+        self::assertSame(25.0, $leavePolicy['acquiredDays']);
+        self::assertEqualsWithDelta(25.0 / 12.0, $leavePolicy['accrualPerMonth'], 0.0001);
+    }
+
+    public function testResolvePeriodBoundsCapsAtPhaseEndDate(): void
+    {
+        // 39h phase (June 2020 → April 30 2026). Exercise 2026 spans June 2025 → May 31 2026.
+        // The phase cap should clip the upper bound to April 30 2026.
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider    = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2026']);
+        [$from, $to] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2026, $h39Phase);
+
+        self::assertSame('2025-06-01', $from->format('Y-m-d'));
+        self::assertSame('2026-04-30', $to->format('Y-m-d'));
+    }
+
+    public function testTransitionExerciseOnH39PhaseAccruesAround22Point9Days(): void
+    {
+        // 11 full months of accrual at 25/12 ≈ 22.917 days.
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2026']);
+        $method   = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->getMethod('computeAccruedDaysFromStart');
+
+        // Period bounds for exercise 2026 on H39 phase = June 1 2025 → April 30 2026.
+        [$from, $to] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2026, $h39Phase);
+        $acquired    = $method->invoke($provider, 25.0, 25.0 / 12.0, $from, $to);
+
+        self::assertEqualsWithDelta(22.92, $acquired, 0.1);
+    }
+
+    public function testNonForfaitPhaseStartingMidExerciseUsesFullExerciseFromAsStart(): void
+    {
+        // Scenario: 35h CDI from 2014-07-01 to 2025-10-31, then 39h CDI from 2025-11-01.
+        // Both phases are non-forfait (same leave rule CDI_CDD_NON_FORFAIT).
+        // Viewing exercise 2026 on the current 39h phase, accrual must run from the
+        // exercise start (June 1, 2025), NOT from the phase start (November 1, 2025).
+        // Otherwise the 5 months of June-October under 35h would be lost from the
+        // annual CP accrual, which is wrong (CP exercise is annual, not per-phase).
+        $employee = $this->buildH35ToH39Transition('2014-07-01', '2025-10-31', '2025-11-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[0]; // current
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2026']);
+
+        [$from, $to] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2026, $h39Phase);
+
+        self::assertSame('2025-06-01', $from->format('Y-m-d'));
+        self::assertSame('2026-05-31', $to->format('Y-m-d'));
+    }
+
+    public function testForfaitPhaseStartingMidYearCapsFromAtPhaseStart(): void
+    {
+        // Scenario: 39h CDI ends 2026-04-30, FORFAIT from 2026-05-01.
+        // Viewing year 2026 on the FORFAIT phase, the period must be capped at
+        // phase start (May 1) so that only the FORFAIT portion of the calendar
+        // year is counted.
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $forfaitPhase = $phases[0]; // current FORFAIT
+
+        $provider = $this->buildProvider(['phaseId' => (string) $forfaitPhase->id, 'year' => '2026']);
+
+        [$from, $to] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2026, $forfaitPhase);
+
+        self::assertSame('2026-05-01', $from->format('Y-m-d'));
+        self::assertSame('2026-12-31', $to->format('Y-m-d'));
+    }
+
+    public function testYearOutsidePhaseRangeIsSilentlyClampedToPhaseLastExercise(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2030']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $employee, $h39Phase);
+
+        self::assertSame(2026, $year);
+    }
+
+    public function testYearBeforePhaseIsClampedToPhaseFirstExercise(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        // Phase starts 2020-06-01 → first exercise (non-forfait) = 2021 (since month >=6 = year+1).
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2010']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $employee, $h39Phase);
+
+        self::assertSame(2021, $year);
+    }
+
+    public function testInvalidPhaseIdReturns422(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $provider = $this->buildProvider(['phaseId' => '99999']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+    }
+
+    public function testNonNumericPhaseIdReturns422(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $provider = $this->buildProvider(['phaseId' => 'abc']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+    }
+
+    public function testDefaultYearForPhaseIdOnClosedPhaseUsesPhaseEndDate(): void
+    {
+        // No `year` param + explicit phaseId → default year is derived from $phase->endDate.
+        // H39 phase ends 2026-04-30 → non-forfait exercise containing that date = 2026.
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id]);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $employee, $h39Phase);
+
+        self::assertSame(2026, $year);
+    }
+
+    public function testNoQueryParamsKeepsLegacyYearDefaulting(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0];
+
+        $provider = $this->buildProvider([]);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $employee, $currentPhase);
+
+        // Today is 2026-05-19, FORFAIT phase → year is the current calendar year (2026).
+        self::assertSame(2026, $year);
+    }
+
+    // -----------------------------------------------------------------------
+    // Regression: terminated-employee path through `computeYearSummary` without
+    // an explicit phase (legacy callers: LeaveRecapRowBuilder,
+    // DumpVerificationSnapshotCommand). Before the phase-aware refactor, the
+    // period bounds were NOT capped at the contract end for terminated
+    // employees (because Employee::getCurrentContractEndDate() returns null
+    // when no period covers "today"). The new code resolves a fallback phase
+    // whose `isCurrent` is false, which would otherwise cap `to` at the phase
+    // end — a behavior change for legacy callers. The flag `applyPhaseEndCap`
+    // toggles this cap so legacy callers get the pre-refactor behavior.
+    // -----------------------------------------------------------------------
+
+    public function testTerminatedEmployeeWithoutExplicitPhaseSkipsPhaseEndCap(): void
+    {
+        // Terminated employee: H39 phase ending 2024-12-31 (well in the past).
+        $employee = $this->buildTerminatedEmployee('2020-06-01', '2024-12-31');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        self::assertCount(1, $phases);
+        $phase = $phases[0];
+        self::assertFalse($phase->isCurrent, 'Sanity: terminated phase must not be flagged as current.');
+
+        $provider = $this->buildProvider([]);
+
+        // applyPhaseEndCap=false → mimics legacy callers (no explicit phase):
+        // the upper bound MUST stay at the natural leave-year end (May 31).
+        [$fromLegacy, $toLegacy] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2025, $phase, false);
+        self::assertSame('2024-06-01', $fromLegacy->format('Y-m-d'));
+        self::assertSame('2025-05-31', $toLegacy->format('Y-m-d'));
+
+        // applyPhaseEndCap=true → explicit-phase callers get the cap at phase end.
+        [$fromCap, $toCap] = $this->invokePrivate($provider, 'resolvePeriodBounds', $employee, 2025, $phase, true);
+        self::assertSame('2024-06-01', $fromCap->format('Y-m-d'));
+        self::assertSame('2024-12-31', $toCap->format('Y-m-d'));
+    }
+
+    // -----------------------------------------------------------------------
+    // Test harness helpers.
+    // -----------------------------------------------------------------------
+
+    /**
+     * Build a terminated-employee fixture: a single H39 period ending before today.
+     */
+    private function buildTerminatedEmployee(string $start, string $end): Employee
+    {
+        $employee = new Employee();
+        $this->setEntityId($employee, 2);
+
+        $contract = new Contract();
+        $contract->setName('39H');
+        $contract->setTrackingMode(TrackingMode::TIME->value);
+        $contract->setWeeklyHours(39);
+
+        $period = new EmployeeContractPeriod();
+        $this->setEntityId($period, 10);
+        $period->setEmployee($employee);
+        $period->setContract($contract);
+        $period->setStartDate(new DateTimeImmutable($start));
+        $period->setEndDate(new DateTimeImmutable($end));
+        $period->setContractNature(ContractNature::CDI);
+        $period->setIsDriver(false);
+
+        $employee->getContractPeriods()->add($period);
+
+        return $employee;
+    }
+
+    /**
+     * Build a two-period employee transitioning from H39 to FORFAIT.
+     */
+    private function buildH35ToH39Transition(string $h35Start, string $h35End, string $h39Start): Employee
+    {
+        $employee = new Employee();
+        $this->setEntityId($employee, 1);
+
+        $h35Contract = new Contract();
+        $h35Contract->setName('35H');
+        $h35Contract->setTrackingMode(TrackingMode::TIME->value);
+        $h35Contract->setWeeklyHours(35);
+
+        $h39Contract = new Contract();
+        $h39Contract->setName('39H');
+        $h39Contract->setTrackingMode(TrackingMode::TIME->value);
+        $h39Contract->setWeeklyHours(39);
+
+        $h35Period = new EmployeeContractPeriod();
+        $this->setEntityId($h35Period, 1);
+        $h35Period->setEmployee($employee);
+        $h35Period->setContract($h35Contract);
+        $h35Period->setStartDate(new DateTimeImmutable($h35Start));
+        $h35Period->setEndDate(new DateTimeImmutable($h35End));
+        $h35Period->setContractNature(ContractNature::CDI);
+        $h35Period->setIsDriver(false);
+
+        $h39Period = new EmployeeContractPeriod();
+        $this->setEntityId($h39Period, 2);
+        $h39Period->setEmployee($employee);
+        $h39Period->setContract($h39Contract);
+        $h39Period->setStartDate(new DateTimeImmutable($h39Start));
+        $h39Period->setEndDate(null);
+        $h39Period->setContractNature(ContractNature::CDI);
+        $h39Period->setIsDriver(false);
+
+        $employee->getContractPeriods()->add($h35Period);
+        $employee->getContractPeriods()->add($h39Period);
+
+        return $employee;
+    }
+
+    private function buildEmployeeWithTransition(string $h39Start, string $h39End, string $forfaitStart): Employee
+    {
+        $employee = new Employee();
+        $this->setEntityId($employee, 1);
+
+        $h39Contract = new Contract();
+        $h39Contract->setName('39H');
+        $h39Contract->setTrackingMode(TrackingMode::TIME->value);
+        $h39Contract->setWeeklyHours(39);
+
+        $forfaitContract = new Contract();
+        $forfaitContract->setName('Forfait');
+        $forfaitContract->setTrackingMode(TrackingMode::PRESENCE->value);
+        $forfaitContract->setWeeklyHours(null);
+
+        $h39Period = new EmployeeContractPeriod();
+        $this->setEntityId($h39Period, 1);
+        $h39Period->setEmployee($employee);
+        $h39Period->setContract($h39Contract);
+        $h39Period->setStartDate(new DateTimeImmutable($h39Start));
+        $h39Period->setEndDate(new DateTimeImmutable($h39End));
+        $h39Period->setContractNature(ContractNature::CDI);
+        $h39Period->setIsDriver(false);
+
+        $forfaitPeriod = new EmployeeContractPeriod();
+        $this->setEntityId($forfaitPeriod, 2);
+        $forfaitPeriod->setEmployee($employee);
+        $forfaitPeriod->setContract($forfaitContract);
+        $forfaitPeriod->setStartDate(new DateTimeImmutable($forfaitStart));
+        $forfaitPeriod->setEndDate(null);
+        $forfaitPeriod->setContractNature(ContractNature::CDI);
+        $forfaitPeriod->setIsDriver(false);
+
+        $employee->getContractPeriods()->add($h39Period);
+        $employee->getContractPeriods()->add($forfaitPeriod);
+
+        return $employee;
+    }
+
+    /**
+     * Build an uninitialized provider with a RequestStack pre-loaded with the given query.
+     *
+     * The provider's repository/service dependencies are typed against final classes
+     * (EmployeeRepository, LeaveBalanceComputationService, etc.) which PHPUnit cannot
+     * double. We bypass full instantiation by using newInstanceWithoutConstructor and
+     * only setting the properties that the tested private methods actually read:
+     * `requestStack` and `phaseResolver`. Tests targeting heavier code paths exercise
+     * private methods directly (resolveTargetPhase, resolvePeriodBounds, etc.).
+     *
+     * @param array<string, string> $request query parameters (year, phaseId, ...)
+     */
+    private function buildProvider(array $request = []): EmployeeLeaveSummaryProvider
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request(query: $request));
+
+        $reflection = new ReflectionClass(EmployeeLeaveSummaryProvider::class);
+        $provider   = $reflection->newInstanceWithoutConstructor();
+
+        $this->setReadonlyProperty($provider, 'requestStack', $requestStack);
+        $this->setReadonlyProperty($provider, 'phaseResolver', new EmployeeContractPhaseResolver());
+        $this->setReadonlyProperty($provider, 'exerciseYearResolver', new ExerciseYearResolver());
+        $this->setReadonlyProperty($provider, 'dataStartDate', null);
+
+        return $provider;
+    }
+
+    private function invokePrivate(object $obj, string $method, mixed ...$args): mixed
+    {
+        $reflection = new ReflectionClass($obj::class);
+        $m          = $reflection->getMethod($method);
+
+        return $m->invoke($obj, ...$args);
+    }
+
+    private function setReadonlyProperty(object $obj, string $property, mixed $value): void
+    {
+        $reflection = new ReflectionProperty($obj::class, $property);
+        $reflection->setValue($obj, $value);
+    }
+
+    private function setEntityId(object $entity, int $id): void
+    {
+        $reflection = new ReflectionProperty($entity::class, 'id');
+        $reflection->setValue($entity, $id);
+    }
 }

tests/State/EmployeeRttPaymentProcessorTest.php

@@ -0,0 +1,169 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\State;
+
+use App\Entity\Contract;
+use App\Entity\Employee;
+use App\Entity\EmployeeContractPeriod;
+use App\Enum\ContractNature;
+use App\Enum\TrackingMode;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
+use App\State\EmployeeRttPaymentProcessor;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use Psr\Clock\ClockInterface;
+use ReflectionClass;
+use ReflectionProperty;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+/**
+ * @internal
+ *
+ * Exercises the year-acceptance guard of EmployeeRttPaymentProcessor.
+ *
+ * The processor depends on final repositories (EmployeeRepository,
+ * EmployeeRttPaymentRepository) which PHPUnit cannot double. The guard logic
+ * lives in a private helper (assertYearAllowedForPayment) tested directly via
+ * reflection — same pattern used in EmployeeRttSummaryProviderTest.
+ */
+final class EmployeeRttPaymentProcessorTest extends TestCase
+{
+    public function testPaymentAllowedOnCurrentExercise(): void
+    {
+        // Today = 2026-05-19 (env clock) → current exercise = 2026.
+        $employee  = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $processor = $this->buildProcessorWithClock(new DateTimeImmutable('2026-05-19'));
+
+        $this->invokePrivate($processor, 'assertYearAllowedForPayment', $employee, 2026);
+
+        // No exception → guard accepts current exercise.
+        self::assertTrue(true);
+    }
+
+    public function testPaymentAllowedOnLastExerciseOfClosedPhase(): void
+    {
+        // Phase 39h closed 2026-04-30, FORFAIT from 2026-05-01.
+        // Exercise 2026 (Juin 2025 → Mai 2026) contains the H39 phase end date.
+        // Payment must be allowed on exercise 2026 even when current exercise is 2027.
+        $employee  = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $processor = $this->buildProcessorWithClock(new DateTimeImmutable('2027-01-15'));
+
+        $this->invokePrivate($processor, 'assertYearAllowedForPayment', $employee, 2026);
+
+        self::assertTrue(true);
+    }
+
+    public function testPaymentRejectedOnEarlierExerciseOfClosedPhase(): void
+    {
+        $employee  = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $processor = $this->buildProcessorWithClock(new DateTimeImmutable('2027-01-15'));
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($processor, 'assertYearAllowedForPayment', $employee, 2024);
+    }
+
+    public function testPaymentRejectedOnFutureExercise(): void
+    {
+        $employee  = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $processor = $this->buildProcessorWithClock(new DateTimeImmutable('2026-05-19'));
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($processor, 'assertYearAllowedForPayment', $employee, 2030);
+    }
+
+    // -----------------------------------------------------------------------
+    // Test harness helpers.
+    // -----------------------------------------------------------------------
+
+    /**
+     * Build a two-period employee transitioning from H39 to FORFAIT.
+     */
+    private function buildEmployeeWithTransition(string $h39Start, string $h39End, string $forfaitStart): Employee
+    {
+        $employee = new Employee();
+        $this->setEntityId($employee, 1);
+
+        $h39Contract = new Contract();
+        $h39Contract->setName('39H');
+        $h39Contract->setTrackingMode(TrackingMode::TIME->value);
+        $h39Contract->setWeeklyHours(39);
+
+        $forfaitContract = new Contract();
+        $forfaitContract->setName('Forfait');
+        $forfaitContract->setTrackingMode(TrackingMode::PRESENCE->value);
+        $forfaitContract->setWeeklyHours(null);
+
+        $h39Period = new EmployeeContractPeriod();
+        $this->setEntityId($h39Period, 1);
+        $h39Period->setEmployee($employee);
+        $h39Period->setContract($h39Contract);
+        $h39Period->setStartDate(new DateTimeImmutable($h39Start));
+        $h39Period->setEndDate(new DateTimeImmutable($h39End));
+        $h39Period->setContractNature(ContractNature::CDI);
+        $h39Period->setIsDriver(false);
+
+        $forfaitPeriod = new EmployeeContractPeriod();
+        $this->setEntityId($forfaitPeriod, 2);
+        $forfaitPeriod->setEmployee($employee);
+        $forfaitPeriod->setContract($forfaitContract);
+        $forfaitPeriod->setStartDate(new DateTimeImmutable($forfaitStart));
+        $forfaitPeriod->setEndDate(null);
+        $forfaitPeriod->setContractNature(ContractNature::CDI);
+        $forfaitPeriod->setIsDriver(false);
+
+        $employee->getContractPeriods()->add($h39Period);
+        $employee->getContractPeriods()->add($forfaitPeriod);
+
+        return $employee;
+    }
+
+    /**
+     * Build an uninitialized processor with a fixed clock. The repositories are
+     * declared on final classes that PHPUnit cannot double, so we bypass full
+     * instantiation via newInstanceWithoutConstructor and only seed the
+     * properties the tested private guard reads: phaseResolver + clock.
+     */
+    private function buildProcessorWithClock(DateTimeImmutable $today): EmployeeRttPaymentProcessor
+    {
+        $reflection = new ReflectionClass(EmployeeRttPaymentProcessor::class);
+        $processor  = $reflection->newInstanceWithoutConstructor();
+
+        $clock = new readonly class($today) implements ClockInterface {
+            public function __construct(private DateTimeImmutable $now) {}
+
+            public function now(): DateTimeImmutable
+            {
+                return $this->now;
+            }
+        };
+
+        $this->setReadonlyProperty($processor, 'phaseResolver', new EmployeeContractPhaseResolver());
+        $this->setReadonlyProperty($processor, 'clock', $clock);
+        $this->setReadonlyProperty($processor, 'exerciseYearResolver', new ExerciseYearResolver());
+
+        return $processor;
+    }
+
+    private function invokePrivate(object $obj, string $method, mixed ...$args): mixed
+    {
+        $reflection = new ReflectionClass($obj::class);
+        $m          = $reflection->getMethod($method);
+
+        return $m->invoke($obj, ...$args);
+    }
+
+    private function setReadonlyProperty(object $obj, string $property, mixed $value): void
+    {
+        $reflection = new ReflectionProperty($obj::class, $property);
+        $reflection->setValue($obj, $value);
+    }
+
+    private function setEntityId(object $entity, int $id): void
+    {
+        $reflection = new ReflectionProperty($entity::class, 'id');
+        $reflection->setValue($entity, $id);
+    }
+}

tests/State/EmployeeRttSummaryProviderTest.php

@@ -0,0 +1,293 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\State;
+
+use App\Dto\Contracts\ContractPhase;
+use App\Entity\Contract;
+use App\Entity\Employee;
+use App\Entity\EmployeeContractPeriod;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use App\Enum\TrackingMode;
+use App\Service\Contracts\EmployeeContractPhaseResolver;
+use App\Service\Exercise\ExerciseYearResolver;
+use App\State\EmployeeRttSummaryProvider;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use ReflectionProperty;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+/**
+ * @internal
+ */
+final class EmployeeRttSummaryProviderTest extends TestCase
+{
+    // -----------------------------------------------------------------------
+    // Phase resolution tests (Task 4 — phaseId support).
+    // The repository / service dependencies are typed against final classes
+    // which PHPUnit cannot double, so phase resolution is exercised via
+    // reflection on private methods to avoid instantiating the full DI graph.
+    // -----------------------------------------------------------------------
+
+    public function testResolveTargetPhasePicksH39PhaseFromPhaseId(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1]; // oldest = 39h
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id]);
+        $resolved = $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+
+        self::assertInstanceOf(ContractPhase::class, $resolved);
+        self::assertSame($h39Phase->id, $resolved->id);
+        self::assertSame(ContractType::H39, $resolved->contractType);
+        self::assertFalse($resolved->isCurrent);
+    }
+
+    public function testResolveTargetPhaseDefaultsToCurrentPhaseWhenPhaseIdAbsent(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0]; // most recent = FORFAIT
+
+        $provider = $this->buildProvider([]);
+        $resolved = $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+
+        self::assertSame($currentPhase->id, $resolved->id);
+        self::assertTrue($resolved->isCurrent);
+    }
+
+    public function testPastH39PhaseRttSummaryIsCappedAtPhaseEndDate(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2026']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $h39Phase);
+
+        self::assertSame(2026, $year);
+
+        // The phase-cap branch in provide() narrows periodTo to the phase end date.
+        // Reproduce that logic to validate the resulting window.
+        $periodFrom = new DateTimeImmutable('2025-06-01');
+        $periodTo   = new DateTimeImmutable('2026-05-31');
+
+        if (!$h39Phase->isCurrent && null !== $h39Phase->endDate && $h39Phase->endDate < $periodTo) {
+            $periodTo = $h39Phase->endDate;
+        }
+        if ($h39Phase->startDate > $periodFrom) {
+            $periodFrom = $h39Phase->startDate;
+        }
+
+        self::assertSame('2025-06-01', $periodFrom->format('Y-m-d'));
+        self::assertSame('2026-04-30', $periodTo->format('Y-m-d'));
+    }
+
+    public function testYearOutsidePhaseRangeIsSilentlyClampedToPhaseLastExercise(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2030']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $h39Phase);
+
+        // Phase ends 2026-04-30 → exercice (Juin-Mai) containing it = 2026.
+        self::assertSame(2026, $year);
+    }
+
+    public function testYearBeforePhaseIsClampedToPhaseFirstExercise(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        // Phase starts 2020-06-01 → first exercise (Juin-Mai) = 2021.
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id, 'year' => '2010']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $h39Phase);
+
+        self::assertSame(2021, $year);
+    }
+
+    public function testInvalidPhaseIdReturns422(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $provider = $this->buildProvider(['phaseId' => '99999']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+    }
+
+    public function testNonNumericPhaseIdReturns422(): void
+    {
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $provider = $this->buildProvider(['phaseId' => 'abc']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveTargetPhase', $employee);
+    }
+
+    public function testDefaultYearForPhaseIdOnClosedPhaseUsesPhaseEndDate(): void
+    {
+        // No `year` param + explicit phaseId → default year is derived from $phase->endDate.
+        // H39 phase ends 2026-04-30 → RTT exercise containing that date = 2026.
+        $employee = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases   = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $h39Phase = $phases[1];
+
+        $provider = $this->buildProvider(['phaseId' => (string) $h39Phase->id]);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $h39Phase);
+
+        self::assertSame(2026, $year);
+    }
+
+    public function testNoQueryParamsKeepsLegacyYearDefaulting(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0];
+
+        $provider = $this->buildProvider([]);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $currentPhase);
+
+        // Today is 2026-05-19 → current RTT exercise (Juin N-1 → Mai N) = 2026.
+        self::assertSame(2026, $year);
+    }
+
+    public function testInvalidYearFormatReturns422(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0];
+
+        $provider = $this->buildProvider(['year' => '20XX']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveYear', $currentPhase);
+    }
+
+    public function testYearOutsideBoundsReturns422(): void
+    {
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0];
+
+        $provider = $this->buildProvider(['year' => '1900']);
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->invokePrivate($provider, 'resolveYear', $currentPhase);
+    }
+
+    public function testYearWithoutPhaseIdIsNotClamped(): void
+    {
+        // No `phaseId` → legacy callers must keep their requested year as-is,
+        // even if it falls outside the current phase range.
+        $employee     = $this->buildEmployeeWithTransition('2020-06-01', '2026-04-30', '2026-05-01');
+        $phases       = new EmployeeContractPhaseResolver()->resolvePhases($employee);
+        $currentPhase = $phases[0];
+
+        $provider = $this->buildProvider(['year' => '2030']);
+        $year     = $this->invokePrivate($provider, 'resolveYear', $currentPhase);
+
+        self::assertSame(2030, $year);
+    }
+
+    // -----------------------------------------------------------------------
+    // Test harness helpers.
+    // -----------------------------------------------------------------------
+
+    /**
+     * Build a two-period employee transitioning from H39 to FORFAIT.
+     */
+    private function buildEmployeeWithTransition(string $h39Start, string $h39End, string $forfaitStart): Employee
+    {
+        $employee = new Employee();
+        $this->setEntityId($employee, 1);
+
+        $h39Contract = new Contract();
+        $h39Contract->setName('39H');
+        $h39Contract->setTrackingMode(TrackingMode::TIME->value);
+        $h39Contract->setWeeklyHours(39);
+
+        $forfaitContract = new Contract();
+        $forfaitContract->setName('Forfait');
+        $forfaitContract->setTrackingMode(TrackingMode::PRESENCE->value);
+        $forfaitContract->setWeeklyHours(null);
+
+        $h39Period = new EmployeeContractPeriod();
+        $this->setEntityId($h39Period, 1);
+        $h39Period->setEmployee($employee);
+        $h39Period->setContract($h39Contract);
+        $h39Period->setStartDate(new DateTimeImmutable($h39Start));
+        $h39Period->setEndDate(new DateTimeImmutable($h39End));
+        $h39Period->setContractNature(ContractNature::CDI);
+        $h39Period->setIsDriver(false);
+
+        $forfaitPeriod = new EmployeeContractPeriod();
+        $this->setEntityId($forfaitPeriod, 2);
+        $forfaitPeriod->setEmployee($employee);
+        $forfaitPeriod->setContract($forfaitContract);
+        $forfaitPeriod->setStartDate(new DateTimeImmutable($forfaitStart));
+        $forfaitPeriod->setEndDate(null);
+        $forfaitPeriod->setContractNature(ContractNature::CDI);
+        $forfaitPeriod->setIsDriver(false);
+
+        $employee->getContractPeriods()->add($h39Period);
+        $employee->getContractPeriods()->add($forfaitPeriod);
+
+        return $employee;
+    }
+
+    /**
+     * Build an uninitialized provider with a RequestStack pre-loaded with the given query.
+     *
+     * The provider's repository/service dependencies are typed against final classes
+     * (EmployeeRepository, RttRecoveryComputationService, etc.) which PHPUnit cannot
+     * double. We bypass full instantiation by using newInstanceWithoutConstructor and
+     * only setting the properties that the tested private methods actually read:
+     * `requestStack` and `phaseResolver`.
+     *
+     * @param array<string, string> $request query parameters (year, phaseId, ...)
+     */
+    private function buildProvider(array $request = []): EmployeeRttSummaryProvider
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request(query: $request));
+
+        $reflection = new ReflectionClass(EmployeeRttSummaryProvider::class);
+        $provider   = $reflection->newInstanceWithoutConstructor();
+
+        $this->setReadonlyProperty($provider, 'requestStack', $requestStack);
+        $this->setReadonlyProperty($provider, 'phaseResolver', new EmployeeContractPhaseResolver());
+        $this->setReadonlyProperty($provider, 'exerciseYearResolver', new ExerciseYearResolver());
+        $this->setReadonlyProperty($provider, 'rttStartDate', null);
+
+        return $provider;
+    }
+
+    private function invokePrivate(object $obj, string $method, mixed ...$args): mixed
+    {
+        $reflection = new ReflectionClass($obj::class);
+        $m          = $reflection->getMethod($method);
+
+        return $m->invoke($obj, ...$args);
+    }
+
+    private function setReadonlyProperty(object $obj, string $property, mixed $value): void
+    {
+        $reflection = new ReflectionProperty($obj::class, $property);
+        $reflection->setValue($obj, $value);
+    }
+
+    private function setEntityId(object $entity, int $id): void
+    {
+        $reflection = new ReflectionProperty($entity::class, 'id');
+        $reflection->setValue($entity, $id);
+    }
+}

tests/State/EmployeeWeekCommentWriteProcessorTest.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\State;
+
+use ApiPlatform\Metadata\Delete;
+use ApiPlatform\Metadata\Post;
+use ApiPlatform\State\ProcessorInterface;
+use App\Entity\Employee;
+use App\Entity\EmployeeWeekComment;
+use App\Service\AuditLogger;
+use App\State\EmployeeWeekCommentWriteProcessor;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\UnitOfWork;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+/**
+ * @internal
+ */
+final class EmployeeWeekCommentWriteProcessorTest extends TestCase
+{
+    public function testRejectsNonMondayWeekStart(): void
+    {
+        $processor = new EmployeeWeekCommentWriteProcessor(
+            $this->createStub(ProcessorInterface::class),
+            $this->createStub(ProcessorInterface::class),
+            $this->createStub(EntityManagerInterface::class),
+            $this->createStub(AuditLogger::class),
+        );
+
+        $comment = new EmployeeWeekComment()
+            ->setEmployee(new Employee()->setFirstName('A')->setLastName('B'))
+            ->setWeekStartDate(new DateTimeImmutable('2026-04-14'))
+            ->setContent('test')
+        ;
+
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $processor->process($comment, new Post());
+    }
+
+    public function testAcceptsMondayAndAuditsCreate(): void
+    {
+        $persist = $this->createMock(ProcessorInterface::class);
+        $persist->expects(self::once())->method('process');
+        $em = $this->createMock(EntityManagerInterface::class);
+        $em->method('getUnitOfWork')->willReturn($this->createStub(UnitOfWork::class));
+        $em->expects(self::once())->method('flush');
+        $auditor = $this->createMock(AuditLogger::class);
+        $auditor->expects(self::once())->method('log')->with(self::anything(), 'create', 'week_comment');
+
+        $processor = new EmployeeWeekCommentWriteProcessor($persist, $this->createStub(ProcessorInterface::class), $em, $auditor);
+        $processor->process(
+            new EmployeeWeekComment()->setEmployee(new Employee()->setFirstName('A')->setLastName('B'))->setWeekStartDate(new DateTimeImmutable('2026-04-13'))->setContent('x'),
+            new Post()
+        );
+    }
+
+    public function testDeleteAudits(): void
+    {
+        $remove = $this->createMock(ProcessorInterface::class);
+        $remove->expects(self::once())->method('process');
+        $em = $this->createMock(EntityManagerInterface::class);
+        $em->expects(self::once())->method('flush');
+        $auditor = $this->createMock(AuditLogger::class);
+        $auditor->expects(self::once())->method('log')->with(self::anything(), 'delete', 'week_comment');
+
+        $processor = new EmployeeWeekCommentWriteProcessor($this->createStub(ProcessorInterface::class), $remove, $em, $auditor);
+        $processor->process(
+            new EmployeeWeekComment()->setEmployee(new Employee()->setFirstName('A')->setLastName('B'))->setWeekStartDate(new DateTimeImmutable('2026-04-13'))->setContent('x'),
+            new Delete()
+        );
+    }
+}

tests/State/WorkHourDayContextProviderTest.php

@@ -10,6 +10,7 @@ use App\Entity\AbsenceType;
 use App\Entity\Contract;
 use App\Entity\Employee;
 use App\Entity\User;
+use App\Enum\ContractNature;
 use App\Enum\HalfDay;
 use App\Repository\Contract\AbsenceReadRepositoryInterface;
 use App\Repository\Contract\EmployeeScopedRepositoryInterface;
@@ -176,6 +177,10 @@ final class WorkHourDayContextProviderTest extends TestCase
             ->method('resolveForEmployeeAndDate')
             ->willReturnCallback(static fn (Employee $employee): ?Contract => $employee->getContract())
         ;
+        $resolver
+            ->method('resolveNatureForEmployeeAndDate')
+            ->willReturn(ContractNature::CDI)
+        ;
 
         return $resolver;
     }

tests/State/WorkHourWeeklySummaryProviderTest.php

@@ -15,6 +15,7 @@ use App\Enum\HalfDay;
 use App\Repository\Contract\AbsenceReadRepositoryInterface;
 use App\Repository\Contract\EmployeeScopedRepositoryInterface;
 use App\Repository\Contract\WorkHourReadRepositoryInterface;
+use App\Repository\EmployeeWeekCommentRepository;
 use App\Service\Contracts\EmployeeContractResolver;
 use App\Service\PublicHolidayServiceInterface;
 use App\Service\WorkHours\AbsenceSegmentsResolver;
@@ -66,6 +67,8 @@ final class WorkHourWeeklySummaryProviderTest extends TestCase
             $this->buildResolverStub(),
             new DailyReferenceMinutesResolver(),
             $this->buildHolidayResolver(),
+            $this->buildHolidayService(),
+            $this->buildWeekCommentRepoStub(),
         );
 
         $this->expectException(AccessDeniedHttpException::class);
@@ -128,6 +131,8 @@ final class WorkHourWeeklySummaryProviderTest extends TestCase
             $this->buildWeeklyResolverStub($employees),
             new DailyReferenceMinutesResolver(),
             $this->buildHolidayResolver(),
+            $this->buildHolidayService(),
+            $this->buildWeekCommentRepoStub(),
         );
 
         $result = $provider->provide(new Get());
@@ -178,16 +183,29 @@ final class WorkHourWeeklySummaryProviderTest extends TestCase
         $property->setValue($entity, $id);
     }
 
+    private function buildWeekCommentRepoStub(): EmployeeWeekCommentRepository
+    {
+        $r = $this->createStub(EmployeeWeekCommentRepository::class);
+        $r->method('findByWeekAndEmployees')->willReturn([]);
+
+        return $r;
+    }
+
     private function buildHolidayResolver(array $holidayMap = []): HolidayVirtualHoursResolver
+    {
+        return new HolidayVirtualHoursResolver(
+            new DailyReferenceMinutesResolver(),
+            $this->buildHolidayService($holidayMap),
+            $this->createStub(EmployeeContractResolver::class),
+        );
+    }
+
+    private function buildHolidayService(array $holidayMap = []): PublicHolidayServiceInterface
     {
         $service = $this->createStub(PublicHolidayServiceInterface::class);
         $service->method('getHolidaysDayByYears')->willReturn($holidayMap);
 
-        return new HolidayVirtualHoursResolver(
+        return $service;
-            new DailyReferenceMinutesResolver(),
-            $service,
-            $this->createStub(EmployeeContractResolver::class),
-        );
     }
 
     private function buildResolverStub(): EmployeeContractResolver