chore: bump version to v0.1.101

Permet de consulter les exercices passés (table hebdomadaire RTT) en
réutilisant le pattern de l'onglet Congés. Plage bornée par
max(début historique contrat, RTT_START_DATE). Bouton + Payer les RTT
verrouillé sur exercices clos. Onglet masqué pour FORFAIT (inchangé).

Backend : rttStartDate désormais toujours exposé sur EmployeeRttSummary
pour que le sélecteur conserve sa borne lors de la navigation vers un
exercice passé. Le masquage existant des lignes Report continue de
fonctionner (comparaison mois-à-mois).

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

.dockerignore

@@ -3,6 +3,7 @@
 .env.local
 .env.test
 docker/
+!docker/php/config/php.ini
 deploy/docker/docker-compose.prod.yml
 deploy/docker/deploy.sh
 deploy/docker/.env.example

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
@@ -30,7 +31,10 @@
 - Contracts: `trackingMode` (TIME=hours, PRESENCE=half-days), `weeklyHours`
 - Contract types: FORFAIT, THIRTY_FIVE_HOURS, THIRTY_NINE_HOURS, INTERIM, CUSTOM
 - 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)
@@ -44,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
@@ -57,6 +67,21 @@
 - 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`.
 
 ## 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.

config/services.yaml

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

deploy/docker/Dockerfile.prod

@@ -45,6 +45,7 @@ RUN apt-get update && apt-get install -y \
 
 # PHP production config
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+COPY docker/php/config/php.ini "$PHP_INI_DIR/conf.d/99-app.ini"
 
 # PHP-FPM: forward worker output to stderr for docker logs
 RUN echo "catch_workers_output = yes" >> /usr/local/etc/php-fpm.d/www.conf \

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
 
@@ -130,6 +137,7 @@ Documents complementaires:
   - pas de bonus 25%
   - pas de bonus 50%
   - pas de total récup
+  - agence d'intérim optionnelle (table `interim_agencies`): affichée sur la fiche employé et le détail contrat sous la forme "Intérim (NomAgence)"
 
 ## 6bis) Heures Conducteurs
 
@@ -165,8 +173,9 @@ 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 bloquées sur jour férié (création/édition) — bouton "Modifier" masqué comme pour les formations
+  - 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
   - la référence hebdomadaire n'est pas réduite par un férié: un salarié qui ne saisit rien sur un férié est en déficit de la journée correspondante
 
@@ -305,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)
@@ -327,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)
@@ -370,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 |
@@ -434,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
 
@@ -452,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,60 @@
+# 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.
+
+## 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,52 @@
+# 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.
+
+## 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`.

docker/php/config/php.ini

@@ -1,4 +1,7 @@
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-date.timezone = Europe/Paris
+date.timezone = Europe/Paris
+
+[PHP]
+memory_limit = 256M

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>
-                <label class="text-md font-semibold text-neutral-700" for="employee">
-                    Employé <span class="text-red-600">*</span>
-                </label>
-                <select
-                    id="employee"
-                    v-model="absenceForm.employeeId"
-                    :class="employeeFieldClass"
-                    :disabled="props.lockEmployee"
-                >
-                    <option value="" disabled>Choisir un employé</option>
-                    <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>
+            <MalioSelect
+                :model-value="absenceForm.employeeId === '' ? null : absenceForm.employeeId"
+                :options="employeeOptions"
+                label="Employé *"
+                empty-option-label="Choisir un employé"
+                min-width=""
+                :disabled="props.lockEmployee"
+                :error="showEmployeeError ? `L'employé est obligatoire.` : ''"
+                @update:model-value="onEmployeeChange"
+            />
 
-            <div>
-                <label class="text-md font-semibold text-neutral-700" for="type">
-                    Type d'absence <span class="text-red-600">*</span>
-                </label>
-                <select
-                    id="type"
-                    v-model="absenceForm.typeId"
-                    :class="typeFieldClass"
-                >
-                    <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>
+            <MalioSelect
+                :model-value="absenceForm.typeId === '' ? null : absenceForm.typeId"
+                :options="typeOptions"
+                label="Type d'absence *"
+                empty-option-label="Choisir un type"
+                min-width=""
+                :error="showTypeError ? `Le type d'absence est obligatoire.` : ''"
+                @update:model-value="onTypeChange"
+            />
 
             <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
-                            v-model="absenceForm.startHalf"
-                            class="w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
-                        >
-                            <option v-for="half in HALF_DAYS" :key="half.value" :value="half.value">
-                                {{ half.label }}
-                            </option>
-                        </select>
+                        <MalioSelect
+                            :model-value="absenceForm.startHalf"
+                            :options="halfDayOptions"
+                            min-width=""
+                            @update:model-value="(v) => { if (v !== null) absenceForm.startHalf = v as HalfDay }"
+                        />
                     </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
-                            v-model="absenceForm.endHalf"
-                            class="w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
-                        >
-                            <option v-for="half in HALF_DAYS" :key="half.value" :value="half.value">
-                                {{ half.label }}
-                            </option>
-                        </select>
+                        <MalioSelect
+                            :model-value="absenceForm.endHalf"
+                            :options="halfDayOptions"
+                            min-width=""
+                            @update:model-value="(v) => { if (v !== null) absenceForm.endHalf = v as HalfDay }"
+                        />
                     </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"
-                    :class="submitButtonClass"
-                >
-                    + Ajouter
-                </button>
+                    label="Valider"
+                    button-class="w-[200px]"
+                    :disabled="props.isSubmitting || !isFormValid"
+                />
             </div>
         </form>
     </AppDrawer>
@@ -189,20 +166,23 @@ const submitButtonClass = computed(() => {
     return ''
 })
 
-const baseSelectClass =
-    'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
-const employeeFieldClass = computed(() => {
-    if (showEmployeeError.value) {
-        return `${baseSelectClass} border-red-500`
-    }
-    return `${baseSelectClass} border-neutral-300`
-})
-const typeFieldClass = computed(() => {
-    if (showTypeError.value) {
-        return `${baseSelectClass} border-red-500`
-    }
-    return `${baseSelectClass} border-neutral-300`
-})
+const employeeOptions = computed(() =>
+    props.employees.map((e) => ({ label: `${e.firstName} ${e.lastName}`, value: e.id }))
+)
+const typeOptions = computed(() =>
+    props.absenceTypes.map((t) => ({ label: `${t.label} (${t.code})`, value: t.id }))
+)
+const halfDayOptions = HALF_DAYS.map((h) => ({ label: h.label, value: h.value }))
+
+const dateInputBaseClass =
+    'h-10 w-full rounded-md border px-3 text-md text-black outline-none focus:border-2 focus:border-m-primary'
+
+const onEmployeeChange = (value: string | number | null) => {
+    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

@@ -9,8 +9,15 @@
           <h2 class="text-[32px] font-semibold text-primary-500">
             {{ title }}
           </h2>
+          <button
+            type="button"
+            class="rounded-md p-1 text-primary-500 hover:text-secondary-500"
+            @click="close"
+          >
+            <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/AppTopNav.vue

@@ -1,7 +1,14 @@
 <template>
-    <header ref="headerRef" class="border-b border-neutral-200 bg-primary-500 p-5 text-white">
-        <div class="flex h-full items-center justify-end">
-            <div class="flex gap-6 text-xl text-white">
+    <header ref="headerRef" class="border-b border-neutral-200 bg-primary-500 px-4 py-3 text-white lg:p-5">
+        <div class="flex h-full items-center justify-between lg:justify-end">
+            <button
+                type="button"
+                class="rounded-md p-1 text-white hover:text-neutral-200 lg:hidden"
+                @click="$emit('toggleSidebar')"
+            >
+                <Icon name="mdi:menu" size="28"/>
+            </button>
+            <div class="flex gap-4 text-xl text-white lg:gap-6">
                 <div v-if="isAdmin" ref="bellRoot" class="relative">
                     <button type="button" class="relative self-center cursor-pointer flex items-center" @click="toggleNotifications">
                         <Icon name="mdi:bell-plus" size="36"/>
@@ -15,8 +22,8 @@
 
                     <div
                         v-if="isNotificationsOpen"
-                        class="fixed right-[20px] z-30 w-[400px] rounded-md border border-neutral-200 bg-white text-neutral-800 shadow-lg"
-                        :style="{ top: `${navbarBottom + 20}px` }"
+                        class="fixed right-2 z-30 w-[calc(100vw-1rem)] max-w-[400px] rounded-md border border-neutral-200 bg-white text-neutral-800 shadow-lg lg:right-[20px]"
+                        :style="{ top: `${navbarBottom + 10}px` }"
                     >
                         <div class="px-3 pt-3 pb-6 text-xl font-semibold">
                             Notifications
@@ -66,7 +73,7 @@
                 <div ref="userMenuRoot" class="relative flex gap-4">
                     <button type="button" class="flex items-center gap-4 cursor-pointer" @click="toggleUserMenu">
                         <Icon name="mdi:account-circle-outline" class="self-center" size="36"/>
-                        <p class="self-center">{{ user?.username }}</p>
+                        <p class="hidden self-center sm:block">{{ user?.username }}</p>
                     </button>
                     <div
                         v-if="isUserMenuOpen"
@@ -103,6 +110,10 @@ defineProps<{
     user?: User
 }>()
 
+defineEmits<{
+    (event: 'toggleSidebar'): void
+}>()
+
 const formatTimeAgo = (dateString: string): string => {
     const date = new Date(dateString)
     const now = new Date()

frontend/components/BulkYearlyHoursDrawer.vue

@@ -0,0 +1,108 @@
+<template>
+    <AppDrawer v-model="drawerOpen" title="Export heures (tous les employés)">
+        <form class="space-y-4" @submit.prevent="handleSubmit">
+            <div>
+                <label class="text-md font-semibold text-neutral-700" for="bulk-yearly-hours-year">
+                    Année <span class="text-red-600">*</span>
+                </label>
+                <select
+                    id="bulk-yearly-hours-year"
+                    v-model="selectedYear"
+                    :class="selectFieldClass"
+                >
+                    <option v-for="y in years" :key="y" :value="y">{{ y }}</option>
+                </select>
+            </div>
+
+            <div>
+                <label class="text-md font-semibold text-neutral-700" for="bulk-yearly-hours-month">
+                    Mois <span class="text-red-600">*</span>
+                </label>
+                <select
+                    id="bulk-yearly-hours-month"
+                    v-model="selectedMonth"
+                    :class="selectFieldClass"
+                >
+                    <option value="" disabled>Sélectionner un mois</option>
+                    <option v-for="m in months" :key="m.value" :value="m.value">{{ m.label }}</option>
+                </select>
+            </div>
+
+            <div class="flex justify-center pt-2">
+                <button
+                    type="submit"
+                    class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500 disabled:opacity-50 disabled:cursor-not-allowed"
+                    :disabled="isLoading || selectedMonth === ''"
+                >
+                    <template v-if="isLoading">
+                        Génération en cours...
+                    </template>
+                    <template v-else>
+                        Imprimer
+                    </template>
+                </button>
+            </div>
+        </form>
+    </AppDrawer>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import AppDrawer from '~/components/AppDrawer.vue'
+
+const props = defineProps<{
+    modelValue: boolean
+    isLoading?: boolean
+}>()
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: boolean): void
+    (event: 'submit', payload: { year: number; month: number | null }): void
+}>()
+
+const drawerOpen = computed({
+    get: () => props.modelValue,
+    set: (value: boolean) => emit('update:modelValue', value)
+})
+
+const currentYear = new Date().getFullYear()
+const years = Array.from({ length: 6 }, (_, i) => currentYear - i)
+const months = [
+    { value: 1, label: 'Janvier' },
+    { value: 2, label: 'Février' },
+    { value: 3, label: 'Mars' },
+    { value: 4, label: 'Avril' },
+    { value: 5, label: 'Mai' },
+    { value: 6, label: 'Juin' },
+    { value: 7, label: 'Juillet' },
+    { value: 8, label: 'Août' },
+    { value: 9, label: 'Septembre' },
+    { value: 10, label: 'Octobre' },
+    { value: 11, label: 'Novembre' },
+    { value: 12, label: 'Décembre' }
+]
+const selectedYear = ref(currentYear)
+const currentMonth = new Date().getMonth() + 1
+const selectedMonth = ref<number | ''>(currentMonth)
+
+const baseInputClass = 'mt-2 w-full rounded-md border px-3 py-2 text-md text-neutral-900'
+const selectFieldClass = computed(() => `${baseInputClass} border-neutral-300`)
+
+const handleSubmit = () => {
+    if (selectedMonth.value === '') return
+    emit('submit', {
+        year: selectedYear.value,
+        month: selectedMonth.value
+    })
+}
+
+watch(
+    () => props.modelValue,
+    (isOpen) => {
+        if (!isOpen) {
+            selectedYear.value = currentYear
+            selectedMonth.value = currentMonth
+        }
+    }
+)
+</script>

frontend/components/CalendarGrid.vue

@@ -45,9 +45,9 @@
                             <button
                                 type="button"
                                 class="relative flex h-8 w-full items-center justify-center overflow-hidden rounded-md border border-neutral-200 text-[11px] font-semibold text-neutral-800"
-                                :class="isHolidayDate(day.date) || getCellInfo(employee.id, day.date)?.hasFormation ? 'cursor-not-allowed opacity-80' : ''"
+                                :class="getCellInfo(employee.id, day.date)?.hasFormation ? 'cursor-not-allowed opacity-80' : ''"
                                 :style="getCellStyle(employee.id, day.date)"
-                                :disabled="isHolidayDate(day.date) || getCellInfo(employee.id, day.date)?.hasFormation"
+                                :disabled="getCellInfo(employee.id, day.date)?.hasFormation"
                                 @click="handleCellClick(employee, day.date)"
                             >
                                 <span v-if="!getCellInfo(employee.id, day.date)?.halfLabel">
@@ -80,9 +80,7 @@
                             <button
                                 type="button"
                                 class="relative flex h-8 w-full items-center justify-center rounded-md border border-neutral-200 text-[11px] font-semibold text-neutral-800 bg-white"
-                                :class="isHolidayDate(day.date) ? 'cursor-not-allowed opacity-80' : ''"
                                 :style="getCellStyle(employee.id, day.date)"
-                                :disabled="isHolidayDate(day.date)"
                                 @click="handleCellClick(employee, day.date)"
                             >
                                 <span></span>

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/EmployeeYearlyHoursDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppDrawer v-model="drawerOpen" title="Export heures annuelles">
+    <AppDrawer v-model="drawerOpen" title="Export heures">
         <form class="space-y-4" @submit.prevent="handleSubmit">
             <div>
                 <label class="text-md font-semibold text-neutral-700" for="yearly-hours-year">
@@ -14,6 +14,20 @@
                 </select>
             </div>
 
+            <div>
+                <label class="text-md font-semibold text-neutral-700" for="yearly-hours-month">
+                    Mois
+                </label>
+                <select
+                    id="yearly-hours-month"
+                    v-model="selectedMonth"
+                    :class="selectFieldClass"
+                >
+                    <option value="">Toute l'année</option>
+                    <option v-for="m in months" :key="m.value" :value="m.value">{{ m.label }}</option>
+                </select>
+            </div>
+
             <div class="flex justify-center pt-2">
                 <button
                     type="submit"
@@ -37,7 +51,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
     (event: 'update:modelValue', value: boolean): void
-    (event: 'submit', year: number): void
+    (event: 'submit', payload: { year: number; month: number | null }): void
 }>()
 
 const drawerOpen = computed({
@@ -47,13 +61,31 @@ const drawerOpen = computed({
 
 const currentYear = new Date().getFullYear()
 const years = Array.from({ length: 6 }, (_, i) => currentYear - i)
+const months = [
+    { value: 1, label: 'Janvier' },
+    { value: 2, label: 'Février' },
+    { value: 3, label: 'Mars' },
+    { value: 4, label: 'Avril' },
+    { value: 5, label: 'Mai' },
+    { value: 6, label: 'Juin' },
+    { value: 7, label: 'Juillet' },
+    { value: 8, label: 'Août' },
+    { value: 9, label: 'Septembre' },
+    { value: 10, label: 'Octobre' },
+    { value: 11, label: 'Novembre' },
+    { value: 12, label: 'Décembre' }
+]
 const selectedYear = ref(currentYear)
+const selectedMonth = ref<number | ''>('')
 
 const baseInputClass = 'mt-2 w-full rounded-md border px-3 py-2 text-md text-neutral-900'
 const selectFieldClass = computed(() => `${baseInputClass} border-neutral-300`)
 
 const handleSubmit = () => {
-    emit('submit', selectedYear.value)
+    emit('submit', {
+        year: selectedYear.value,
+        month: selectedMonth.value === '' ? null : selectedMonth.value
+    })
 }
 
 watch(
@@ -61,6 +93,7 @@ watch(
     (isOpen) => {
         if (!isOpen) {
             selectedYear.value = currentYear
+            selectedMonth.value = ''
         }
     }
 )

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

@@ -6,7 +6,7 @@
                 :style="{ gridTemplateColumns: dayGridCols }"
             >
                 <span>Nom</span>
-                <span class="pl-2">Absence</span>
+                <span class="pl-2">Statut</span>
                 <span class="pl-4">Heure de jour</span>
                 <span class="pl-2">Heure de nuit</span>
                 <span class="pl-2">Heure atelier</span>
@@ -42,7 +42,9 @@
                             <span class="font-normal text-neutral-600">({{ contractLabel(employee) }})</span>
                         </p>
                         <p class="text-neutral-500 truncate inline-flex items-center gap-2">
-                            <span>{{ employee.site?.name ?? 'Sans site' }}</span>
+                            <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)"
                                 class="rounded-full bg-green-500 flex justify-center item-center text-white p-0.5"
@@ -170,6 +172,7 @@
 import type { Employee } from '~/services/dto/employee'
 import TimeSelect from '~/components/ui/TimeSelect.vue'
 import type { DriverHourRow } from '~/services/dto/work-hour'
+import { contractNatureLabel } from '~/utils/contract'
 
 const rows = defineModel<Record<number, DriverHourRow>>('rows', { required: true })
 const bulkValidationInput = ref<HTMLInputElement | null>(null)
@@ -202,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,7 +33,12 @@
             {{ row.firstName }} {{ row.lastName }}
             <span class="font-normal text-neutral-600">({{ row.contractName ?? '-' }})</span>
           </p>
-          <p class="text-[11px] text-neutral-500 truncate">{{ row.siteName ?? 'Sans site' }}</p>
+          <p class="text-[11px] text-neutral-500 truncate inline-flex items-center gap-2">
+            <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>
 
         <div
@@ -42,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>
@@ -89,20 +94,39 @@
 
 <script setup lang="ts">
 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
-  return { backgroundColor: daily.absenceColor || '#dc2626' }
+  if (daily.hasAbsence) 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/ContractTab.vue

@@ -16,7 +16,7 @@
           :key="`${item.startDate}-${item.endDate ?? 'open'}-${item.contractId ?? item.contractName}`"
           class="grid grid-cols-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 hover:bg-tertiary-500"
         >
-          <p>{{ contractNatureLabel(item.contractNature) }}</p>
+          <p>{{ item.interimAgencyName ? `${contractNatureLabel(item.contractNature)} (${item.interimAgencyName})` : contractNatureLabel(item.contractNature) }}</p>
           <p>{{ contractHistoryLabel(item) }}</p>
           <p>{{ formatDate(item.startDate) }}</p>
           <p>{{ formatDate(item.endDate) }}</p>
@@ -221,6 +221,22 @@
           </select>
         </div>
 
+        <div v-if="createContractForm.contractNature === 'INTERIM'">
+          <label class="text-md font-semibold text-neutral-700" for="create-interim-agency">
+            Agence d'intérim
+          </label>
+          <select
+            id="create-interim-agency"
+            v-model="createContractForm.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="create-contract-id">
             Temps de travail <span class="text-red-600">*</span>
@@ -282,6 +298,7 @@
 <script setup lang="ts">
 import type { Contract } from '~/services/dto/contract'
 import type { ContractHistoryItem } from '~/services/dto/employee'
+import type { InterimAgency } from '~/services/interim-agencies'
 import WorkDaysHoursInput from '~/components/employees/WorkDaysHoursInput.vue'
 
 type SuspensionForm = {
@@ -310,6 +327,7 @@ type CreateContractForm = {
   endDate: string
   isDriver: boolean
   workDaysHours: Record<number, number> | null
+  interimAgencyId: number | ''
 }
 
 const props = defineProps<{
@@ -351,6 +369,7 @@ const props = defineProps<{
   onSubmitSuspension: (index: number) => void
   onAddSuspensionForm: () => void
   currentContractPeriodId?: number | null
+  interimAgencies: InterimAgency[]
 }>()
 
 const drawerTab = ref<'close' | 'suspend'>('close')

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="isHistoricalYear"
                 @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-[11%]" />
-          <col class="w-[11%]" />
-          <col class="w-[11%]" />
-          <col class="w-[11%]" />
-          <col class="w-[11%]" />
-          <col class="w-[11%]" />
-          <col class="w-[11%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <col class="w-[10%]" />
+          <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.paidBonus25Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase25Minutes + currentPayment.paidBonus25Minutes)) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBase50Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase50Minutes + currentPayment.paidBonus50Minutes)) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(paidTotal) }}</td>
+            <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' }} <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' }} <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' }} <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' }} <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' }} <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 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"
           />
@@ -250,14 +278,36 @@
 import type { EmployeeRttSummary, EmployeeRttWeekSummary } from '~/services/dto/employee-rtt-summary'
 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
 }>()
 
 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 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 +363,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 +550,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.bonus25Hours = existing.paidBonus25Minutes / 60
-    paymentForm.base50Hours = existing.paidBase50Minutes / 60
-    paymentForm.bonus50Hours = existing.paidBonus50Minutes / 60
+    paymentForm.base25Hours = Math.round(existing.paidBase25Minutes / 60 * 100) / 100
+    paymentForm.bonus25Hours = Math.round(existing.paidBonus25Minutes / 60 * 100) / 100
+    paymentForm.base50Hours = Math.round(existing.paidBase50Minutes / 60 * 100) / 100
+    paymentForm.bonus50Hours = Math.round(existing.paidBonus50Minutes / 60 * 100) / 100
   } else {
     paymentForm.base25Hours = 0
     paymentForm.bonus25Hours = 0
@@ -516,6 +566,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/employees/WorkDaysHoursInput.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="rounded-md border border-neutral-200 bg-neutral-50 p-3 space-y-2">
+    <div class="flex items-center justify-between">
+      <p class="text-md font-semibold text-neutral-700">
+        Jours travaillés <span v-if="!disabled" class="text-red-600">*</span>
+      </p>
+      <p class="text-sm" :class="totalIsValid ? 'text-green-700' : 'text-red-600'">
+        {{ formatTotal(totalMinutes) }} / {{ formatTotal(expectedMinutes) }}
+      </p>
+    </div>
+    <p v-if="!disabled" class="text-xs text-neutral-500">Somme requise = {{ expectedMinutes / 60 }}h (total hebdo du contrat).</p>
+    <div class="space-y-1">
+      <div v-for="day in days" :key="day.iso" class="flex items-center gap-3">
+        <label class="inline-flex items-center gap-2 min-w-[120px]">
+          <input
+            :checked="day.active"
+            type="checkbox"
+            class="h-4 w-4 rounded border-neutral-300 text-primary-500 focus:ring-primary-500"
+            :disabled="disabled"
+            @change="onToggleDay(day.iso, ($event.target as HTMLInputElement).checked)"
+          />
+          <span class="text-md text-neutral-700">{{ day.label }}</span>
+        </label>
+        <input
+          :value="day.time"
+          type="time"
+          step="60"
+          class="rounded-md border border-neutral-300 bg-white px-2 py-1 text-md text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20 disabled:bg-neutral-100 disabled:text-neutral-400"
+          :disabled="disabled || !day.active"
+          @input="onChangeTime(day.iso, ($event.target as HTMLInputElement).value)"
+        />
+      </div>
+    </div>
+    <p v-if="!totalIsValid" class="text-sm text-red-600">
+      La somme des heures par jour doit égaler exactement {{ expectedMinutes / 60 }}h.
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const props = withDefaults(defineProps<{
+  modelValue: Record<number, number> | null
+  contractWeeklyHours: number | null
+  disabled?: boolean
+}>(), { disabled: false })
+
+const emit = defineEmits<{
+  'update:modelValue': [value: Record<number, number>]
+}>()
+
+const DAY_LABELS: Record<number, string> = { 1: 'Lundi', 2: 'Mardi', 3: 'Mercredi', 4: 'Jeudi', 5: 'Vendredi' }
+
+const expectedMinutes = computed(() => (props.contractWeeklyHours ?? 0) * 60)
+
+const days = computed(() => {
+  const raw = props.modelValue ?? {}
+  return [1, 2, 3, 4, 5].map((iso) => {
+    const active = Object.prototype.hasOwnProperty.call(raw, iso)
+    const minutes = Number(raw[iso] ?? 0)
+    return {
+      iso,
+      label: DAY_LABELS[iso],
+      active,
+      time: active ? minutesToTime(minutes) : '00:00',
+    }
+  })
+})
+
+const totalMinutes = computed(() => {
+  const raw = props.modelValue ?? {}
+  return Object.values(raw).reduce((sum, n) => sum + (Number(n) || 0), 0)
+})
+
+const totalIsValid = computed(() => totalMinutes.value === expectedMinutes.value && expectedMinutes.value > 0)
+
+function minutesToTime(minutes: number): string {
+  const h = Math.floor(minutes / 60)
+  const m = minutes % 60
+  return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`
+}
+
+function timeToMinutes(value: string): number {
+  const [h, m] = value.split(':').map(Number)
+  return (h || 0) * 60 + (m || 0)
+}
+
+function onToggleDay(iso: number, active: boolean) {
+  const next = { ...(props.modelValue ?? {}) }
+  if (active) {
+    next[iso] = next[iso] ?? 0
+  } else {
+    delete next[iso]
+  }
+  emit('update:modelValue', next)
+}
+
+function onChangeTime(iso: number, value: string) {
+  const next = { ...(props.modelValue ?? {}) }
+  const minutes = timeToMinutes(value)
+  next[iso] = minutes
+  emit('update:modelValue', next)
+}
+
+function formatTotal(min: number): string {
+  const h = Math.floor(min / 60)
+  const m = min % 60
+  return m === 0 ? `${h}h` : `${h}h${String(m).padStart(2, '0')}`
+}
+
+defineExpose({ totalIsValid, totalMinutes })
+</script>

frontend/components/hours/HoursDayView.vue

@@ -1,12 +1,180 @@
 <template>
     <div class="bg-white overflow-hidden flex min-h-0 flex-col">
-        <div class="overflow-y-auto min-h-0">
+        <!-- Mobile card layout -->
+        <div class="overflow-y-auto min-h-0 space-y-3 lg:hidden">
+            <div
+                v-for="employee in employees"
+                :key="'m-' + employee.id"
+                class="rounded-md border border-primary-500 bg-white p-4"
+            >
+                <!-- Employee name + site -->
+                <div class="mb-3">
+                    <p class="text-md font-bold text-primary-500 truncate">
+                        {{ employee.firstName }} {{ employee.lastName }}
+                        <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="getRowContractNature(employee.id)"> — {{ contractNatureLabel(getRowContractNature(employee.id) ?? undefined) }}</span>
+                    </p>
+                </div>
+
+                <!-- Absence / Holiday / Formation pills -->
+                <div class="mb-3 flex flex-col gap-1">
+                    <p
+                        v-if="getRowAbsenceLabel(employee.id)"
+                        class="rounded-md px-2 py-1 text-xs text-white truncate"
+                        :style="getRowAbsenceStyle(employee.id)"
+                    >
+                        {{ getRowAbsenceLabel(employee.id) }}
+                    </p>
+                    <p
+                        v-else
+                        class="text-xs text-neutral-400"
+                    >
+                        Aucune absence
+                    </p>
+                    <p
+                        v-if="isHoliday"
+                        class="rounded-md px-2 py-1 text-xs text-sky-900 inline-flex items-center gap-1"
+                        style="background-color: #b3e5fc"
+                    >
+                        <Icon name="mdi:calendar-star" size="14" class="shrink-0"/>
+                        <span class="truncate">{{ holidayLabel || 'Férié' }}</span>
+                    </p>
+                    <p
+                        v-if="hasRowFormation(employee.id)"
+                        class="rounded-md px-2 py-1 text-xs text-white bg-indigo-500 inline-flex items-center gap-1"
+                    >
+                        <Icon name="mdi:school-outline" size="14" class="shrink-0"/>
+                        <span class="truncate">{{ getRowFormationLabel(employee.id) }}</span>
+                    </p>
+                    <button
+                        v-if="!hasRowFormation(employee.id)"
+                        type="button"
+                        class="self-start text-xs font-semibold underline"
+                        :class="isRowLocked(employee.id) || !hasContractAtSelectedDate(employee.id) ? 'text-neutral-400 cursor-not-allowed' : 'text-primary-500 cursor-pointer'"
+                        :disabled="isRowLocked(employee.id) || !hasContractAtSelectedDate(employee.id)"
+                        @click="onAbsenceClick(employee.id)"
+                    >
+                        Modifier
+                    </button>
+                </div>
+
+                <!-- Time inputs (TIME tracking) -->
+                <div v-if="isTimeTracking(employee)" class="space-y-2">
+                    <div class="grid grid-cols-2 gap-2">
+                        <div>
+                            <label class="text-xs text-neutral-500">Début matin</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].morningFrom"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'AM'))"
+                            />
+                        </div>
+                        <div>
+                            <label class="text-xs text-neutral-500">Fin matin</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].morningTo"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'AM'))"
+                            />
+                        </div>
+                    </div>
+                    <div class="grid grid-cols-2 gap-2">
+                        <div>
+                            <label class="text-xs text-neutral-500">Début après-midi</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].afternoonFrom"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'PM'))"
+                            />
+                        </div>
+                        <div>
+                            <label class="text-xs text-neutral-500">Fin après-midi</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].afternoonTo"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'PM'))"
+                            />
+                        </div>
+                    </div>
+                    <div class="grid grid-cols-2 gap-2">
+                        <div>
+                            <label class="text-xs text-neutral-500">Début soir</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].eveningFrom"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isEveningLockedByAbsence(employee.id))"
+                            />
+                        </div>
+                        <div>
+                            <label class="text-xs text-neutral-500">Fin soir</label>
+                            <TimeSelect
+                                v-model="rows[employee.id].eveningTo"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isEveningLockedByAbsence(employee.id))"
+                            />
+                        </div>
+                    </div>
+                    <div class="flex gap-4 pt-1 text-sm font-semibold text-primary-500">
+                        <span>Jour : {{ formatMinutes(getRowMetrics(employee.id).dayMinutes) }}</span>
+                        <span>Nuit : {{ formatMinutes(getRowMetrics(employee.id).nightMinutes) }}</span>
+                        <span>Total : {{ formatMinutes(getRowMetrics(employee.id).totalMinutes) }}</span>
+                    </div>
+                </div>
+
+                <!-- Presence tracking -->
+                <div v-else-if="isPresenceTracking(employee)" class="space-y-2">
+                    <div class="flex items-center gap-4">
+                        <label class="flex items-center gap-2 text-sm">
+                            <input
+                                v-model="rows[employee.id].isPresentMorning"
+                                type="checkbox"
+                                class="h-4 w-4 cursor-pointer"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'AM'))"
+                            />
+                            Matin
+                        </label>
+                        <label class="flex items-center gap-2 text-sm">
+                            <input
+                                v-model="rows[employee.id].isPresentAfternoon"
+                                type="checkbox"
+                                class="h-4 w-4 cursor-pointer"
+                                :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isHalfLockedByAbsence(employee.id, 'PM'))"
+                            />
+                            Après-midi
+                        </label>
+                    </div>
+                    <p class="text-sm font-semibold text-primary-500">Total : {{ getPresenceDayValue(employee.id) }}</p>
+                </div>
+
+                <!-- Validation status (non-admin) -->
+                <div v-if="!isAdmin" class="mt-3 flex gap-4 text-xs border-t border-neutral-200 pt-2">
+                    <span v-if="!isSiteManager" class="flex items-center gap-1">
+                        <Icon name="mdi:check-circle-outline" size="14" :class="rows[employee.id]?.isSiteValid ? 'text-green-600' : 'text-neutral-400'"/>
+                        Validation site : <span :class="rows[employee.id]?.isSiteValid ? 'font-semibold text-green-600' : 'text-neutral-500'">{{ rows[employee.id]?.isSiteValid ? 'Validé' : 'En attente' }}</span>
+                    </span>
+                    <span class="flex items-center gap-1">
+                        <Icon name="mdi:check-circle-outline" size="14" :class="rows[employee.id]?.isValid ? 'text-green-600' : 'text-neutral-400'"/>
+                        Validation RH : <span :class="rows[employee.id]?.isValid ? 'font-semibold text-green-600' : 'text-neutral-500'">{{ rows[employee.id]?.isValid ? 'Validé' : 'En attente' }}</span>
+                    </span>
+                </div>
+
+                <!-- Validation checkbox (admin) -->
+                <div v-if="isAdmin" class="mt-3 flex items-center gap-2 text-sm">
+                    <input
+                        :checked="rows[employee.id]?.isValid ?? false"
+                        type="checkbox"
+                        class="h-4 w-4 cursor-pointer"
+                        @change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
+                    />
+                    <span class="text-neutral-700 font-semibold">Valider</span>
+                </div>
+            </div>
+        </div>
+
+        <!-- Desktop table layout -->
+        <div class="overflow-y-auto min-h-0 hidden lg:block">
             <div
                 class="grid w-full min-w-0 gap-1 border border-black bg-tertiary-500 px-4 py-3 text-sm font-semibold text-black rounded-t-md sticky top-0 z-10"
                 :style="{ gridTemplateColumns: dayGridCols }"
             >
                 <span>Nom</span>
-                <span class="pl-2">Absence</span>
+                <span class="pl-2">Statut</span>
                 <span class="pl-4">Début matin</span>
                 <span class="pr-2">Fin matin</span>
                 <span class="pl-2">Début après-midi</span>
@@ -43,7 +211,9 @@
                         <span class="font-normal text-neutral-600">({{ contractLabel(employee) }})</span>
                     </p>
                     <p class="text-neutral-500 truncate inline-flex items-center gap-2">
-                        <span>{{ employee.site?.name ?? 'Sans site' }}</span>
+                        <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)"
                             class="rounded-full bg-green-500 flex justify-center item-center text-white p-0.5"
@@ -196,6 +366,7 @@
 import type {Employee} from '~/services/dto/employee'
 import TimeSelect from '~/components/ui/TimeSelect.vue'
 import type {HourRow} from './types'
+import { contractNatureLabel } from '~/utils/contract'
 
 const rows = defineModel<Record<number, HourRow>>('rows', {required: true})
 const bulkValidationInput = ref<HTMLInputElement | null>(null)
@@ -234,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,90 @@
 <template>
-  <div class="py-6 flex flex-col gap-3">
-      <div class="flex gap-4">
-          <SiteFilterSelector v-if="sites.length > 0 && isAdmin" v-model="selectedSiteIds" :sites="sites" />
-          <div v-if="isAdmin" class="w-80 max-w-full">
-              <EmployeeNameFilterInput v-model="employeeFilter" />
+  <div class="py-4 flex flex-col gap-3 lg:py-6">
+      <!-- Desktop: filters row -->
+      <div class="hidden lg:flex lg:items-center lg:gap-4">
+          <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">
+              <MalioInputText
+                  v-model="employeeFilter"
+                  label="Recherche d'un employé"
+                  icon-name="mdi:magnify"
+              />
           </div>
       </div>
 
-    <div class="flex justify-between items-center gap-4">
-      <div class="flex gap-4 flex-wrap">
+      <!-- Mobile: search + filter button -->
+      <div v-if="isAdmin" class="flex items-center gap-2 lg:hidden">
+          <div class="flex-1 min-w-0">
+              <MalioInputText
+                  v-model="employeeFilter"
+                  label="Recherche d'un employé"
+                  icon-name="mdi:magnify"
+              />
+          </div>
+          <button
+            type="button"
+            class="flex h-10 w-10 shrink-0 items-center justify-center rounded-md border border-primary-500 bg-white text-primary-500"
+            @click="filtersDrawerOpen = true"
+          >
+              <Icon name="mdi:filter-variant" size="22"/>
+          </button>
+      </div>
+
+      <!-- Mobile filters drawer -->
+      <AppDrawer v-model="filtersDrawerOpen" title="Filtres">
+          <div class="space-y-6">
+              <div v-if="sites.length > 0 && isAdmin">
+                  <label class="text-md font-semibold text-neutral-700">Sites</label>
+                  <div class="mt-2">
+                      <MalioSelectCheckbox
+                          v-model="selectedSiteIds"
+                          :options="siteOptions"
+                          groupClass="w-80"
+                          label="Sites"
+                          display-select-all
+                      />
+                  </div>
+              </div>
+              <div v-if="isAdmin">
+                  <label class="text-md font-semibold text-neutral-700">Vue</label>
+                  <div class="mt-2 inline-flex h-10 w-full overflow-hidden rounded-md border border-primary-500 bg-white">
+                      <button
+                        type="button"
+                        class="flex-1 inline-flex items-center justify-center gap-2 px-4 py-2 text-sm font-semibold"
+                        :class="viewModeButtonClass('day')"
+                        @click="viewMode = 'day'; filtersDrawerOpen = false"
+                      >
+                          <Icon name="mdi:calendar-clock" />
+                          Jour
+                      </button>
+                      <button
+                        type="button"
+                        class="flex-1 inline-flex items-center justify-center gap-2 border-l border-primary-500 px-4 py-2 text-sm font-semibold"
+                        :class="viewModeButtonClass('week')"
+                        @click="viewMode = 'week'; filtersDrawerOpen = false"
+                      >
+                          <Icon name="mdi:calendar-week" />
+                          Semaine
+                      </button>
+                  </div>
+              </div>
+          </div>
+      </AppDrawer>
+
+    <!-- Date navigation -->
+    <div class="flex flex-col gap-3 lg:flex-row lg:justify-between lg:items-center lg:gap-4">
+      <div class="flex flex-col gap-3 lg:flex-row lg:flex-wrap lg:gap-4">
       <div
         v-if="viewMode === 'day'"
-        class="inline-flex h-10 w-[320px] overflow-hidden rounded-md border border-primary-500 bg-white"
+        class="inline-flex h-10 w-full overflow-hidden rounded-md border border-primary-500 bg-white lg:w-[320px]"
       >
         <button
           type="button"
@@ -41,7 +114,7 @@
 
       <div
         v-else
-        class="inline-flex h-10 w-[320px] overflow-hidden rounded-md border border-primary-500 bg-white"
+        class="inline-flex h-10 w-full overflow-hidden rounded-md border border-primary-500 bg-white lg:w-[320px]"
       >
         <button
           type="button"
@@ -70,7 +143,7 @@
       </div>
 
       <PeriodStepperPicker
-        width-class="w-[320px]"
+        width-class="w-full lg:w-[320px]"
         :label="formattedSelectedDate"
         :picker-type="viewMode === 'week' ? 'week' : 'date'"
         :picker-value="pickerValue"
@@ -82,7 +155,8 @@
       />
       </div>
 
-      <div v-if="isAdmin" class="inline-flex h-10 overflow-hidden rounded-md border border-primary-500 bg-white">
+      <!-- Desktop: view mode toggle -->
+      <div v-if="isAdmin" class="hidden lg:inline-flex h-10 overflow-hidden rounded-md border border-primary-500 bg-white">
         <button
           type="button"
           class="inline-flex items-center gap-2 px-4 py-2 text-sm font-semibold active:scale-[0.98] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500/40"
@@ -106,7 +180,7 @@
 
     <div
       v-if="isAdmin && viewMode === 'week' && absenceTypes.length > 0"
-      class="flex flex-wrap items-center gap-6"
+      class="hidden lg:flex flex-wrap items-center gap-6"
     >
       <p class="font-bold">Légende :</p>
       <div v-for="type in absenceTypes" :key="type.id" class="flex items-center gap-2">
@@ -120,9 +194,8 @@
 <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'
 
 const selectedDate = defineModel<string>('selectedDate', { required: true })
@@ -130,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[]
@@ -140,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
@@ -150,6 +225,8 @@ const emit = defineEmits<{
   (e: 'shift-date', value: number): void
 }>()
 
+const filtersDrawerOpen = ref(false)
+
 const pickerValue = computed(() => {
   if (viewMode.value === 'week') return ymdToWeekInputValue(selectedDate.value)
   return selectedDate.value

frontend/components/hours/HoursWeekView.vue

@@ -1,7 +1,72 @@
 <template>
   <div class="bg-white overflow-hidden flex min-h-0 flex-col">
     <div v-if="isWeekLoading" class="p-6 text-md text-neutral-600">Chargement de la semaine...</div>
-    <div v-else class="overflow-y-auto min-h-0">
+
+    <!-- Mobile cards -->
+    <div v-else class="overflow-y-auto min-h-0 space-y-3 lg:hidden">
+      <div
+        v-for="row in weeklySummary?.rows ?? []"
+        :key="'m-' + row.employeeId"
+        class="rounded-md border border-primary-500 bg-white p-4"
+      >
+        <div class="mb-3">
+          <p class="text-md font-bold text-primary-500 truncate">
+            {{ row.firstName }} {{ row.lastName }}
+            <span class="font-normal text-neutral-600 text-sm">({{ row.contractName ?? '-' }})</span>
+          </p>
+          <p class="text-xs text-neutral-500 truncate">
+            {{ row.siteName ?? 'Sans site' }}<span v-if="row.contractNature"> — {{ contractNatureLabel(row.contractNature) }}</span>
+          </p>
+        </div>
+
+        <!-- Daily breakdown -->
+        <div class="mb-3 space-y-1">
+          <div
+            v-for="(daily, i) in row.daily"
+            :key="daily.date"
+            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>
+            <span v-else>J {{ formatMinutes(daily.dayMinutes) }} / N {{ formatMinutes(daily.nightMinutes) }}</span>
+          </div>
+        </div>
+
+        <!-- Weekly totals -->
+        <div class="border-t border-neutral-200 pt-2 grid grid-cols-2 gap-x-4 gap-y-1 text-xs">
+          <div class="flex justify-between">
+            <span class="text-neutral-500">Total sem.</span>
+            <span class="font-bold text-primary-500">{{ row.trackingMode === 'PRESENCE' ? (row.weeklyPresenceCount ?? 0) : formatMinutes(row.weeklyTotalMinutes) }}</span>
+          </div>
+          <div class="flex justify-between">
+            <span class="text-neutral-500">H. supp.</span>
+            <span class="font-bold text-primary-500">{{ row.trackingMode === 'PRESENCE' ? '-' : formatMinutes(row.weeklyOvertimeTotalMinutes ?? 0) }}</span>
+          </div>
+          <div v-if="row.trackingMode !== 'PRESENCE' && !isInterimContract(row.contractType)" class="flex justify-between">
+            <span class="text-neutral-500">+25%</span>
+            <span class="font-bold text-primary-500">{{ formatMinutes(row.weeklyOvertime25Minutes ?? 0) }}</span>
+          </div>
+          <div v-if="row.trackingMode !== 'PRESENCE' && !isInterimContract(row.contractType)" class="flex justify-between">
+            <span class="text-neutral-500">+50%</span>
+            <span class="font-bold text-primary-500">{{ formatMinutes(row.weeklyOvertime50Minutes ?? 0) }}</span>
+          </div>
+          <div v-if="row.trackingMode !== 'PRESENCE' && !isInterimContract(row.contractType)" class="flex justify-between">
+            <span class="text-neutral-500">Récup.</span>
+            <span class="font-bold text-primary-500">{{ formatMinutes(row.weeklyRecoveryMinutes ?? 0) }}</span>
+          </div>
+          <div v-if="(row.weeklyNightBasketCount ?? 0) > 0" class="flex justify-between">
+            <span class="text-neutral-500">Panier nuit</span>
+            <span class="font-bold text-primary-500">{{ row.weeklyNightBasketCount }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Desktop table -->
+    <div v-if="!isWeekLoading" class="overflow-y-auto min-h-0 hidden lg:block">
       <div
         class="grid w-full min-w-0 gap-1 border border-black bg-tertiary-500 px-4 py-3 text-sm font-semibold text-black rounded-t-md sticky top-0 z-10"
         :style="{ gridTemplateColumns: weekGridCols }"
@@ -29,7 +94,12 @@
             {{ row.firstName }} {{ row.lastName }}
             <span class="font-normal text-neutral-600">({{ row.contractName ?? '-' }})</span>
           </p>
-          <p class="text-[11px] text-neutral-500 truncate">{{ row.siteName ?? 'Sans site' }}</p>
+          <p class="text-[11px] text-neutral-500 truncate inline-flex items-center gap-2">
+            <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>
 
         <div
@@ -38,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>
@@ -81,24 +151,43 @@
 <script setup lang="ts">
 import type { WeeklyWorkHourSummary } from '~/services/dto/work-hour'
 import { CONTRACT_TYPES, type ContractType } from '~/services/dto/contract'
+import { contractNatureLabel } from '~/utils/contract'
 
 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
-  return { backgroundColor: daily.absenceColor || '#dc2626' }
+  if (daily.hasAbsence) 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/components/ui/TimeSelect.vue

@@ -23,7 +23,7 @@
       <button
         type="button"
         tabindex="-1"
-        class="inline-flex h-8 w-8 items-center justify-center rounded text-neutral-600 hover:bg-tertiary-500 disabled:cursor-not-allowed disabled:bg-neutral-200 disabled:text-neutral-500"
+        class="hidden lg:inline-flex h-8 w-8 items-center justify-center rounded text-neutral-600 hover:bg-tertiary-500 disabled:cursor-not-allowed disabled:bg-neutral-200 disabled:text-neutral-500"
         :disabled="props.disabled"
         @mousedown.prevent
         @click="toggleOpen"
@@ -149,8 +149,11 @@ const toggleOpen = () => {
   }
 }
 
+const isMobile = () => window.innerWidth < 1024
+
 const openMenu = () => {
   if (props.disabled) return
+  if (isMobile()) return
   if (!isOpen.value) {
     isOpen.value = true
     nextTick(updateMenuPosition)
@@ -165,8 +168,28 @@ const closeMenu = () => {
   isOpen.value = false
 }
 
+const snapToNearest15 = (time: string): string => {
+  const [h, m] = time.split(':').map(Number)
+  const snapped = Math.round(m / 15) * 15
+  if (snapped === 60) {
+    const newH = h + 1
+    if (newH > 23) return '23:45'
+    return `${String(newH).padStart(2, '0')}:00`
+  }
+  return `${String(h).padStart(2, '0')}:${String(snapped).padStart(2, '0')}`
+}
+
 const commitInput = () => {
-  const normalized = normalizeTypedTime(inputValue.value)
+  let value = inputValue.value
+  if (isMobile()) {
+    value = clampTime(value)
+    const normalized = normalizeTypedTime(value)
+    if (normalized !== null && normalized !== '') {
+      value = snapToNearest15(normalized)
+    }
+    inputValue.value = value
+  }
+  const normalized = normalizeTypedTime(value)
   if (normalized === null || (normalized !== '' && !timeSlots.value.includes(normalized))) {
     emit('update:modelValue', '')
     inputValue.value = ''
@@ -184,13 +207,26 @@ const onInput = (event: Event) => {
   if (masked !== inputValue.value) {
     inputValue.value = masked
   }
-  openMenu()
+  if (!isMobile()) {
+    openMenu()
+  }
+}
+
+const clampTime = (value: string): string => {
+  const normalized = normalizeTypedTime(value)
+  if (normalized === null || normalized === '') return value
+  const [h, m] = normalized.split(':').map(Number)
+  if (h > 23 || (h === 23 && m > 45)) return '23:45'
+  return normalized
 }
 
 const onInputBlur = () => {
   // Laisse le temps au click menu de passer avant fermeture.
   setTimeout(() => {
     if (menu.value?.contains(document.activeElement)) return
+    if (isMobile()) {
+      inputValue.value = clampTime(inputValue.value)
+    }
     commitInput()
   }, 50)
 }

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/useEmployeeContract.ts

@@ -4,6 +4,7 @@ import type { ContractHistoryItem, Employee } from '~/services/dto/employee'
 import { listContracts } from '~/services/contracts'
 import { updateEmployee } from '~/services/employees'
 import { createSuspension, updateSuspension } from '~/services/contractSuspensions'
+import { listInterimAgencies, type InterimAgency } from '~/services/interim-agencies'
 import { formatNullableYmdToFr, getTodayYmd, shiftYmd } from '~/utils/date'
 import { contractNatureLabel, formatWorkDaysHoursSummary, isContractNature, requiresContractEndDate, requiresWorkDaysHours, showsContractEndDate } from '~/utils/contract'
 
@@ -17,6 +18,7 @@ type SuspensionForm = {
 export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
   const toast = useToast()
   const contracts = ref<Contract[]>([])
+  const interimAgencies = ref<InterimAgency[]>([])
   const isContractDrawerOpen = ref(false)
   const isContractSubmitting = ref(false)
   const isCreateContractDrawerOpen = ref(false)
@@ -46,7 +48,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     startDate: '',
     endDate: '',
     isDriver: false,
-    workDaysHours: null as Record<number, number> | null
+    workDaysHours: null as Record<number, number> | null,
+    interimAgencyId: '' as number | ''
   })
 
   const createValidationTouched = reactive({
@@ -207,6 +210,7 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     createContractForm.endDate = ''
     createContractForm.isDriver = false
     createContractForm.workDaysHours = null
+    createContractForm.interimAgencyId = ''
     createContractForm.startDate = editableContractPeriod.value?.endDate
       ? (shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate)
       : getTodayYmd()
@@ -283,7 +287,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
         contractStartDate: createContractForm.startDate,
         contractEndDate: createContractForm.endDate || null,
         isDriverInput: createContractForm.isDriver,
-        workDaysHoursInput: requiresCreateWorkDaysHours.value ? createContractForm.workDaysHours : null
+        workDaysHoursInput: requiresCreateWorkDaysHours.value ? createContractForm.workDaysHours : null,
+        interimAgencyId: createContractForm.contractNature === 'INTERIM' && createContractForm.interimAgencyId !== '' ? Number(createContractForm.interimAgencyId) : null
       })
       isCreateContractDrawerOpen.value = false
       await reloadEmployee()
@@ -335,6 +340,16 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     contracts.value = await listContracts()
   }
 
+  const loadInterimAgencies = async () => {
+    interimAgencies.value = await listInterimAgencies()
+  }
+
+  watch(() => createContractForm.contractNature, (nature) => {
+    if (nature !== 'INTERIM') {
+      createContractForm.interimAgencyId = ''
+    }
+  })
+
   watch(showsCreateContractEndDate, (shows) => {
     if (!shows) {
       createContractForm.endDate = ''
@@ -386,6 +401,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     submitSuspension,
     addSuspensionForm,
     currentActiveContractPeriodId,
-    loadContracts
+    interimAgencies,
+    loadContracts,
+    loadInterimAgencies
   }
 }

frontend/composables/useEmployeeDetailPage.ts

@@ -10,10 +10,11 @@ export const useEmployeeDetailPage = () => {
 
   const showLeaveTab = computed(() => employee.value?.currentContractNature !== 'INTERIM')
   const showRttTab = computed(() => employee.value?.contract?.type !== CONTRACT_TYPES.FORFAIT)
+  const isForfait = computed(() => employee.value?.contract?.type === 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 || '-'
   })
@@ -55,6 +56,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
@@ -63,6 +67,13 @@ export const useEmployeeDetailPage = () => {
 
   const contract = useEmployeeContract(employee, loadEmployee)
   const leave = useEmployeeLeave(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)
   const mileage = useEmployeeMileage(employee, loadEmployee)
   const formation = useEmployeeFormation(employee, loadEmployee)
@@ -86,7 +97,7 @@ export const useEmployeeDetailPage = () => {
   })
 
   onMounted(async () => {
-    await contract.loadContracts()
+    await Promise.all([contract.loadContracts(), contract.loadInterimAgencies()])
     await loadEmployee()
   })
 
@@ -97,6 +108,7 @@ export const useEmployeeDetailPage = () => {
     showLeaveTab,
     showRttTab,
     employeeContractWorkLabel,
+    forfaitRemainingDaysLabel,
     ...contract,
     ...leave,
     ...rtt,

frontend/composables/useEmployeeLeave.ts

@@ -7,27 +7,91 @@ import { listAbsences } from '~/services/absences'
 import { getEmployeeLeaveSummary, updateFractionedDays, updatePaidLeaveDays } from '~/services/employee-leave-summary'
 import { listPublicHolidays } from '~/services/public-holidays'
 
+export type LeaveYearOption = {
+  value: number
+  label: string
+}
+
 export const useEmployeeLeave = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
   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 now = new Date()
-    const isForfait = employee.value?.contract?.type === CONTRACT_TYPES.FORFAIT
-    return isForfait
-      ? now.getFullYear()
-      : (now.getMonth() >= 5 ? now.getFullYear() + 1 : now.getFullYear())
+  const isForfaitContract = (emp: Employee | null) =>
+    emp?.contract?.type === CONTRACT_TYPES.FORFAIT
+
+  const computeLeaveYearForDate = (emp: Employee | null, date: Date): number => {
+    if (isForfaitContract(emp)) return date.getFullYear()
+    return date.getMonth() >= 5 ? date.getFullYear() + 1 : date.getFullYear()
+  }
+
+  const currentLeaveYear = computed<number | null>(() => {
+    if (!employee.value) return null
+    return computeLeaveYearForDate(employee.value, 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 || currentLeaveYear.value === null) return []
+    const isForfait = isForfaitContract(employee.value)
+    const current = currentLeaveYear.value
+
+    const startDates: string[] = []
+    for (const period of employee.value.contractHistory ?? []) {
+      if (period.startDate) startDates.push(period.startDate)
+    }
+    if (employee.value.entryDate) startDates.push(employee.value.entryDate)
+
+    let contractFloor = current
+    for (const raw of startDates) {
+      const date = new Date(`${raw.substring(0, 10)}T00:00:00`)
+      if (Number.isNaN(date.getTime())) continue
+      const leaveYear = computeLeaveYearForDate(employee.value, date)
+      if (leaveYear < contractFloor) contractFloor = leaveYear
+    }
+
+    // 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(employee.value, dataStartDate)
+      }
+    }
+
+    const minYear = dataFloor !== null ? Math.max(contractFloor, dataFloor) : contractFloor
+
+    const years: LeaveYearOption[] = []
+    for (let y = current; 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 leaveYear = getLeaveYear()
+      const isForfait = isForfaitContract(employee.value)
+      const leaveYear = selectedLeaveYear.value
       const from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01`
       const to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31`
       const holidayYears = isForfait ? [leaveYear] : [leaveYear - 1, leaveYear]
@@ -46,8 +110,16 @@ 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
   }
 
   const submitFractionedDays = async (days: number) => {
@@ -70,6 +142,10 @@ export const useEmployeeLeave = (employee: Ref<Employee | null>, reloadEmployee:
     publicHolidays,
     isLeaveLoading,
     leaveDataLoaded,
+    selectedLeaveYear,
+    currentLeaveYear,
+    availableLeaveYears,
+    setSelectedLeaveYear,
     loadLeaveData,
     resetLoaded,
     submitFractionedDays,

frontend/composables/useEmployeeRtt.ts

@@ -3,25 +3,94 @@ 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 type RttYearOption = {
+  value: number
+  label: string
+}
+
 export const useEmployeeRtt = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
   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 || currentRttYear.value === null) return []
+    const current = currentRttYear.value
+
+    const startDates: string[] = []
+    for (const period of employee.value.contractHistory ?? []) {
+      if (period.startDate) startDates.push(period.startDate)
+    }
+    if (employee.value.entryDate) startDates.push(employee.value.entryDate)
+
+    let contractFloor = current
+    for (const raw of startDates) {
+      const date = new Date(`${raw.substring(0, 10)}T00:00:00`)
+      if (Number.isNaN(date.getTime())) continue
+      const rttYear = computeRttYearForDate(date)
+      if (rttYear < contractFloor) contractFloor = rttYear
+    }
+
+    // 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(contractFloor, dataFloor) : contractFloor
+
+    const years: RttYearOption[] = []
+    for (let y = current; 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(employee.value.id, rttYear)
+      rttSummary.value = await getEmployeeRttSummary(employee.value.id, selectedRttYear.value)
       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
   }
 
   const submitRttPayment = async (month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number) => {
@@ -35,6 +104,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.' },
+        ],
+      },
     ],
   },
   {
@@ -207,10 +218,10 @@ export const documentationSections: DocSection[] = [
       },
       {
         id: 'gestion-types-absence',
-        title: 'Gestion des types d\'absence',
+        title: 'Gestion des types de statut',
         requiredLevel: 'admin',
         blocks: [
-          { type: 'paragraph', content: 'Les types d\'absence définissent les catégories disponibles lors de la pose d\'une absence.' },
+          { type: 'paragraph', content: 'Les types de statut définissent les catégories disponibles lors de la pose d\'une absence.' },
           { type: 'list', content: 'Code : identifiant court (max 10 caractères), ex: C, M, AT\nLibellé : nom affiché, ex: Congé, Maladie, Accident du travail\nCouleur : code couleur pour le calendrier et la vue jour\nOption "Compté comme travaillé" : si activé, l\'absence crédite des heures en mode TIME' },
           { type: 'note', content: 'L\'option "Compté comme travaillé" impacte le calcul des heures supplémentaires. En mode TIME, les minutes sont créditées selon le contrat. En mode PRESENCE, aucun crédit n\'est appliqué.' },
         ],
@@ -258,7 +269,7 @@ export const documentationSections: DocSection[] = [
         requiredLevel: 'admin',
         blocks: [
           { type: 'paragraph', content: 'La création d\'un employé se fait via le drawer d\'ajout.' },
-          { type: 'list', content: 'Champs : prénom, nom, site\nNature du contrat : CDI, CDD ou INTERIM\nType de contrat / temps de travail (Forfait, 35h, 39h, etc.)\nDate de début (obligatoire)\nDate de fin (obligatoire pour CDD et INTERIM)' },
+          { type: 'list', content: 'Champs : prénom, nom, site\nNature du contrat : CDI, CDD ou INTERIM\nAgence d\'intérim (visible uniquement pour INTERIM, optionnel)\nType de contrat / temps de travail (Forfait, 35h, 39h, etc.)\nDate de début (obligatoire)\nDate de fin (obligatoire pour CDD et INTERIM)' },
         ],
       },
       {
@@ -331,7 +342,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' },
         ],
       },
       {
@@ -387,7 +398,9 @@ export const documentationSections: DocSection[] = [
         requiredLevel: 'admin',
         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\nFiltres par site et par employé\nNavigation par mois (précédent / suivant)' },
+          { 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.' },
         ],
       },
     ],
@@ -444,6 +457,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',
@@ -479,6 +503,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).' },
         ],
       },
       {
@@ -490,6 +515,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',
@@ -567,7 +601,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)' },
         ],
       },
       {
@@ -585,7 +619,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

@@ -1,11 +1,40 @@
 <template>
     <div class="h-screen overflow-hidden">
         <div class="flex h-full">
-            <aside class="flex h-full w-64 flex-shrink-0 flex-col border-r border-neutral-200 bg-tertiary-500">
-                <div class="h-[75px]">
+            <!-- Mobile overlay -->
+            <Transition
+                enter-active-class="transition-opacity duration-300"
+                enter-from-class="opacity-0"
+                enter-to-class="opacity-100"
+                leave-active-class="transition-opacity duration-300"
+                leave-from-class="opacity-100"
+                leave-to-class="opacity-0"
+            >
+                <div
+                    v-if="sidebarOpen"
+                    class="fixed inset-0 z-40 bg-black/50 lg:hidden"
+                    @click="sidebarOpen = false"
+                />
+            </Transition>
+
+            <!-- Sidebar -->
+            <aside
+                :class="[
+                    'fixed inset-y-0 left-0 z-50 flex w-64 flex-col border-r border-neutral-200 bg-tertiary-500 transition-transform duration-300 lg:static lg:translate-x-0 lg:flex-shrink-0',
+                    sidebarOpen ? 'translate-x-0' : '-translate-x-full'
+                ]"
+            >
+                <div class="flex h-[75px] items-center justify-between">
                     <img src="/malio.png" alt="Logo" class="w-auto"/>
+                    <button
+                        type="button"
+                        class="mr-3 rounded-md p-1 text-primary-500 hover:text-secondary-500 lg:hidden"
+                        @click="sidebarOpen = false"
+                    >
+                        <Icon name="mdi:close" size="24"/>
+                    </button>
                 </div>
-                <nav class="flex-1 px-4 pb-6">
+                <nav class="flex-1 overflow-y-auto px-4 pb-6">
                     <template v-if="isAdmin">
                         <NuxtLink
                             to="/calendar"
@@ -13,6 +42,7 @@
                             :class="route.path.startsWith('/calendar')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:calendar-blank" size="24"/>
                             <p>Calendrier</p>
@@ -26,6 +56,7 @@
                             route.path.startsWith('/hours') ? 'bg-tertiary-500 text-primary-500 font-bold' : '',
                             !isAdmin ? 'border-t border-secondary-500 pt-3' : ''
                         ]"
+                        @click="closeSidebarOnMobile"
                     >
                         <Icon name="mdi:clock-time-four-outline" size="24"/>
                         <p>Heures</p>
@@ -38,6 +69,7 @@
                             route.path.startsWith('/driver-hours') ? 'bg-tertiary-500 text-primary-500 font-bold' : '',
                             !isAdmin && isDriver ? 'border-t border-secondary-500 pt-3' : ''
                         ]"
+                        @click="closeSidebarOnMobile"
                     >
                         <Icon name="mdi:truck-outline" size="24"/>
                         <p>Heures Conducteurs</p>
@@ -49,6 +81,7 @@
                             :class="route.path.startsWith('/employees')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:account-group-outline" size="24"/>
                             <p>Employés</p>
@@ -60,6 +93,7 @@
                             :class="route.path.startsWith('/leave-recap')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:beach" size="24"/>
                             <p>Récap. congés</p>
@@ -70,6 +104,7 @@
                             :class="route.path.startsWith('/sites')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:business" size="24"/>
                             <p>Sites</p>
@@ -80,9 +115,10 @@
                             :class="route.path.startsWith('/absence-types')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:umbrella-beach-outline" size="24"/>
-                            <p>Types d'absence</p>
+                            <p>Types de statut</p>
                         </NuxtLink>
                         <NuxtLink
                             to="/users"
@@ -90,6 +126,7 @@
                             :class="route.path.startsWith('/users')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                            @click="closeSidebarOnMobile"
                         >
                             <Icon name="mdi:account-outline" size="24"/>
                             <p>Utilisateurs</p>
@@ -100,6 +137,7 @@
                         to="/leave-recap"
                         class="flex items-center gap-2 py-3 text-md text-black hover:bg-tertiary-500 hover:text-primary-500 pt-3"
                         :class="route.path.startsWith('/leave-recap') ? 'bg-tertiary-500 text-primary-500 font-bold' : ''"
+                        @click="closeSidebarOnMobile"
                     >
                         <Icon name="mdi:beach" size="24"/>
                         <p>Récap. congés</p>
@@ -111,6 +149,7 @@
                         :class="route.path.startsWith('/audit-logs')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                        @click="closeSidebarOnMobile"
                     >
                         <Icon name="mdi:clipboard-text-clock-outline" size="24"/>
                         <p>Journal</p>
@@ -121,6 +160,7 @@
                         :class="route.path.startsWith('/documentation')
                             ? 'bg-tertiary-500 text-primary-500 font-bold'
                             : ''"
+                        @click="closeSidebarOnMobile"
                     >
                         <Icon name="mdi:book-open-page-variant-outline" size="24"/>
                         <p>Documentation</p>
@@ -132,9 +172,9 @@
                 </div>
             </aside>
 
-            <div class="h-full flex-1 overflow-hidden flex flex-col">
-                <AppTopNav :user="auth.user" />
-                <main class="flex-1 overflow-y-auto px-8 py-12">
+            <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 [scrollbar-gutter:stable] px-4 py-6 lg:px-8 lg:py-12">
                     <slot/>
                 </main>
             </div>
@@ -150,4 +190,9 @@ const isSuperAdmin = computed(() => auth.user?.roles?.includes('ROLE_SUPER_ADMIN
 const isDriver = computed(() => auth.user?.isDriver ?? false)
 const hasLeaveRecapAccess = computed(() => auth.user?.hasLeaveRecapAccess ?? false)
 const route = useRoute()
+const sidebarOpen = ref(false)
+
+const closeSidebarOnMobile = () => {
+    sidebarOpen.value = false
+}
 </script>

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

@@ -1,14 +1,13 @@
 <template>
   <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 d'absence</h1>
-      <button
-        type="button"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+      <h1 class="text-4xl font-bold text-primary-500">Types de statut</h1>
+      <MalioButton
+        label="Ajouter un type"
+        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>
-          <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"
-            maxlength="10"
-            :class="codeFieldClass"
-          />
-          <p v-if="showCodeError" class="mt-1 text-sm text-red-600">
-            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"
-            :class="labelFieldClass"
-          />
-          <p v-if="showLabelError" class="mt-1 text-sm text-red-600">
-            Le libellé est obligatoire.
-          </p>
-        </div>
+        <MalioInputText
+          v-model="form.code"
+          label="Code *"
+          group-class="mt-2"
+          :max-length="10"
+          :error="showCodeError ? 'Le code est obligatoire.' : ''"
+        />
+        <MalioInputText
+          v-model="form.label"
+          label="Libellé *"
+          group-class="mt-2"
+          :error="showLabelError ? 'Le libellé est obligatoire.' : ''"
+        />
         <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">
-              <input
-                v-model="form.countAsWorkedHours"
-                type="radio"
-                class="h-4 w-4"
-                :value="true"
-              />
-              Oui
-            </label>
-            <label class="inline-flex items-center gap-2 text-md text-neutral-800">
-              <input
-                v-model="form.countAsWorkedHours"
-                type="radio"
-                class="h-4 w-4"
-                :value="false"
-              />
-              Non
-            </label>
+            <MalioRadioButton
+              v-model="form.countAsWorkedHours"
+              name="countAsWorkedHours"
+              :value="true"
+              label="Oui"
+              group-class="w-auto mt-0"
+            />
+            <MalioRadioButton
+              v-model="form.countAsWorkedHours"
+              name="countAsWorkedHours"
+              :value="false"
+              label="Non"
+              group-class="w-auto mt-0"
+            />
           </div>
         </div>
         <div>
@@ -130,32 +109,29 @@
           </p>
         </div>
         <div v-if="editingType" class="grid grid-cols-2 gap-3 pt-2">
-          <button
-            type="button"
-            class="flex items-center justify-center rounded-md bg-red-500 px-4 py-2 text-md font-semibold text-white hover:bg-red-600"
+          <MalioButton
+            label="Supprimer"
+            variant="danger"
+            button-class="w-full"
             @click="confirmDelete(editingType)"
-          >
-            Supprimer
-          </button>
-          <button
+          />
+          <MalioButton
             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"
-            :class="submitButtonClass"
-          >
-            Modifier
-          </button>
+            label="Modifier"
+            button-class="w-full"
+            :disabled="isSubmitting || !isFormValid"
+          />
         </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"
-            :class="submitButtonClass"
-          >
-            + Ajouter
-          </button>
+            label="Valider"
+            button-class="w-[200px]"
+            :disabled="isSubmitting || !isFormValid"
+          />
         </div>
       </form>
-    </AppDrawer>
+    </MalioDrawer>
   </div>
 </template>
 
@@ -164,7 +140,7 @@ import type { AbsenceType } from '~/services/dto/absence-type'
 import { createAbsenceType, deleteAbsenceType, listAbsenceTypes, updateAbsenceType } from '~/services/absence-types'
 
 useHead({
-    title: 'Types d\'absences'
+    title: 'Types de statut'
 })
 
 const isDrawerOpen = ref(false)
@@ -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">
-                    <SiteFilterSelector v-model="selectedSiteIds" :sites="sites"/>
-                </div>
+                    <MalioSelectCheckbox
+                        v-model="selectedSiteIds"
+                        :options="siteOptions"
+                        label="Sites"
+                        groupClass="relative z-50 w-80 h-10"
+                        display-select-all
+                    />
                 <div class="flex gap-4">
-                    <button
-                        type="button"
-                        class="h-10 rounded-lg bg-primary-500 px-4 text-md font-semibold text-white hover:bg-secondary-500"
+                    <MalioButton
+                        label="Ajouter une absence"
+                        icon-name="mdi:plus"
+                        icon-position="left"
                         @click="openCreateFromToday"
-                    >
-                        + Ajouter une absence
-                    </button>
-                    <button
-                        type="button"
-                        class="h-10 rounded-lg bg-primary-500 px-4 text-md font-semibold text-white hover:bg-secondary-500"
+                    />
+                    <MalioButton
+                        label="Imprimer"
+                        variant="secondary"
+                        icon-name="mdi:printer"
+                        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() ?? ''
@@ -490,14 +512,15 @@ const hasFormationOn = (employeeId: number, date: string): boolean => {
     return cellFormationMap.value.has(`${employeeId}-${date}`)
 }
 
-// Jours fériés (interdit pour la création).
+// Jours fériés.
 const isHolidayDate = (date: string) => {
     return Boolean(publicHolidays.value[date])
 }
 
-// Renvoie l'absence effective pour une cellule (ou un "Férié").
+// Renvoie l'absence effective pour une cellule (ou un "Férié" si pas d'absence).
 const getCellAbsence = (employeeId: number, date: string) => {
-    if (isHolidayDate(date)) {
+    const absence = cellAbsenceMap.value.get(`${employeeId}-${date}`)
+    if (!absence && isHolidayDate(date)) {
         return {
             id: 0,
             code: 'Férié',
@@ -505,7 +528,6 @@ const getCellAbsence = (employeeId: number, date: string) => {
             textColor: '#0f172a'
         }
     }
-    const absence = cellAbsenceMap.value.get(`${employeeId}-${date}`)
     if (absence) return { ...absence, hasFormation: hasFormationOn(employeeId, date) }
     if (hasFormationOn(employeeId, date)) {
         return {
@@ -549,11 +571,6 @@ const getCellInfo = (employeeId: number, date: string) => {
 
 // Ouverture du drawer depuis une cellule.
 const openCreate = (employee: Employee, date: string) => {
-    if (isHolidayDate(date)) {
-        window.alert("Impossible de creer une absence un jour ferie.")
-        return
-    }
-
     const existing = absences.value.find((absence) => {
         const start = normalizeDate(absence.startDate)
         const end = normalizeDate(absence.endDate)
@@ -590,10 +607,6 @@ const openCreateFromToday = () => {
     form.typeId = ''
     const now = new Date()
     const today = toYmd(now.getFullYear(), now.getMonth(), now.getDate())
-    if (isHolidayDate(today)) {
-        window.alert("Impossible de creer une absence un jour ferie.")
-        return
-    }
     form.startDate = today
     form.endDate = today
     form.startHalf = 'AM'

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>
 
@@ -108,6 +111,18 @@
             @delete="deleteAbsenceFromDrawer"
             @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>
 
@@ -168,6 +183,7 @@ const {
   getRowMetrics,
   getRowAbsenceLabel,
   getRowAbsenceStyle,
+  getRowContractNature,
   getRowUpdatedAt,
   openAbsenceDrawer,
   submitAbsence,
@@ -176,7 +192,11 @@ const {
   formatMinutes,
   isSelectedDateHoliday,
   selectedHolidayLabel,
-  handleSave
+  handleSave,
+  isWeekCommentDrawerOpen,
+  weekCommentContext,
+  openWeekCommentDrawer,
+  reloadWeeklySummary
 } = useDriverHoursPage()
 
 useHead({

frontend/pages/employees/[id].vue

@@ -17,7 +17,7 @@
                         <h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
                         <button
                             class="inline-flex items-center justify-center rounded-md p-1 transition-colors duration-150 focus:outline-none focus-visible:ring-2 bg-primary-500 hover:bg-secondary-500 active:bg-primary-500 text-white cursor-pointer"
-                            title="Export heures annuelles"
+                            title="Export heures"
                             @click="isYearlyHoursDrawerOpen = true"
                         >
                             <Icon name="mdi:printer" size="24" />
@@ -26,7 +26,7 @@
                     <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>
@@ -148,6 +148,7 @@
                     :on-submit-suspension="submitSuspension"
                     :on-add-suspension-form="addSuspensionForm"
                     :current-contract-period-id="currentActiveContractPeriodId"
+                    :interim-agencies="interimAgencies"
                 />
                 <div v-else-if="showLeaveTab && activeTab === 'leave'" class="h-full">
                     <div v-if="isLeaveLoading" class="mt-6 rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
@@ -159,15 +160,28 @@
                         :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"
+                        @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">
@@ -252,10 +266,19 @@ const {
     leaveSummary,
     rttSummary,
     publicHolidays,
+    selectedLeaveYear,
+    currentLeaveYear,
+    availableLeaveYears,
+    setSelectedLeaveYear,
+    selectedRttYear,
+    currentRttYear,
+    availableRttYears,
+    setSelectedRttYear,
     showLeaveTab,
     showRttTab,
     contractHistory,
     employeeContractWorkLabel,
+    forfaitRemainingDaysLabel,
     contractForm,
     createContractForm,
     isContractDrawerOpen,
@@ -295,6 +318,7 @@ const {
     submitSuspension,
     addSuspensionForm,
     currentActiveContractPeriodId,
+    interimAgencies,
     isLeaveLoading,
     isRttLoading,
     mileageAllowances,
@@ -321,9 +345,10 @@ const {
     submitDeleteObservation
 } = useEmployeeDetailPage()
 
-const handleYearlyHoursPrint = async (year: number) => {
+const handleYearlyHoursPrint = async (payload: { year: number; month: number | null }) => {
     if (!employee.value) return
-    await printPdf(`/yearly-hours/print?employeeId=${employee.value.id}&year=${year}`)
+    const monthParam = null !== payload.month ? `&month=${payload.month}` : ''
+    await printPdf(`/yearly-hours/print?employeeId=${employee.value.id}&year=${payload.year}${monthParam}`)
     isYearlyHoursDrawerOpen.value = false
 }
 

frontend/pages/employees/index.vue

@@ -4,42 +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
-                        type="button"
-                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
-                        @click="handleLeaveRecapPrint"
-                    >
-                        Export récap. congés
-                    </button>
-                    <button
-                        type="button"
-                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
-                        @click="isSalaryRecapOpen = true"
-                    >
-                        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"
+                    <MalioButton
+                        label="Export"
+                        variant="secondary"
+                        icon-name="mdi:download"
+                        icon-position="left"
+                        @click="openExportDrawer"
+                    />
+                    <MalioButton
+                        label="Ajouter un employé"
+                        icon-name="mdi:plus"
+                        icon-position="left"
                         @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"/>
-                <select
+                <div v-if="sites.length > 0" class="relative z-50 w-80">
+                    <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"
-                >
-                    <option value="active">Avec contrat</option>
-                    <option value="inactive">Sans contrat</option>
-                    <option value="all">Tous</option>
-                </select>
+                    label="Statut contrat"
+                    :options="contractStatusOptions"
+                    group-class="w-40"
+                />
             </div>
         </div>
 
@@ -72,7 +75,7 @@
                     class="absolute inset-0 flex items-center justify-center bg-primary-500 p-4 text-white opacity-0 transition-opacity duration-200 group-hover:opacity-100">
                     <div class="w-full rounded-md bg-white/15 p-4 text-sm">
                         <p class="text-base font-semibold">{{ employee.lastName }} {{ employee.firstName }}</p>
-                        <p><strong>Type:</strong> {{ contractNatureLabel(employee.currentContractNature) }}</p>
+                        <p><strong>Type:</strong> {{ employee.currentInterimAgencyName ? `${contractNatureLabel(employee.currentContractNature)} (${employee.currentInterimAgencyName})` : contractNatureLabel(employee.currentContractNature) }}</p>
                         <p><strong>Temps de travail:</strong> {{ employee.contract?.name ?? '-' }}</p>
                         <p><strong>Site:</strong> {{ employee.site?.name ?? '-' }}</p>
                         <p><strong>Date d'entrée :</strong> {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
@@ -81,90 +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>
-                    <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"
-                        :class="firstNameFieldClass"
-                    />
-                    <p v-if="showFirstNameError" class="mt-1 text-sm text-red-600">
-                        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"
-                        :class="lastNameFieldClass"
-                    />
-                    <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>
+                <MalioInputText
+                    v-model="form.firstName"
+                    label="Prénom *"
+                    group-class="mt-2"
+                    :error="showFirstNameError ? 'Le prénom est obligatoire.' : ''"
+                />
+                <MalioInputText
+                    v-model="form.lastName"
+                    label="Nom *"
+                    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) }"
+                />
                 <template v-if="!editingEmployee">
-                    <div>
-                        <label class="text-md font-semibold text-neutral-700" for="contract-nature">
-                            Type de contrat <span class="text-red-600">*</span>
-                        </label>
-                        <select
-                            id="contract-nature"
-                            v-model="form.contractNature"
-                            :class="contractNatureFieldClass"
-                        >
-                            <option value="CDI">CDI</option>
-                            <option value="CDD">CDD</option>
-                            <option value="INTERIM">Intérim</option>
-                        </select>
-                        <p v-if="showContractNatureError" class="mt-1 text-sm text-red-600">
-                            Le type de contrat est obligatoire.
-                        </p>
-                    </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>
+                    <MalioSelect
+                        :model-value="form.contractNature"
+                        :options="contractNatureFormOptions"
+                        label="Type de contrat *"
+                        min-width=""
+                        :error="showContractNatureError ? 'Le type de contrat est obligatoire.' : ''"
+                        @update:model-value="(v) => { if (v !== null) form.contractNature = v as 'CDI' | 'CDD' | 'INTERIM' }"
+                    />
+                    <MalioSelect
+                        v-if="form.contractNature === 'INTERIM'"
+                        :model-value="form.interimAgencyId === '' ? null : form.interimAgencyId"
+                        :options="interimAgencyOptions"
+                        label="Agence d'intérim"
+                        min-width=""
+                        @update:model-value="(v) => { form.interimAgencyId = v === null ? '' : Number(v) }"
+                    />
+                    <MalioSelect
+                        :model-value="form.contractId === '' ? null : form.contractId"
+                        :options="contractFormOptions"
+                        label="Temps de travail *"
+                        min-width=""
+                        :error="showContractError ? 'Le temps de travail est obligatoire.' : ''"
+                        @update:model-value="(v) => { form.contractId = v === null ? '' : Number(v) }"
+                    />
                     <div>
                         <label class="text-md font-semibold text-neutral-700" for="contract-start-date">
                             Début contrat <span class="text-red-600">*</span>
@@ -173,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.
@@ -188,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.
+                            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">
-                        <label class="inline-flex items-center gap-2 text-md font-semibold text-neutral-700" for="is-driver">
-                            <input
-                                id="is-driver"
-                                v-model="form.isDriver"
-                                type="checkbox"
-                                class="h-4 w-4 rounded border-neutral-300 text-primary-500 focus:ring-primary-500"
-                            />
-                            Chauffeur
-                        </label>
+                    <div class="flex h-10 items-center rounded-md border border-neutral-200 bg-neutral-50 px-3">
+                        <MalioCheckbox
+                            v-model="form.isDriver"
+                            label="Chauffeur"
+                            group-class="flex items-center"
+                        />
                     </div>
                     <WorkDaysHoursInput
                         v-if="requiresSchedule"
@@ -212,28 +174,72 @@
                     />
                 </template>
                 <div class="flex justify-end gap-3 pt-2">
-                    <button
-                        type="button"
-                        class="rounded-lg border border-neutral-200 px-4 py-2 text-md font-semibold text-neutral-700 hover:bg-neutral-100"
+                    <MalioButton
+                        label="Annuler"
+                        variant="tertiary"
                         @click="isDrawerOpen = false"
-                    >
-                        Annuler
-                    </button>
-                    <button
+                    />
+                    <MalioButton
                         type="submit"
-                        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
-                        :class="submitButtonClass"
-                    >
-                        Enregistrer
-                    </button>
+                        label="Enregistrer"
+                        :disabled="isSubmitting || !isFormValid"
+                    />
                 </div>
             </form>
-        </AppDrawer>
+        </MalioDrawer>
 
-        <SalaryRecapDrawer
-            v-model="isSalaryRecapOpen"
-            @submit="handleSalaryRecapPrint"
-        />
+        <MalioDrawer v-model="isExportDrawerOpen" title="Export">
+            <div class="space-y-4">
+                <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"
+                />
+
+                <div v-if="exportChoice === 'salary-recap'">
+                    <label class="text-md font-semibold text-neutral-700" for="export-salary-month">
+                        Mois <span class="text-red-600">*</span>
+                    </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>
 
@@ -246,8 +252,7 @@ import type {Site} from '~/services/dto/site'
 import {listContracts} from '~/services/contracts'
 import {createEmployee, deleteEmployee, listEmployees, updateEmployee} from '~/services/employees'
 import {listSites} from '~/services/sites'
-import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
-import SalaryRecapDrawer from '~/components/SalaryRecapDrawer.vue'
+import {listInterimAgencies, type InterimAgency} from '~/services/interim-agencies'
 import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
 import {usePdfPrinter} from '~/composables/usePdfPrinter'
 
@@ -258,7 +263,50 @@ useHead({
 const isDrawerOpen = ref(false)
 const isSubmitting = ref(false)
 const isLoading = ref(false)
-const isSalaryRecapOpen = ref(false)
+const isExportDrawerOpen = ref(false)
+const exportChoice = ref<'leave-recap' | 'salary-recap' | 'yearly-hours' | ''>('')
+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)
@@ -269,9 +317,16 @@ const drawerTitle = computed(() =>
 const employees = ref<Employee[]>([])
 const sites = ref<Site[]>([])
 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 []
@@ -300,7 +355,8 @@ const form = reactive({
     contractStartDate: '',
     contractEndDate: '',
     isDriver: false,
-    workDaysHours: null as Record<number, number> | null
+    workDaysHours: null as Record<number, number> | null,
+    interimAgencyId: '' as number | ''
 })
 
 const validationTouched = reactive({
@@ -376,63 +432,23 @@ const showContractEndDateError = computed(
     () => !editingEmployee.value && validationTouched.contractEndDate && !isContractEndDateValid.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 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 dateInputBaseClass =
+    '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 submitButtonClass = computed(() => {
-    if (isSubmitting.value || !isFormValid.value) {
-        return 'opacity-50 cursor-not-allowed'
-    }
-    return ''
-})
+const formSiteOptions = computed(() =>
+    sites.value.map((site) => ({ label: site.name, value: site.id }))
+)
+const interimAgencyOptions = computed(() =>
+    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
@@ -451,8 +467,12 @@ const loadContracts = async () => {
     contracts.value = await listContracts()
 }
 
+const loadInterimAgencies = async () => {
+    interimAgencies.value = await listInterimAgencies()
+}
+
 onMounted(async () => {
-    await Promise.all([loadEmployees(), loadSites(), loadContracts()])
+    await Promise.all([loadEmployees(), loadSites(), loadContracts(), loadInterimAgencies()])
     if (form.contractStartDate === '') {
         form.contractStartDate = new Date().toISOString().slice(0, 10)
     }
@@ -503,7 +523,8 @@ const handleSubmit = async () => {
                 contractStartDate: form.contractStartDate,
                 contractEndDate: form.contractEndDate || null,
                 isDriverInput: form.isDriver,
-                workDaysHoursInput: requiresSchedule.value ? form.workDaysHours : null
+                workDaysHoursInput: requiresSchedule.value ? form.workDaysHours : null,
+                interimAgencyId: form.contractNature === 'INTERIM' && form.interimAgencyId !== '' ? Number(form.interimAgencyId) : null
             })
         }
 
@@ -516,6 +537,7 @@ const handleSubmit = async () => {
         form.contractEndDate = ''
         form.isDriver = false
         form.workDaysHours = null
+        form.interimAgencyId = ''
         editingEmployee.value = null
         isDrawerOpen.value = false
         await loadEmployees()
@@ -542,6 +564,12 @@ watch(showsContractEndDateComputed, (shows) => {
     }
 })
 
+watch(() => form.contractNature, (nature) => {
+    if (nature !== 'INTERIM') {
+        form.interimAgencyId = ''
+    }
+})
+
 watch(requiresSchedule, (required) => {
     if (!required) {
         form.workDaysHours = null
@@ -567,18 +595,33 @@ const openCreate = () => {
     form.contractEndDate = ''
     form.isDriver = false
     form.workDaysHours = null
+    form.interimAgencyId = ''
     isDrawerOpen.value = true
 }
 
-const handleLeaveRecapPrint = async () => {
-    await printPdf('/leave-recap/print')
+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 handleSalaryRecapPrint = async (month: string) => {
-    await printPdf(`/salary-recap/print?month=${month}`)
-    isSalaryRecapOpen.value = false
+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}`)
+    } else if (choice === 'yearly-hours') {
+        await printPdf(`/yearly-hours/print-all?year=${exportYear.value}&month=${exportMonth.value}`)
+    }
 }
 
+
 const confirmDelete = async (employee: Employee) => {
     const ok = window.confirm(`Supprimer ${employee.firstName} ${employee.lastName} ?`)
     if (!ok) return

frontend/pages/hours.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="h-full overflow-hidden flex flex-col">
         <div class="flex flex-wrap items-center justify-between gap-4">
-            <h1 class="text-4xl font-bold text-primary-500">Heures</h1>
+            <h1 class="text-2xl font-bold text-primary-500 lg:text-4xl">Heures</h1>
         </div>
 
         <HoursToolbar
@@ -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>
 
@@ -115,6 +118,18 @@
             @delete="deleteAbsenceFromDrawer"
             @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>
 
@@ -183,6 +198,7 @@ const {
   getRowAbsenceStyle,
   hasRowFormation,
   getRowFormationLabel,
+  getRowContractNature,
   getRowUpdatedAt,
   getPresenceDayValue,
   openAbsenceDrawer,
@@ -190,7 +206,11 @@ const {
   deleteAbsenceFromDrawer,
   closeAbsenceDrawer,
   formatMinutes,
-  handleSave
+  handleSave,
+  isWeekCommentDrawerOpen,
+  weekCommentContext,
+  openWeekCommentDrawer,
+  reloadWeeklySummary
 } = useHoursPage()
 
 useHead({

frontend/pages/leave-recap.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="h-full flex flex-col overflow-hidden">
     <div class="flex flex-wrap items-center justify-between gap-4 pb-8">
-      <h1 class="text-4xl font-bold text-primary-500">Récap. congés</h1>
+      <h1 class="text-2xl font-bold text-primary-500 lg:text-4xl">Récap. congés</h1>
       <span
         v-if="cutoffLabel"
         class="inline-flex items-center gap-2 rounded-full bg-tertiary-500 px-4 py-1 text-sm font-semibold text-primary-500"
@@ -25,7 +25,8 @@
       Aucun employé à afficher.
     </div>
 
-    <div v-else class="min-h-0 overflow-auto rounded-md bg-white">
+    <!-- Desktop table -->
+    <div v-else class="min-h-0 overflow-auto rounded-md bg-white hidden lg:block">
       <div
         :class="`grid ${gridColsClass} gap-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md sticky top-0 z-10`"
       >
@@ -64,6 +65,47 @@
         </div>
       </div>
     </div>
+
+    <!-- Mobile cards -->
+    <div v-if="!isLoading && rows.length > 0" class="min-h-0 overflow-auto space-y-3 lg:hidden">
+      <div
+        v-for="row in rows"
+        :key="'m-' + row.employeeId"
+        class="rounded-md border border-primary-500 bg-white p-4"
+      >
+        <div class="mb-3 flex items-center justify-between gap-2">
+          <p class="text-md font-bold text-primary-500 truncate">
+            {{ row.lastName }} {{ row.firstName }}
+          </p>
+          <span
+            v-if="showSiteColumn && row.siteName"
+            class="inline-block shrink-0 rounded-full px-3 py-1 text-sm"
+            :style="{ backgroundColor: row.siteColor || '#ffd7d7', color: '#1a1a1a' }"
+          >
+            {{ row.siteName }}
+          </span>
+        </div>
+        <p v-if="row.contractName" class="mb-3 text-sm text-neutral-600">{{ row.contractName }}</p>
+        <div class="grid grid-cols-2 gap-x-4 gap-y-2 text-sm">
+          <div class="flex justify-between">
+            <span class="text-neutral-500">CP N-1</span>
+            <span class="font-bold text-primary-500 tabular-nums">{{ formatNumber(row.cpN1Remaining) }}</span>
+          </div>
+          <div class="flex justify-between">
+            <span class="text-neutral-500">Samedis</span>
+            <span class="font-bold text-primary-500 tabular-nums">{{ row.acquiredSaturdays }}</span>
+          </div>
+          <div class="flex justify-between">
+            <span class="text-neutral-500">CP N</span>
+            <span class="font-bold text-primary-500 tabular-nums">{{ formatNumber(row.cpN) }}</span>
+          </div>
+          <div class="flex justify-between">
+            <span class="text-neutral-500">RTT</span>
+            <span class="font-bold text-primary-500 tabular-nums">{{ row.rtt }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

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>
-                <label class="text-sm font-semibold text-neutral-700" for="username">
-                    Nom d'utilisateur
-                </label>
-                <input
-                    id="username"
-                    v-model="username"
-                    type="text"
-                    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"
-                />
-            </div>
+            <MalioInputText
+                v-model="username"
+                label="Nom d'utilisateur"
+                autocomplete="username"
+                group-class="mt-2"
+            />
 
-            <div>
-                <label class="text-sm font-semibold text-neutral-700" for="password">
-                    Mot de passe
-                </label>
-                <input
-                    id="password"
-                    v-model="password"
-                    type="password"
-                    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>
+            <MalioInputPassword
+                v-model="password"
+                label="Mot de passe"
+                autocomplete="current-password"
+            />
 
             <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
-        type="button"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+      <MalioButton
+        label="Ajouter un site"
+        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>
-          <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"
-            :class="nameFieldClass"
-          />
-          <p v-if="showNameError" class="mt-1 text-sm text-red-600">
-            Le nom du site est obligatoire.
-          </p>
-        </div>
+        <MalioInputText
+          v-model="form.name"
+          label="Nom *"
+          group-class="mt-2"
+          :error="showNameError ? 'Le nom du site est obligatoire.' : ''"
+        />
         <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
-            type="button"
-            class="flex items-center justify-center rounded-md bg-red-500 px-4 py-2 text-md font-semibold text-white hover:bg-red-600"
+          <MalioButton
+            label="Supprimer"
+            variant="danger"
+            button-class="w-full"
             @click="confirmDelete(editingSite)"
-          >
-            Supprimer
-          </button>
-          <button
+          />
+          <MalioButton
             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"
-            :class="submitButtonClass"
-          >
-            Modifier
-          </button>
+            label="Modifier"
+            button-class="w-full"
+            :disabled="isSubmitting || !isFormValid"
+          />
         </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"
-            :class="submitButtonClass"
-          >
-            + Ajouter
-          </button>
+            label="Valider"
+            button-class="w-[200px]"
+            :disabled="isSubmitting || !isFormValid"
+          />
         </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

@@ -1,14 +1,13 @@
 <template>
   <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">Utilisateurs</h1>
-      <button
-        type="button"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+      <h1 class="text-2xl font-bold text-primary-500 lg:text-4xl">Utilisateurs</h1>
+      <MalioButton
+        label="Ajouter"
+        icon-name="mdi:plus"
+        icon-position="left"
         @click="openCreate"
-      >
-        + Ajouter un utilisateur
-      </button>
+      />
     </div>
 
     <div
@@ -18,7 +17,8 @@
       Aucun utilisateur pour le moment.
     </div>
 
-    <div v-else class="min-h-0 overflow-auto rounded-md bg-white">
+    <!-- Desktop table -->
+    <div v-else class="min-h-0 overflow-auto rounded-md bg-white hidden lg:block">
       <div class="grid grid-cols-5 gap-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md sticky top-0 z-10">
         <span class="text-left">Utilisateur</span>
         <span class="text-left">Employé</span>
@@ -56,43 +56,61 @@
       </div>
     </div>
 
-    <AppDrawer
+    <!-- Mobile cards -->
+    <div v-if="isLoading" class="px-6 py-4 text-md text-neutral-500 lg:hidden">
+      Chargement...
+    </div>
+    <div v-else-if="users.length > 0" class="min-h-0 overflow-auto space-y-3 lg:hidden">
+      <div
+        v-for="user in users"
+        :key="'m-' + user.id"
+        class="rounded-md border border-primary-500 bg-white p-4 cursor-pointer active:bg-tertiary-500"
+        @click="openEdit(user)"
+      >
+        <div class="flex items-center justify-between gap-2 mb-2">
+          <p class="text-md font-bold text-primary-500 truncate">{{ user.username }}</p>
+          <span
+            v-if="user.isLocked"
+            class="shrink-0 inline-block rounded-full bg-red-100 px-3 py-1 text-xs font-semibold text-red-700"
+          >Verrouillé</span>
+          <span
+            v-else
+            class="shrink-0 inline-block rounded-full bg-green-100 px-3 py-1 text-xs font-semibold text-green-700"
+          >Actif</span>
+        </div>
+        <div class="space-y-1 text-sm">
+          <p v-if="user.employee" class="text-neutral-600">
+            {{ user.employee.firstName }} {{ user.employee.lastName }}
+          </p>
+          <p class="text-neutral-500">
+            Accès : <span class="font-semibold text-primary-500">{{ getAccessLabel(user) }}</span>
+          </p>
+          <p v-if="getSiteLabels(user) !== '-'" class="text-neutral-500 truncate">
+            Sites : <span class="font-semibold text-primary-500">{{ getSiteLabels(user) }}</span>
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <MalioDrawer
       v-model="isDrawerOpen"
       :title="editingUser ? 'Modifier un utilisateur' : 'Ajouter un utilisateur'"
     >
       <form class="space-y-4" @submit.prevent="handleSubmit">
-        <div>
-          <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"
-            :class="usernameFieldClass"
-          />
-          <p v-if="showUsernameError" class="mt-1 text-sm text-red-600">
-            Le nom d'utilisateur est obligatoire.
-          </p>
-        </div>
+        <MalioInputText
+          v-model="form.username"
+          :label="editingUser ? `Nom d'utilisateur` : `Nom d'utilisateur *`"
+          group-class="mt-2"
+          :error="showUsernameError ? `Le nom d'utilisateur est obligatoire.` : ''"
+        />
 
         <div>
-          <label class="text-md font-semibold text-neutral-700" for="password">
-            Mot de passe
-            <span v-if="!editingUser" class="text-red-600">*</span>
-          </label>
-          <input
-            id="password"
+          <MalioInputPassword
             v-model="form.password"
-            type="password"
-            :class="passwordFieldClass"
+            :label="editingUser ? 'Mot de passe' : 'Mot de passe *'"
+            :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>
@@ -135,40 +153,32 @@
         </div>
 
         <div v-if="form.accessMode === 'self'">
-          <label class="text-md font-semibold text-neutral-700" for="employee">
-            Employé lié
-          </label>
-          <select
-            id="employee"
-            v-model="form.employeeId"
-            class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
-          >
-            <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>
+          <MalioSelect
+            :model-value="form.employeeId === '' ? null : form.employeeId"
+            :options="employeeOptions"
+            label="Employé lié"
+            empty-option-label="Aucun"
+            min-width=""
+            :error="showSelfEmployeeError ? 'Sélectionne un employé.' : ''"
+            @update:model-value="onEmployeeChange"
+          />
         </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
-                type="checkbox"
-                class="cursor-pointer"
-                :checked="form.siteIds.includes(site.id)"
-                @change="toggleSite(site.id)"
+              <MalioCheckbox
+                :model-value="form.siteIds.includes(site.id)"
+                :label="site.name"
+                group-class="flex items-center"
+                @update:model-value="toggleSite(site.id)"
               />
-              <span>{{ site.name }}</span>
-            </label>
+            </div>
           </div>
           <p v-if="showSitesError" class="mt-1 text-sm text-red-600">
             Sélectionne au moins un site.
@@ -176,44 +186,31 @@
         </div>
 
         <div>
-          <label class="flex items-center gap-2 cursor-pointer">
-            <input
-              v-model="form.isLocked"
-              type="checkbox"
-              class="cursor-pointer"
-            />
-            <span class="text-md font-semibold text-neutral-700">Verrouiller le compte</span>
-          </label>
-          <p class="mt-1 text-sm text-neutral-500">
-            Un compte verrouillé ne peut plus se connecter.
-          </p>
+          <MalioCheckbox
+            v-model="form.isLocked"
+            label="Verrouiller le compte"
+            hint="Un compte verrouillé ne peut plus se connecter."
+          />
         </div>
 
         <div>
-          <label class="flex items-center gap-2 cursor-pointer">
-            <input
-              v-model="form.hasLeaveRecapAccess"
-              type="checkbox"
-              class="cursor-pointer"
-            />
-            <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>
+          <MalioCheckbox
+            v-model="form.hasLeaveRecapAccess"
+            label="Accès à l'écran Récap. congés"
+            hint="Affiche l'onglet dans la sidebar et donne accès au tableau récap."
+          />
         </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"
-            :class="submitButtonClass"
-          >
-            {{ editingUser ? 'Modifier' : '+ Ajouter' }}
-          </button>
+            :label="editingUser ? 'Modifier' : 'Valider'"
+            button-class="w-[200px]"
+            :disabled="isSubmitting || !isFormValid"
+          />
         </div>
       </form>
-    </AppDrawer>
+    </MalioDrawer>
   </div>
 </template>
 
@@ -311,27 +308,13 @@ const getSiteLabels = (user: User) => {
   return names.length > 0 ? names.join(', ') : 'Sites sélectionnés'
 }
 
-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 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 employeeOptions = computed(() =>
+  employees.value.map((e) => ({ label: `${e.firstName} ${e.lastName}`, value: e.id }))
+)
 
-const submitButtonClass = computed(() => {
-  if (isSubmitting.value || !isFormValid.value) {
-    return 'opacity-50 cursor-not-allowed'
-  }
-  return ''
-})
+const onEmployeeChange = (value: string | number | null) => {
+  form.employeeId = value === null ? '' : Number(value)
+}
 
 const loadData = async () => {
   isLoading.value = true

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

@@ -20,6 +20,8 @@ export type ContractHistoryItem = {
   suspensions?: ContractSuspension[]
   isDriver?: boolean
   workDaysHours?: Record<number, number> | null
+  interimAgencyId?: number | null
+  interimAgencyName?: string | null
 }
 
 export type Employee = {
@@ -37,4 +39,6 @@ export type Employee = {
   displayOrder?: number
   entryDate?: string | null
   currentSuspensions?: ContractSuspension[]
+  currentInterimAgencyId?: number | null
+  currentInterimAgencyName?: string | null
 }

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 = {
@@ -87,6 +88,9 @@ export type WeeklyWorkHourRowSummary = {
   weeklyDinnerCount?: number
   weeklyOvernightCount?: number
   hasContractForWeek?: boolean
+  contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
+  comment?: string | null
+  commentId?: number | null
 }
 
 export type WeeklyWorkHourSummary = {
@@ -110,6 +114,7 @@ export type WorkHourDayContextRow = {
   hasFormation?: boolean
   formationLabel?: string | null
   virtualHolidayMinutes?: number
+  contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
 }
 
 export type WorkHourDayContext = {

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' })
+}

frontend/services/employees.ts

@@ -36,6 +36,7 @@ export const createEmployee = async (payload: {
   contractEndDate?: string | null
   isDriverInput?: boolean
   workDaysHoursInput?: Record<number, number> | null
+  interimAgencyId?: number | null
 }) => {
   const api = useApi()
   return api.post<Employee>('/employees', {
@@ -47,7 +48,8 @@ export const createEmployee = async (payload: {
     contractStartDate: payload.contractStartDate,
     contractEndDate: payload.contractEndDate ?? null,
     isDriverInput: payload.isDriverInput ?? false,
-    workDaysHoursInput: payload.workDaysHoursInput ?? null
+    workDaysHoursInput: payload.workDaysHoursInput ?? null,
+    interimAgencyId: payload.interimAgencyId ?? null
   }, {
     toastSuccessKey: 'success.employee.create',
     toastErrorKey: 'errors.employee.create'
@@ -69,6 +71,7 @@ export const updateEmployee = async (
     displayOrder?: number
     isDriverInput?: boolean
     workDaysHoursInput?: Record<number, number> | null
+    interimAgencyId?: number | null
   }
 ) => {
   const api = useApi()
@@ -103,6 +106,9 @@ export const updateEmployee = async (
   if (payload.workDaysHoursInput !== undefined) {
     body.workDaysHoursInput = payload.workDaysHoursInput
   }
+  if (payload.interimAgencyId !== undefined) {
+    body.interimAgencyId = payload.interimAgencyId
+  }
 
   return api.patch<Employee>(`/employees/${id}`, body, {
     toastSuccessKey: 'success.employee.update',

frontend/services/interim-agencies.ts

@@ -0,0 +1,16 @@
+import { extractItems } from '~/utils/api'
+
+export type InterimAgency = {
+    id: number
+    name: string
+}
+
+export const listInterimAgencies = async (): Promise<InterimAgency[]> => {
+    const api = useApi()
+    const data = await api.get<InterimAgency[] | { 'hydra:member'?: InterimAgency[] }>(
+        '/interim_agencies',
+        {},
+        { toast: false }
+    )
+    return extractItems<InterimAgency>(data)
+}

frontend/utils/contract.ts

@@ -13,7 +13,7 @@ export const showsContractEndDate = (nature: ContractNature) => {
 }
 
 export const requiresContractEndDate = (nature: ContractNature) => {
-  return nature === 'CDD'
+  return nature === 'CDD' || nature === 'INTERIM'
 }
 
 export const isContractNature = (value: string): value is ContractNature => {

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');
+    }
+}

migrations/Version20260417120000.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260417120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create interim_agencies table and add interim_agency_id to employee_contract_periods';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE interim_agencies (id SERIAL PRIMARY KEY, name VARCHAR(150) NOT NULL UNIQUE)');
+        $this->addSql('ALTER TABLE employee_contract_periods ADD interim_agency_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE employee_contract_periods ADD CONSTRAINT fk_ecp_interim_agency FOREIGN KEY (interim_agency_id) REFERENCES interim_agencies (id) ON DELETE SET NULL');
+        $this->addSql('CREATE INDEX idx_ecp_interim_agency ON employee_contract_periods (interim_agency_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE employee_contract_periods DROP CONSTRAINT IF EXISTS fk_ecp_interim_agency');
+        $this->addSql('DROP INDEX IF EXISTS idx_ecp_interim_agency');
+        $this->addSql('ALTER TABLE employee_contract_periods DROP COLUMN interim_agency_id');
+        $this->addSql('DROP TABLE interim_agencies');
+    }
+}

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/ApiResource/EmployeeYearlyHoursBulkPrint.php

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

src/Dto/Employees/ContractHistoryItem.php

@@ -34,5 +34,9 @@ final class ContractHistoryItem
          */
         #[Groups(['employee:read'])]
         public ?array $workDaysHours = null,
+        #[Groups(['employee:read'])]
+        public ?int $interimAgencyId = null,
+        #[Groups(['employee:read'])]
+        public ?string $interimAgencyName = null,
     ) {}
 }

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

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

src/Entity/Employee.php

@@ -98,6 +98,9 @@ class Employee
     #[Groups(['employee:write'])]
     private ?array $workDaysHoursInput = null;
 
+    #[Groups(['employee:write'])]
+    private ?int $interimAgencyId = null;
+
     public function __construct()
     {
         $this->createdAt       = new DateTimeImmutable();
@@ -295,6 +298,30 @@ class Employee
         return $this;
     }
 
+    public function getInterimAgencyId(): ?int
+    {
+        return $this->interimAgencyId;
+    }
+
+    public function setInterimAgencyId(?int $interimAgencyId): self
+    {
+        $this->interimAgencyId = $interimAgencyId;
+
+        return $this;
+    }
+
+    #[Groups(['employee:read'])]
+    public function getCurrentInterimAgencyId(): ?int
+    {
+        return $this->resolveCurrentContractPeriod()?->getInterimAgency()?->getId();
+    }
+
+    #[Groups(['employee:read'])]
+    public function getCurrentInterimAgencyName(): ?string
+    {
+        return $this->resolveCurrentContractPeriod()?->getInterimAgency()?->getName();
+    }
+
     #[Groups(['employee:read'])]
     public function getHasActiveContract(): bool
     {
@@ -393,6 +420,8 @@ class Employee
                     suspensions: $suspensionData,
                     isDriver: $period->getIsDriver(),
                     workDaysHours: $period->getWorkDaysHours(),
+                    interimAgencyId: $period->getInterimAgency()?->getId(),
+                    interimAgencyName: $period->getInterimAgency()?->getName(),
                 );
             },
             $periods

src/Entity/EmployeeContractPeriod.php

@@ -55,6 +55,10 @@ class EmployeeContractPeriod
     #[ORM\Column(type: 'json', nullable: true)]
     private ?array $workDaysHours = null;
 
+    #[ORM\ManyToOne(targetEntity: InterimAgency::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?InterimAgency $interimAgency = null;
+
     #[ORM\Column(type: 'text', nullable: true)]
     private ?string $comment = null;
 
@@ -204,6 +208,18 @@ class EmployeeContractPeriod
         return $this;
     }
 
+    public function getInterimAgency(): ?InterimAgency
+    {
+        return $this->interimAgency;
+    }
+
+    public function setInterimAgency(?InterimAgency $interimAgency): self
+    {
+        $this->interimAgency = $interimAgency;
+
+        return $this;
+    }
+
     /**
      * @return Collection<int, ContractSuspension>
      */

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/Entity/InterimAgency.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\GetCollection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ApiResource(
+    operations: [
+        new GetCollection(),
+    ],
+    normalizationContext: ['groups' => ['interim_agency:read']],
+    paginationEnabled: false,
+    security: "is_granted('ROLE_USER')",
+    order: ['name' => 'ASC'],
+)]
+#[ORM\Entity]
+#[ORM\Table(name: 'interim_agencies')]
+class InterimAgency
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    #[Groups(['interim_agency:read', 'employee:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(type: 'string', length: 150, unique: true)]
+    #[Groups(['interim_agency:read', 'employee:read'])]
+    private string $name = '';
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

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/EmployeeContractChangeRequest.php

@@ -20,6 +20,7 @@ final readonly class EmployeeContractChangeRequest
         public ?string $contractComment,
         public ?bool $isDriver = null,
         public ?array $workDaysHours = null,
+        public ?int $interimAgencyId = null,
     ) {}
 
     public function hasPeriodChangeRequest(): bool

src/Service/Contracts/EmployeeContractChangeRequestFactory.php

@@ -21,6 +21,7 @@ final class EmployeeContractChangeRequestFactory
             contractComment: $employee->getContractComment(),
             isDriver: $employee->getIsDriverInput(),
             workDaysHours: $employee->getWorkDaysHoursInput(),
+            interimAgencyId: $employee->getInterimAgencyId(),
         );
     }
 

src/Service/Contracts/EmployeeContractPeriodBuilder.php

@@ -7,6 +7,7 @@ namespace App\Service\Contracts;
 use App\Entity\Contract;
 use App\Entity\Employee;
 use App\Entity\EmployeeContractPeriod;
+use App\Entity\InterimAgency;
 use App\Enum\ContractNature;
 use DateTimeImmutable;
 
@@ -23,6 +24,7 @@ final class EmployeeContractPeriodBuilder
         ContractNature $nature,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?InterimAgency $interimAgency = null,
     ): EmployeeContractPeriod {
         return new EmployeeContractPeriod()
             ->setEmployee($employee)
@@ -32,6 +34,7 @@ final class EmployeeContractPeriodBuilder
             ->setContractNature($nature)
             ->setIsDriver($isDriver)
             ->setWorkDaysHours($workDaysHours)
+            ->setInterimAgency($interimAgency)
         ;
     }
 }

src/Service/Contracts/EmployeeContractPeriodManager.php

@@ -7,6 +7,7 @@ namespace App\Service\Contracts;
 use App\Entity\Contract;
 use App\Entity\Employee;
 use App\Entity\EmployeeContractPeriod;
+use App\Entity\InterimAgency;
 use App\Enum\ContractNature;
 use App\Repository\EmployeeContractPeriodRepository;
 use DateTimeImmutable;
@@ -30,6 +31,7 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
         ContractNature $nature,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?int $interimAgencyId = null,
     ): void {
         $this->periodValidator->assertPeriodDates($startDate, $endDate, $nature);
         $this->periodValidator->assertWorkDaysHours($contract, $nature, $workDaysHours);
@@ -39,7 +41,8 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
             return;
         }
 
-        $this->persistNewPeriod($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours);
+        $interimAgency = $this->resolveInterimAgency($interimAgencyId);
+        $this->persistNewPeriod($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours, $interimAgency);
         $this->entityManager->flush();
     }
 
@@ -78,6 +81,7 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
         ?EmployeeContractPeriod $todayPeriod,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?int $interimAgencyId = null,
     ): void {
         $this->periodValidator->assertPeriodDates($startDate, $endDate, $nature);
         $this->periodValidator->assertWorkDaysHours($contract, $nature, $workDaysHours);
@@ -90,7 +94,8 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
             }
         }
 
-        $this->persistNewPeriod($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours);
+        $interimAgency = $this->resolveInterimAgency($interimAgencyId);
+        $this->persistNewPeriod($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours, $interimAgency);
         $this->entityManager->flush();
     }
 
@@ -105,8 +110,23 @@ final readonly class EmployeeContractPeriodManager implements EmployeeContractPe
         ContractNature $nature,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?InterimAgency $interimAgency = null,
     ): void {
-        $period = $this->periodBuilder->build($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours);
+        $period = $this->periodBuilder->build($employee, $contract, $startDate, $endDate, $nature, $isDriver, $workDaysHours, $interimAgency);
         $this->entityManager->persist($period);
     }
+
+    private function resolveInterimAgency(?int $id): ?InterimAgency
+    {
+        if (null === $id) {
+            return null;
+        }
+
+        $agency = $this->entityManager->find(InterimAgency::class, $id);
+        if (null === $agency) {
+            throw new UnprocessableEntityHttpException(sprintf('Interim agency with id %d not found.', $id));
+        }
+
+        return $agency;
+    }
 }

src/Service/Contracts/EmployeeContractPeriodManagerInterface.php

@@ -23,6 +23,7 @@ interface EmployeeContractPeriodManagerInterface
         ContractNature $nature,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?int $interimAgencyId = null,
     ): void;
 
     public function closeCurrentPeriod(
@@ -45,5 +46,6 @@ interface EmployeeContractPeriodManagerInterface
         ?EmployeeContractPeriod $todayPeriod,
         bool $isDriver = false,
         ?array $workDaysHours = null,
+        ?int $interimAgencyId = null,
     ): void;
 }

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/WorkHours/YearlyHoursExportBuilder.php

@@ -0,0 +1,503 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\WorkHours;
+
+use App\Dto\WorkHours\WorkMetrics;
+use App\Entity\Absence;
+use App\Entity\Employee;
+use App\Entity\WorkHour;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+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
+{
+    public function __construct(
+        private WorkHourRepository $workHourRepository,
+        private AbsenceRepository $absenceRepository,
+        private EmployeeContractResolver $contractResolver,
+        private AbsenceSegmentsResolver $absenceSegmentsResolver,
+        private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
+        private PublicHolidayServiceInterface $publicHolidayService,
+        private HolidayVirtualHoursResolver $holidayVirtualHoursResolver,
+    ) {}
+
+    /**
+     * @return list<string>
+     */
+    public function buildDays(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        $days    = [];
+        $current = $from;
+
+        while ($current <= $to) {
+            $days[]  = $current->format('Y-m-d');
+            $current = $current->add(new DateInterval('P1D'));
+        }
+
+        return $days;
+    }
+
+    /**
+     * @param list<Employee> $employees
+     *
+     * @return list<array{employeeName: string, contractLabel: ?string, segments: list<array>}>
+     */
+    public function buildForEmployees(array $employees, DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        $days = $this->buildDays($from, $to);
+
+        $workHours   = $this->workHourRepository->findByDateRangeAndEmployees($from, $to, $employees);
+        $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);
+
+        $results = [];
+        foreach ($employees as $employee) {
+            $employeeId  = $employee->getId();
+            $absenceData = $this->resolveAbsenceDataForEmployee($absenceMap[$employeeId] ?? [], $days, $employee);
+
+            $segments = $this->buildSegments(
+                $days,
+                $contractMap[$employeeId] ?? [],
+                $driverMap[$employeeId] ?? [],
+                $workHourMap[$employeeId] ?? [],
+                $absenceData,
+                $workDaysMap[$employeeId] ?? [],
+                $holidayMap,
+            );
+
+            if ([] === $segments) {
+                continue;
+            }
+
+            $results[] = [
+                'employeeName'  => trim(($employee->getLastName() ?? '').' '.($employee->getFirstName() ?? '')),
+                'contractLabel' => $this->buildContractLabel($employee),
+                'segments'      => $segments,
+            ];
+        }
+
+        return $results;
+    }
+
+    /**
+     * @return list<array{employeeName: string, contractLabel: ?string, segments: list<array>}>
+     */
+    public function buildForEmployee(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        return $this->buildForEmployees([$employee], $from, $to);
+    }
+
+    public function buildContractLabel(Employee $employee): ?string
+    {
+        $contract = $employee->getContract();
+        if (null === $contract) {
+            return null;
+        }
+
+        $natureRaw   = $employee->getCurrentContractNature();
+        $nature      = ContractNature::tryFrom($natureRaw) ?? ContractNature::CDI;
+        $natureLabel = match ($nature) {
+            ContractNature::CDI     => 'CDI',
+            ContractNature::CDD     => 'CDD',
+            ContractNature::INTERIM => 'Intérim',
+        };
+
+        $contractType = $contract->getType();
+        if (ContractType::FORFAIT === $contractType) {
+            return $natureLabel.' Forfait';
+        }
+
+        $weeklyHours = $contract->getWeeklyHours();
+        if (null !== $weeklyHours && $weeklyHours > 0) {
+            return sprintf('%s %d heures', $natureLabel, $weeklyHours);
+        }
+
+        $name = $contract->getName();
+
+        return null !== $name && '' !== $name ? $natureLabel.' '.$name : $natureLabel;
+    }
+
+    /**
+     * @return array<int, array<string, WorkHour>>
+     */
+    private function buildWorkHourMap(array $workHours): array
+    {
+        $map = [];
+        foreach ($workHours as $wh) {
+            $employeeId = $wh->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $date                    = $wh->getWorkDate()->format('Y-m-d');
+            $map[$employeeId][$date] = $wh;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array<int, list<Absence>>
+     */
+    private function buildAbsenceMap(array $absences, array $days): array
+    {
+        $map = [];
+        foreach ($absences as $absence) {
+            $employeeId = $absence->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId][] = $absence;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array{credited: array<string, int>, labels: array<string, string>, absentMorning: array<string, bool>, absentAfternoon: array<string, bool>, hasDayAbsence: array<string, bool>}
+     */
+    private function resolveAbsenceDataForEmployee(array $absences, array $days, Employee $employee): array
+    {
+        $credited        = [];
+        $labels          = [];
+        $absentMorning   = [];
+        $absentAfternoon = [];
+        $hasDayAbsence   = [];
+
+        foreach ($absences as $absence) {
+            $start = $absence->getStartDate()->format('Y-m-d');
+            $end   = $absence->getEndDate()->format('Y-m-d');
+
+            foreach ($days as $date) {
+                if ($date < $start || $date > $end) {
+                    continue;
+                }
+
+                [$isMorning, $isAfternoon] = $this->absenceSegmentsResolver->resolveForDate($absence, $date);
+                if ($isMorning || $isAfternoon) {
+                    $hasDayAbsence[$date]   = true;
+                    $absentMorning[$date]   = ($absentMorning[$date] ?? false)   || $isMorning;
+                    $absentAfternoon[$date] = ($absentAfternoon[$date] ?? false) || $isAfternoon;
+                    if (!isset($labels[$date])) {
+                        $labels[$date] = $absence->getType()?->getLabel() ?? '';
+                    }
+                }
+
+                $credited[$date] = ($credited[$date] ?? 0)
+                    + $this->workedHoursCreditPolicy->computeCreditedMinutes($absence, $date, $isMorning, $isAfternoon);
+            }
+        }
+
+        return [
+            'credited'        => $credited,
+            'labels'          => $labels,
+            'absentMorning'   => $absentMorning,
+            'absentAfternoon' => $absentAfternoon,
+            'hasDayAbsence'   => $hasDayAbsence,
+        ];
+    }
+
+    /**
+     * @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(
+        array $days,
+        array $contractsByDate,
+        array $driverByDate,
+        array $workHoursByDate,
+        array $absenceData,
+        array $workDaysMinutesByDate,
+        array $holidayMap,
+    ): array {
+        $segments    = [];
+        $currentMode = null;
+        $currentRows = [];
+        $currentName = null;
+
+        $firstDataDate = null;
+        foreach ($days as $date) {
+            $hasRow = null !== ($workHoursByDate[$date] ?? null)
+                || ($absenceData['hasDayAbsence'][$date] ?? false)
+                || isset($holidayMap[$date]);
+            if ($hasRow) {
+                $firstDataDate = $date;
+
+                break;
+            }
+        }
+
+        if (null === $firstDataDate) {
+            return [];
+        }
+
+        $todayYmd = new DateTimeImmutable('today')->format('Y-m-d');
+
+        foreach ($days as $date) {
+            if ($date < $firstDataDate || $date > $todayYmd) {
+                continue;
+            }
+
+            $contract     = $contractsByDate[$date] ?? null;
+            $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 && !$isHoliday) {
+                continue;
+            }
+
+            if (!$hasData && null === $contract) {
+                continue;
+            }
+
+            $trackingMode = $contract?->getTrackingMode() ?? TrackingMode::TIME->value;
+            $mode         = $this->resolveSegmentMode($trackingMode, $isDriver);
+            $contractName = $contract?->getName();
+
+            if ($mode !== $currentMode) {
+                if (null !== $currentMode && [] !== $currentRows) {
+                    $segments[] = [
+                        'mode'         => $currentMode,
+                        'contractName' => $currentName,
+                        'rows'         => $currentRows,
+                    ];
+                }
+                $currentMode = $mode;
+                $currentRows = [];
+                $currentName = $contractName;
+            }
+
+            $creditedMinutes = $absenceData['credited'][$date] ?? 0;
+            $absenceLabel    = $absenceData['labels'][$date] ?? null;
+            $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,
+            ];
+
+            if ('presence' === $mode) {
+                $absentMorning   = $absenceData['absentMorning'][$date] ?? false;
+                $absentAfternoon = $absenceData['absentAfternoon'][$date] ?? false;
+                $morning         = (($wh?->getIsPresentMorning() ?? false) && !$absentMorning) ? 0.5 : 0.0;
+                $afternoon       = (($wh?->getIsPresentAfternoon() ?? false) && !$absentAfternoon) ? 0.5 : 0.0;
+                $total           = $morning + $afternoon;
+
+                $row['presentMorning']   = $morning > 0;
+                $row['presentAfternoon'] = $afternoon > 0;
+                $row['total']            = $total > 0 ? (string) $total : '';
+            } elseif ('driver' === $mode) {
+                $dayMin      = $wh?->getDayHoursMinutes() ?? 0;
+                $nightMin    = $wh?->getNightHoursMinutes() ?? 0;
+                $workshopMin = $wh?->getWorkshopHoursMinutes() ?? 0;
+                $totalMin    = $dayMin + $nightMin + $workshopMin + $creditedMinutes;
+                if ($virtualMinutes > $totalMin) {
+                    $totalMin = $virtualMinutes;
+                }
+
+                $row['dayHours']      = $this->formatMinutes($dayMin);
+                $row['nightHours']    = $this->formatMinutes($nightMin);
+                $row['workshopHours'] = $this->formatMinutes($workshopMin);
+                $row['total']         = $this->formatMinutes($totalMin);
+            } else {
+                $metrics = null !== $wh ? $this->computeMetrics($wh) : new WorkMetrics();
+                $metrics->addCreditedMinutes($creditedMinutes);
+                $totalMin = $metrics->totalMinutes;
+                if ($virtualMinutes > $totalMin) {
+                    $totalMin = $virtualMinutes;
+                }
+
+                $row['morningFrom']   = $wh?->getMorningFrom() ?? '';
+                $row['morningTo']     = $wh?->getMorningTo() ?? '';
+                $row['afternoonFrom'] = $wh?->getAfternoonFrom() ?? '';
+                $row['afternoonTo']   = $wh?->getAfternoonTo() ?? '';
+                $row['eveningFrom']   = $wh?->getEveningFrom() ?? '';
+                $row['eveningTo']     = $wh?->getEveningTo() ?? '';
+                $row['total']         = $this->formatMinutes($totalMin);
+            }
+
+            $currentRows[] = $row;
+        }
+
+        if (null !== $currentMode && [] !== $currentRows) {
+            $segments[] = [
+                'mode'         => $currentMode,
+                'contractName' => $currentName,
+                'rows'         => $currentRows,
+            ];
+        }
+
+        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) {
+            return 'driver';
+        }
+
+        if (TrackingMode::PRESENCE->value === $trackingMode) {
+            return 'presence';
+        }
+
+        return 'time';
+    }
+
+    private function computeMetrics(WorkHour $workHour): WorkMetrics
+    {
+        $ranges = [
+            [$workHour->getMorningFrom(), $workHour->getMorningTo()],
+            [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
+            [$workHour->getEveningFrom(), $workHour->getEveningTo()],
+        ];
+
+        $totalMinutes = 0;
+        $nightMinutes = 0;
+
+        foreach ($ranges as [$from, $to]) {
+            $totalMinutes += $this->intervalMinutes($from, $to);
+            $nightMinutes += $this->nightIntervalMinutes($from, $to);
+        }
+
+        $dayMinutes = max(0, $totalMinutes - $nightMinutes);
+
+        return new WorkMetrics(
+            dayMinutes: $dayMinutes,
+            nightMinutes: $nightMinutes,
+            totalMinutes: $totalMinutes,
+        );
+    }
+
+    /**
+     * @return null|array{int, int}
+     */
+    private function resolveInterval(?string $from, ?string $to): ?array
+    {
+        $fromMinutes = $this->toMinutes($from);
+        $toMinutes   = $this->toMinutes($to);
+        if (null === $fromMinutes || null === $toMinutes) {
+            return null;
+        }
+
+        $end = $toMinutes <= $fromMinutes ? $toMinutes + 1440 : $toMinutes;
+
+        return [$fromMinutes, $end];
+    }
+
+    private function toMinutes(?string $time): ?int
+    {
+        if (null === $time || '' === $time) {
+            return null;
+        }
+
+        [$hours, $minutes] = array_map('intval', explode(':', $time));
+
+        return ($hours * 60) + $minutes;
+    }
+
+    private function intervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+
+        return max(0, $end - $start);
+    }
+
+    private function nightIntervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+        $windows       = [[0, 360], [1260, 1440]];
+        $total         = 0;
+
+        for ($dayOffset = 0; $dayOffset <= 1; ++$dayOffset) {
+            $shift = $dayOffset * 1440;
+            foreach ($windows as [$windowStart, $windowEnd]) {
+                $total += $this->overlap($start, $end, $windowStart + $shift, $windowEnd + $shift);
+            }
+        }
+
+        return $total;
+    }
+
+    private function overlap(int $startA, int $endA, int $startB, int $endB): int
+    {
+        $start = max($startA, $startB);
+        $end   = min($endA, $endB);
+
+        return max(0, $end - $start);
+    }
+
+    private function formatMinutes(int $minutes): string
+    {
+        if (0 === $minutes) {
+            return '';
+        }
+
+        $h = intdiv($minutes, 60);
+        $m = $minutes % 60;
+
+        return 0 === $m ? "{$h}h" : "{$h}h{$m}m";
+    }
+}

src/State/EmployeeLeaveSummaryProvider.php

@@ -45,6 +45,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 +60,10 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         private PublicHolidayServiceInterface $publicHolidayService,
         private SuspensionDaysCalculator $suspensionDaysCalculator,
         private WorkHourRepository $workHourRepository,
-    ) {}
+        string $dataStartDate = '',
+    ) {
+        $this->dataStartDate = '' !== $dataStartDate ? $dataStartDate : null;
+    }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): EmployeeLeaveSummary
     {
@@ -83,9 +88,10 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
         $year = $this->resolveYear($employee);
 
-        $summary           = new EmployeeLeaveSummary();
-        $summary->year     = $year;
-        $summary->ruleCode = LeaveRuleCode::UNSUPPORTED->value;
+        $summary                = new EmployeeLeaveSummary();
+        $summary->year          = $year;
+        $summary->ruleCode      = LeaveRuleCode::UNSUPPORTED->value;
+        $summary->dataStartDate = $this->dataStartDate;
 
         $yearSummary = $this->computeYearSummary($employee, $year);
         if (null === $yearSummary) {
@@ -119,8 +125,29 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $summary->previousYearRemainingDays = $yearSummary['previousYearRemainingDays'];
         $summary->previousYearPaidDays      = $paidLeaveDays;
 
-        [$periodFrom, $periodTo]      = $this->resolvePeriodBounds($employee, $year);
-        $summary->presenceDaysByMonth = $this->computePresenceDaysByMonth($employee, $periodFrom, $periodTo);
+        [$periodFrom, $periodTo] = $this->resolvePeriodBounds($employee, $year);
+        // 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;
     }
@@ -686,8 +713,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 +728,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 +759,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;
             }
         }

src/State/EmployeeRttSummaryProvider.php

@@ -110,14 +110,11 @@ 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
-        if (null !== $this->rttStartDate) {
-            $startDate = new DateTimeImmutable($this->rttStartDate);
-            if ($startDate >= $periodFrom && $startDate <= $periodTo) {
-                $summary->rttStartDate = $this->rttStartDate;
-            }
-        }
-        $summary->weeks = $this->buildWeekSummaries($weekRanges, $currentByWeekStart, $periodFrom, $periodTo);
+        // Always expose rttStartDate so the frontend can use it as a hard floor
+        // for the year selector. Frontend already uses month-level comparison
+        // to hide carry/report rows when the date is outside the exercise.
+        $summary->rttStartDate = $this->rttStartDate;
+        $summary->weeks        = $this->buildWeekSummaries($weekRanges, $currentByWeekStart, $periodFrom, $periodTo);
 
         // Post-process: distribute deficit weeks across cumulative balance (50% first, then 25%)
         $cumulative50 = $carry->base50Minutes + $carry->bonus50Minutes;
@@ -164,6 +161,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;
 

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/EmployeeWriteProcessor.php

@@ -70,6 +70,7 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
                 nature: $nature,
                 isDriver: $changeRequest->isDriver ?? false,
                 workDaysHours: $changeRequest->workDaysHours,
+                interimAgencyId: $changeRequest->interimAgencyId,
             );
 
             $data->setEntryDate($startDate);
@@ -140,6 +141,7 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
             todayPeriod: $effectivePeriod,
             isDriver: $changeRequest->isDriver ?? false,
             workDaysHours: $changeRequest->workDaysHours,
+            interimAgencyId: $changeRequest->interimAgencyId,
         );
 
         return $result;

src/State/EmployeeYearlyHoursBulkPrintProvider.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Repository\EmployeeRepository;
+use App\Service\WorkHours\YearlyHoursExportBuilder;
+use DateTimeImmutable;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+use Twig\Environment;
+
+class EmployeeYearlyHoursBulkPrintProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private readonly RequestStack $requestStack,
+        private EmployeeRepository $employeeRepository,
+        private YearlyHoursExportBuilder $exportBuilder,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            return new Response('Missing request.', Response::HTTP_BAD_REQUEST);
+        }
+
+        $yearRaw = (string) $request->query->get('year');
+        if (!preg_match('/^\d{4}$/', $yearRaw)) {
+            throw new UnprocessableEntityHttpException('year must use YYYY format.');
+        }
+        $year = (int) $yearRaw;
+
+        $monthRaw = (string) $request->query->get('month', '');
+        $month    = null;
+        if ('' !== $monthRaw) {
+            if (!preg_match('/^(?:0?[1-9]|1[0-2])$/', $monthRaw)) {
+                throw new UnprocessableEntityHttpException('month must be between 1 and 12.');
+            }
+            $month = (int) $monthRaw;
+        }
+
+        if (null !== $month) {
+            $from = new DateTimeImmutable(sprintf('%d-%02d-01', $year, $month));
+            $to   = $from->modify('last day of this month');
+        } else {
+            $from = new DateTimeImmutable("{$year}-01-01");
+            $to   = new DateTimeImmutable("{$year}-12-31");
+        }
+
+        $employees = $this->employeeRepository->findAll();
+        usort($employees, fn ($a, $b) => ($a->getLastName() ?? '') <=> ($b->getLastName() ?? ''));
+
+        $entries = $this->exportBuilder->buildForEmployees($employees, $from, $to);
+
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('employee-yearly-hours/print-all.html.twig', [
+            'entries' => $entries,
+            'year'    => $year,
+            'month'   => $month,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4', 'portrait');
+        $dompdf->render();
+
+        $filename = null !== $month
+            ? sprintf('heures_tous_%d-%02d.pdf', $year, $month)
+            : sprintf('heures_tous_%d.pdf', $year);
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+}

src/State/EmployeeYearlyHoursPrintProvider.php

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

src/State/SalaryRecapPrintProvider.php

@@ -18,12 +18,14 @@ use App\Repository\MileageAllowanceRepository;
 use App\Repository\ObservationRepository;
 use App\Repository\WorkHourRepository;
 use App\Service\Contracts\EmployeeContractResolver;
+use App\Service\PublicHolidayServiceInterface;
 use DateInterval;
 use DateTimeImmutable;
 use Dompdf\Dompdf;
 use Dompdf\Options;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
+use Throwable;
 use Twig\Environment;
 
 class SalaryRecapPrintProvider implements ProviderInterface
@@ -39,6 +41,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         private MileageAllowanceRepository $mileageAllowanceRepository,
         private ObservationRepository $observationRepository,
         private EmployeeContractResolver $contractResolver,
+        private PublicHolidayServiceInterface $publicHolidayService,
     ) {}
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
@@ -71,6 +74,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         $days        = $this->buildDays($from, $to);
         $contractMap = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
         $driverMap   = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
+        $holidayMap  = $this->buildHolidayMap($from, $to);
 
         $workHourMap    = $this->buildWorkHourMap($workHours);
         $absenceMap     = $this->buildAbsenceMap($absences);
@@ -79,7 +83,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         $mileageMap     = $this->buildMileageMap($mileages);
         $observationMap = $this->buildObservationMap($observations);
 
-        $siteGroups = $this->aggregateBySite($employees, $days, $contractMap, $driverMap, $workHourMap, $absenceMap, $rttPaymentMap, $bonusMap, $mileageMap, $observationMap);
+        $siteGroups = $this->aggregateBySite($employees, $days, $contractMap, $driverMap, $workHourMap, $absenceMap, $rttPaymentMap, $bonusMap, $mileageMap, $observationMap, $holidayMap);
 
         $options = new Options();
         $options->set('isRemoteEnabled', true);
@@ -208,6 +212,29 @@ class SalaryRecapPrintProvider implements ProviderInterface
         return $map;
     }
 
+    /**
+     * @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;
+    }
+
     /**
      * @return array<int, string>
      */
@@ -236,6 +263,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
         array $bonusMap,
         array $mileageMap,
         array $observationMap,
+        array $holidayMap,
     ): array {
         $siteGroups = [];
 
@@ -257,6 +285,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
                 $bonusMap[$employeeId] ?? 0.0,
                 $mileageMap[$employeeId] ?? 0.0,
                 $observationMap[$employeeId] ?? '',
+                $holidayMap,
             );
 
             if (!isset($siteGroups[$siteId])) {
@@ -285,18 +314,20 @@ class SalaryRecapPrintProvider implements ProviderInterface
         float $bonusAmount,
         float $mileageKm,
         string $observation,
+        array $holidayMap,
     ): array {
-        $contractName       = null;
-        $presenceDays       = 0.0;
-        $nightMinutesTotal  = 0;
-        $nightBasketCount   = 0;
-        $sundayMinutesTotal = 0;
-        $isDriverAnyDay     = false;
-        $driverBreakfast    = 0;
-        $driverMeals        = 0;
-        $driverOvernight    = 0;
-        $driverSaturdays    = 0;
-        $isForfait          = false;
+        $contractName        = null;
+        $presenceDays        = 0.0;
+        $nightMinutesTotal   = 0;
+        $nightBasketCount    = 0;
+        $sundayMinutesTotal  = 0;
+        $holidayMinutesTotal = 0;
+        $isDriverAnyDay      = false;
+        $driverBreakfast     = 0;
+        $driverMeals         = 0;
+        $driverOvernight     = 0;
+        $driverSaturdays     = 0;
+        $isForfait           = false;
 
         foreach ($days as $date) {
             $contract = $contractsByDate[$date] ?? null;
@@ -318,10 +349,13 @@ class SalaryRecapPrintProvider implements ProviderInterface
 
             $dayOfWeek = (int) new DateTimeImmutable($date)->format('N');
 
+            $isHoliday = isset($holidayMap[$date]);
+
             if ($isDriver) {
                 $nightMinutesTotal += $wh->getNightHoursMinutes() ?? 0;
-                $dayMin   = $wh->getDayHoursMinutes() ?? 0;
-                $nightMin = $wh->getNightHoursMinutes() ?? 0;
+                $dayMin      = $wh->getDayHoursMinutes() ?? 0;
+                $nightMin    = $wh->getNightHoursMinutes() ?? 0;
+                $workshopMin = $wh->getWorkshopHoursMinutes() ?? 0;
                 if (($nightMin > $dayMin && $nightMin > 0) || $nightMin >= 240) {
                     ++$nightBasketCount;
                 }
@@ -329,19 +363,26 @@ class SalaryRecapPrintProvider implements ProviderInterface
                 if ($wh->getHasBreakfast()) {
                     ++$driverBreakfast;
                 }
-                if ($wh->getHasLunch() || $wh->getHasDinner()) {
+                if ($wh->getHasLunch()) {
+                    ++$driverMeals;
+                }
+                if ($wh->getHasDinner()) {
                     ++$driverMeals;
                 }
                 if ($wh->getHasOvernight()) {
                     ++$driverOvernight;
                 }
 
-                if (6 === $dayOfWeek && ($dayMin > 0 || $nightMin > 0 || ($wh->getWorkshopHoursMinutes() ?? 0) > 0)) {
+                if (6 === $dayOfWeek && ($dayMin > 0 || $nightMin > 0 || $workshopMin > 0)) {
                     ++$driverSaturdays;
                 }
 
                 if (7 === $dayOfWeek) {
-                    $sundayMinutesTotal += $dayMin + $nightMin + ($wh->getWorkshopHoursMinutes() ?? 0);
+                    $sundayMinutesTotal += $dayMin + $nightMin + $workshopMin;
+                }
+
+                if ($isHoliday) {
+                    $holidayMinutesTotal += $dayMin + $nightMin + $workshopMin;
                 }
             } else {
                 $metrics = $this->computeNightMinutes($wh);
@@ -359,6 +400,10 @@ class SalaryRecapPrintProvider implements ProviderInterface
                     $sundayMinutesTotal += $this->computeOverflowAfterMidnight($wh);
                 }
 
+                if ($isHoliday) {
+                    $holidayMinutesTotal += $metrics['dayMinutes'] + $metrics['nightMinutes'];
+                }
+
                 if ($isForfait) {
                     if ($wh->getIsPresentMorning()) {
                         $presenceDays += 0.5;
@@ -373,9 +418,10 @@ class SalaryRecapPrintProvider implements ProviderInterface
         $conges  = $this->countAbsencesByCode($absences, ['C']);
         $maladie = $this->countAbsencesByCode($absences, ['M', 'AT']);
 
-        $nightHours  = round($nightMinutesTotal / 60, 2);
-        $paidHours   = round($rttPaidMinutes / 60, 2);
-        $sundayHours = round($sundayMinutesTotal / 60, 2);
+        $nightHours   = round($nightMinutesTotal / 60, 2);
+        $paidHours    = round($rttPaidMinutes / 60, 2);
+        $sundayHours  = round($sundayMinutesTotal / 60, 2);
+        $holidayHours = round($holidayMinutesTotal / 60, 2);
 
         return [
             'lastName'         => mb_strimwidth($employee->getLastName() ?? '', 0, 15, '...'),
@@ -387,6 +433,7 @@ class SalaryRecapPrintProvider implements ProviderInterface
             'nightBasketCount' => $nightBasketCount,
             'paidHours'        => $paidHours,
             'sundayHours'      => $sundayHours,
+            'holidayHours'     => $holidayHours,
             'bonusAmount'      => $bonusAmount,
             'congesCount'      => $conges['count'],
             'congesDates'      => $conges['dates'],

src/State/WorkHourDayContextProvider.php

@@ -57,13 +57,17 @@ 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);
+            $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;
     }
@@ -109,19 +117,21 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
     }
 
     /**
-     * @param list<Employee> $employees
-     * @param list<WorkHour> $workHours
-     * @param list<Absence>  $absences
-     * @param list<string>   $days
+     * @param list<Employee>                  $employees
+     * @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,
                 );
             }
 
@@ -369,12 +380,47 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                 weeklyDinnerCount: $weeklyDinnerCount,
                 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

@@ -0,0 +1,283 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <title>Export heures - {% set months = {
+        1:'Janvier', 2:'Février', 3:'Mars', 4:'Avril', 5:'Mai', 6:'Juin',
+        7:'Juillet', 8:'Août', 9:'Septembre', 10:'Octobre', 11:'Novembre', 12:'Décembre'
+    } %}{% if month %}{{ months[month] }} {{ year }}{% else %}{{ year }}{% endif %}</title>
+
+    <style>
+        @page { size: A4 portrait; margin: 4mm; }
+
+        html, body {
+            margin: 0;
+            padding: 2mm;
+            font-family: Helvetica, sans-serif;
+            font-size: 9px;
+        }
+
+        .employee-section {
+            page-break-before: always;
+        }
+
+        .employee-section:first-child {
+            page-break-before: auto;
+        }
+
+        .title-bar {
+            position: relative;
+            margin: 0 0 4mm 0;
+        }
+
+        h1 {
+            text-align: center;
+            font-size: 16px;
+            margin: 0;
+        }
+
+        .export-date {
+            position: absolute;
+            top: 0;
+            right: 0;
+            font-size: 9px;
+            color: #333;
+            padding-top: 4px;
+        }
+
+        h2 {
+            font-size: 12px;
+            margin: 4mm 0 2mm 0;
+            padding: 2px 6px;
+            background: #e8e8e8;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: auto;
+            border: 2px solid #0a0a0a;
+        }
+
+        th, td {
+            border: 1px solid #0a0a0a;
+            padding: 2px 4px;
+            vertical-align: middle;
+            white-space: nowrap;
+        }
+
+        thead th {
+            text-align: center;
+            font-weight: 700;
+            font-size: 9px;
+            background: #d9e2f3;
+        }
+
+        td { font-size: 9px; }
+        td.date { text-align: left; font-weight: bold; }
+        td.absence { text-align: left; color: #c00; }
+        td.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;
+            margin-top: 6mm;
+        }
+
+        .signature-intro {
+            text-align: center;
+            font-weight: 700;
+            margin-bottom: 6mm;
+            font-size: 11px;
+        }
+
+        .signature-blocks {
+            display: table;
+            width: 100%;
+            table-layout: fixed;
+            border-collapse: separate;
+            border-spacing: 4mm 0;
+        }
+
+        .signature-block {
+            display: table-cell;
+            border: 1px solid #0a0a0a;
+            padding: 3mm;
+            vertical-align: top;
+            width: 33.33%;
+        }
+
+        .signature-block .title {
+            text-align: center;
+            font-weight: 700;
+            font-size: 11px;
+            margin-bottom: 7mm;
+            text-decoration: underline;
+        }
+
+        .signature-block .line {
+            margin-bottom: 2mm;
+            font-size: 10px;
+        }
+
+        .signature-block .signature-line {
+            margin-top: 6mm;
+            margin-bottom: 18mm;
+            font-size: 10px;
+        }
+    </style>
+</head>
+<body>
+
+{% set months = {
+    1:'Janvier', 2:'Février', 3:'Mars', 4:'Avril', 5:'Mai', 6:'Juin',
+    7:'Juillet', 8:'Août', 9:'Septembre', 10:'Octobre', 11:'Novembre', 12:'Décembre'
+} %}
+
+{% for entry in entries %}
+<div class="employee-section">
+    <div class="title-bar">
+        <h1>
+            {{ entry.employeeName }}{% if entry.contractLabel %} - {{ entry.contractLabel }}{% endif %}<br>
+            {% if month %}{{ months[month] }} {{ year }}{% else %}{{ year }}{% endif %}
+        </h1>
+        <div class="export-date">Exporté le {{ "now"|date('d/m/Y') }} à {{ "now"|date('H:i:s') }}</div>
+    </div>
+
+    {% for segment in entry.segments %}
+        {% if entry.segments|length > 1 %}
+            <h2>{{ segment.contractName ?? 'Contrat inconnu' }}{% if segment.mode == 'driver' %} (Chauffeur){% endif %}</h2>
+        {% endif %}
+
+        {% if segment.mode == 'presence' %}
+            <table>
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Absence</th>
+                        <th>Présence matin</th>
+                        <th>Présence après-midi</th>
+                        <th>Total</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for row in segment.rows %}
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
+                            <td class="date">{{ row.date }}</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>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% elseif segment.mode == 'driver' %}
+            <table>
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Absence</th>
+                        <th>Heures jour</th>
+                        <th>Heures nuit</th>
+                        <th>Heures atelier</th>
+                        <th>Total</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for row in segment.rows %}
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
+                            <td class="date">{{ row.date }}</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>
+                            <td class="total">{{ row.total }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% else %}
+            <table>
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Absence</th>
+                        <th>Début matin</th>
+                        <th>Fin matin</th>
+                        <th>Début après-midi</th>
+                        <th>Fin après-midi</th>
+                        <th>Début soir</th>
+                        <th>Fin soir</th>
+                        <th>Total</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for row in segment.rows %}
+                        <tr class="{{ row.isWeekend ? 'weekend' : (row.holidayLabel ? 'holiday' : '') }}">
+                            <td class="date">{{ row.date }}</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>
+                            <td class="time">{{ row.afternoonTo }}</td>
+                            <td class="time">{{ row.eveningFrom }}</td>
+                            <td class="time">{{ row.eveningTo }}</td>
+                            <td class="total">{{ row.total }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+    {% endfor %}
+
+    <div class="signature-footer">
+        <div class="signature-intro">
+            Nom + Prénom<br>
+            Signature avec mention « bon pour accord »
+        </div>
+
+        <div class="signature-blocks">
+            <div class="signature-block">
+                <p class="title">Direction</p>
+                <p class="line">Nom : ...............</p>
+                <p class="line">Prénom : ...............</p>
+                <p class="line">Mention : ........................................</p>
+                <p class="signature-line">Signature :</p>
+            </div>
+            <div class="signature-block">
+                <p class="title">Responsable usine</p>
+                <p class="line">Nom : ...............</p>
+                <p class="line">Prénom : ...............</p>
+                <p class="line">Mention : ........................................</p>
+                <p class="signature-line">Signature :</p>
+            </div>
+            <div class="signature-block">
+                <p class="title">Salarié</p>
+                <p class="line">Nom : ...............</p>
+                <p class="line">Prénom : ...............</p>
+                <p class="line">Mention : ........................................</p>
+                <p class="signature-line">Signature :</p>
+            </div>
+        </div>
+    </div>
+</div>
+{% endfor %}
+
+</body>
+</html>

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

@@ -14,10 +14,24 @@
             font-size: 9px;
         }
 
+        .title-bar {
+            position: relative;
+            margin: 0 0 4mm 0;
+        }
+
         h1 {
             text-align: center;
             font-size: 16px;
-            margin: 0 0 4mm 0;
+            margin: 0;
+        }
+
+        .export-date {
+            position: absolute;
+            top: 0;
+            right: 0;
+            font-size: 9px;
+            color: #333;
+            padding-top: 4px;
         }
 
         h2 {
@@ -51,14 +65,76 @@
         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;
+            margin-top: 6mm;
+        }
+
+        .signature-intro {
+            text-align: center;
+            font-weight: 700;
+            margin-bottom: 6mm;
+            font-size: 11px;
+        }
+
+        .signature-blocks {
+            display: table;
+            width: 100%;
+            table-layout: fixed;
+            border-collapse: separate;
+            border-spacing: 4mm 0;
+        }
+
+        .signature-block {
+            display: table-cell;
+            border: 1px solid #0a0a0a;
+            padding: 3mm;
+            vertical-align: top;
+            width: 33.33%;
+        }
+
+        .signature-block .title {
+            text-align: center;
+            font-weight: 700;
+            font-size: 11px;
+            margin-bottom: 7mm;
+            text-decoration: underline;
+        }
+
+        .signature-block .line {
+            margin-bottom: 2mm;
+            font-size: 10px;
+        }
+
+        .signature-block .signature-line {
+            margin-top: 6mm;
+            margin-bottom: 18mm;
+            font-size: 10px;
+        }
     </style>
 </head>
 <body>
 
-<h1>{{ employeeName }} - {{ year }}</h1>
+{% set months = {
+    1:'Janvier', 2:'Février', 3:'Mars', 4:'Avril', 5:'Mai', 6:'Juin',
+    7:'Juillet', 8:'Août', 9:'Septembre', 10:'Octobre', 11:'Novembre', 12:'Décembre'
+} %}
+<div class="title-bar">
+    <h1>
+        {{ employeeName }}{% if contractLabel %} - {{ contractLabel }}{% endif %}<br>
+        {% if month %}{{ months[month] }} {{ year }}{% else %}{{ year }}{% endif %}
+    </h1>
+    <div class="export-date">Exporté le {{ "now"|date('d/m/Y') }} à {{ "now"|date('H:i:s') }}</div>
+</div>
 
 {% for segment in segments %}
     {% if segments|length > 1 %}
@@ -78,9 +154,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr>
+                    <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>
@@ -102,9 +181,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr>
+                    <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>
@@ -130,9 +212,12 @@
             </thead>
             <tbody>
                 {% for row in segment.rows %}
-                    <tr>
+                    <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>
@@ -147,5 +232,36 @@
     {% endif %}
 {% endfor %}
 
+<div class="signature-footer">
+    <div class="signature-intro">
+        Nom + Prénom<br>
+        Signature avec mention « bon pour accord »
+    </div>
+
+    <div class="signature-blocks">
+        <div class="signature-block">
+            <p class="title">Direction</p>
+            <p class="line">Nom : ...............</p>
+            <p class="line">Prénom : ...............</p>
+            <p class="line">Mention : ........................................</p>
+            <p class="signature-line">Signature :</p>
+        </div>
+        <div class="signature-block">
+            <p class="title">Responsable usine</p>
+            <p class="line">Nom : ...............</p>
+            <p class="line">Prénom : ...............</p>
+            <p class="line">Mention : ........................................</p>
+            <p class="signature-line">Signature :</p>
+        </div>
+        <div class="signature-block">
+            <p class="title">Salarié</p>
+            <p class="line">Nom : ...............</p>
+            <p class="line">Prénom : ...............</p>
+            <p class="line">Mention : ........................................</p>
+            <p class="signature-line">Signature :</p>
+        </div>
+    </div>
+</div>
+
 </body>
 </html>

templates/leave-recap/print.html.twig

@@ -28,13 +28,22 @@
         .date-box {
             position: absolute;
             top: 0;
-            right: 0;
+            left: 0;
             border: 2px solid #000;
             padding: 4px 12px;
             font-size: 14px;
             font-weight: 700;
         }
 
+        .export-date {
+            position: absolute;
+            top: 0;
+            right: 0;
+            font-size: 10px;
+            color: #333;
+            padding-top: 6px;
+        }
+
         table.recap {
             width: 100%;
             border-collapse: collapse;
@@ -77,8 +86,9 @@
 <body>
 
 <div class="title-bar">
-    <h1>RECAPITULATIF CONGES & RTT</h1>
     <div class="date-box">{{ today|date('d/m/Y') }}</div>
+    <h1>RECAPITULATIF CONGES & RTT</h1>
+    <div class="export-date">Exporté le {{ "now"|date('d/m/Y') }} à {{ "now"|date('H:i:s') }}</div>
 </div>
 
 <table class="recap">

templates/salary-recap/print.html.twig

@@ -11,7 +11,7 @@
             margin: 0;
             padding: 2mm;
             font-family: Helvetica, sans-serif;
-            font-size: 10px;
+            font-size: 9px;
         }
 
         .title-bar {
@@ -28,7 +28,7 @@
         .month-box {
             position: absolute;
             top: 0;
-            right: 0;
+            left: 0;
             border: 2px solid #000;
             padding: 4px 12px;
             font-size: 14px;
@@ -36,16 +36,25 @@
             text-transform: uppercase;
         }
 
+        .export-date {
+            position: absolute;
+            top: 0;
+            right: 0;
+            font-size: 10px;
+            color: #333;
+            padding-top: 6px;
+        }
+
         table.recap {
             width: 100%;
             border-collapse: collapse;
             table-layout: auto;
-            border: 4px solid #0a0a0a;
+            border: 2px solid #0a0a0a;
         }
 
         th, td {
-            border: 2px solid #0a0a0a;
-            padding: 3px 3px;
+            border: 1px solid #0a0a0a;
+            padding: 2px 2px;
             vertical-align: middle;
             overflow: hidden;
             white-space: nowrap;
@@ -60,7 +69,7 @@
         thead th {
             text-align: center;
             font-weight: 700;
-            font-size: 10px;
+            font-size: 9px;
             white-space: normal;
         }
 
@@ -74,16 +83,16 @@
             text-align: left;
             white-space: normal;
             word-break: break-word;
-            font-size: 10px;
+            font-size: 9px;
         }
         td.obs  {
             text-align: left;
             white-space: normal;
             word-break: break-word;
-            font-size: 9px;
+            font-size: 8px;
         }
 
-        tbody td { font-size: 10px; }
+        tbody td { font-size: 9px; }
     </style>
 </head>
 <body>
@@ -94,43 +103,45 @@
 } %}
 
 <div class="title-bar">
-    <h1>RECAPITULATIF SALAIRE DU {{ from|date('d/m/Y') }} au {{ to|date('d/m/Y') }}</h1>
     <div class="month-box">{{ months[from|date('n')|number_format] }} {{ from|date('Y') }}</div>
+    <h1>RECAPITULATIF SALAIRE DU {{ from|date('d/m/Y') }} au {{ to|date('d/m/Y') }}</h1>
+    <div class="export-date">Exporté le {{ "now"|date('d/m/Y') }} à {{ "now"|date('H:i:s') }}</div>
 </div>
 
 <table class="recap">
     <thead>
         <tr>
-            <th rowspan="2" style="width: 24mm; text-align: left;">Nom</th>
-            <th rowspan="2" style="width: 12mm;">Base</th>
-            <th rowspan="2" style="width: 12mm;">Jour de<br>présence<br>Cadre</th>
-            <th rowspan="2" style="width: 9mm;">Frais<br>Kms</th>
-            <th rowspan="2" style="width: 9mm;">Heures<br>de<br>nuit</th>
-            <th rowspan="2" style="width: 9mm;">Panier<br>de<br>nuit</th>
-            <th rowspan="2" style="width: 12mm;">Heures<br>payés</th>
-            <th rowspan="2" style="width: 9mm;">Heures<br>dim.</th>
-            <th rowspan="2" style="width: 9mm;">Prime</th>
+            <th rowspan="2" style="width: 20mm; text-align: left;">Nom</th>
+            <th rowspan="2" style="width: 10mm;">Base</th>
+            <th rowspan="2" style="width: 10mm;">Jour de<br>présence<br>Cadre</th>
+            <th rowspan="2" style="width: 8mm;">Frais<br>Kms</th>
+            <th rowspan="2" style="width: 8mm;">Heures<br>de<br>nuit</th>
+            <th rowspan="2" style="width: 8mm;">Panier<br>de<br>nuit</th>
+            <th rowspan="2" style="width: 10mm;">Heures<br>payés</th>
+            <th rowspan="2" style="width: 8mm;">Heures<br>férié</th>
+            <th rowspan="2" style="width: 8mm;">Heures<br>dim.</th>
+            <th rowspan="2" style="width: 8mm;">Prime</th>
             <th colspan="2">Congés</th>
             <th colspan="2">Maladie</th>
             <th colspan="4">CHAUFFEUR</th>
-            <th rowspan="2" style="width: 26mm;">Observations</th>
+            <th rowspan="2" style="width: 20mm;">Observations</th>
         </tr>
         <tr>
-            <th style="width: 10mm;">Nbre</th>
-            <th style="width: 26mm;">Date</th>
-            <th style="width: 10mm;">Nbre</th>
-            <th style="width: 26mm;">Date</th>
-            <th style="width: 8mm;">PDJ</th>
-            <th style="width: 10mm;">REPAS</th>
-            <th style="width: 12mm;">NUITEE</th>
-            <th style="width: 12mm;">samedi</th>
+            <th style="width: 8mm;">Nbre</th>
+            <th style="width: 22mm;">Date</th>
+            <th style="width: 8mm;">Nbre</th>
+            <th style="width: 22mm;">Date</th>
+            <th style="width: 7mm;">PDJ</th>
+            <th style="width: 9mm;">REPAS</th>
+            <th style="width: 10mm;">NUITEE</th>
+            <th style="width: 10mm;">samedi</th>
         </tr>
     </thead>
     <tbody>
     {% for siteId, group in siteGroups %}
         {% set siteColor = group.color ?? '#B3E5FC' %}
         <tr class="site-header">
-            <td style="background: {{ siteColor }}; text-align: left;" colspan="18">
+            <td style="background: {{ siteColor }}; text-align: left;" colspan="19">
                 {{ group.name }}
             </td>
         </tr>
@@ -143,6 +154,7 @@
                 <td class="num">{{ row.nightHours > 0 ? row.nightHours : '' }}</td>
                 <td class="num">{{ row.nightBasketCount > 0 ? row.nightBasketCount : '' }}</td>
                 <td class="num">{{ row.paidHours > 0 ? row.paidHours : '' }}</td>
+                <td class="num">{{ row.holidayHours > 0 ? row.holidayHours : '' }}</td>
                 <td class="num">{{ row.sundayHours > 0 ? row.sundayHours : '' }}</td>
                 <td class="num">{{ row.bonusAmount > 0 ? row.bonusAmount ~ ' €' : '' }}</td>
                 <td class="num">{{ row.congesCount > 0 ? row.congesCount : '' }}</td>
@@ -157,7 +169,7 @@
             </tr>
         {% else %}
             <tr>
-                <td colspan="18">Aucun employé.</td>
+                <td colspan="19">Aucun employé.</td>
             </tr>
         {% endfor %}
     {% endfor %}

tests/Service/Contracts/EmployeeContractPeriodValidatorTest.php

@@ -94,6 +94,87 @@ final class EmployeeContractPeriodValidatorTest extends TestCase
         $this->validator->assertNextStartDateCompatible(new DateTimeImmutable('2026-03-10'), $currentPeriod);
     }
 
+    public function testAssertWorkDaysHoursAcceptsNullForStandardContract(): void
+    {
+        $this->validator->assertWorkDaysHours($this->buildContract(35), ContractNature::CDI, null);
+        self::assertTrue(true); // no exception
+    }
+
+    public function testAssertWorkDaysHoursRejectsScheduleOn35hContract(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->validator->assertWorkDaysHours($this->buildContract(35), ContractNature::CDI, [1 => 120]);
+    }
+
+    public function testAssertWorkDaysHoursRejectsScheduleOnForfaitContract(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->validator->assertWorkDaysHours($this->buildContract(null, Contract::TRACKING_PRESENCE), ContractNature::CDI, [1 => 120]);
+    }
+
+    public function testAssertWorkDaysHoursAcceptsNullForInterim(): void
+    {
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::INTERIM, null);
+        self::assertTrue(true);
+    }
+
+    public function testAssertWorkDaysHoursRequiresScheduleForCustomContract(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('workDaysHours is required');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, null);
+    }
+
+    public function testAssertWorkDaysHoursRequiresScheduleForCustomContractOnEmptyArray(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('workDaysHours is required');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, []);
+    }
+
+    public function testAssertWorkDaysHoursRejectsIsoOutsideOneToFive(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('iso weekdays 1-5');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, [6 => 120, 7 => 120]);
+    }
+
+    public function testAssertWorkDaysHoursRejectsIsoZero(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('iso weekdays 1-5');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, [0 => 240]);
+    }
+
+    public function testAssertWorkDaysHoursRejectsNegativeMinutes(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('non-negative integer minutes');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, [1 => -120, 4 => 360]);
+    }
+
+    public function testAssertWorkDaysHoursRejectsSumMismatch(): void
+    {
+        $this->expectException(UnprocessableEntityHttpException::class);
+        $this->expectExceptionMessage('total must equal contract weekly hours');
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, [1 => 60, 4 => 60]);
+    }
+
+    public function testAssertWorkDaysHoursAcceptsValidScheduleFor4hContract(): void
+    {
+        $this->validator->assertWorkDaysHours($this->buildContract(4), ContractNature::CDI, [1 => 120, 4 => 120]);
+        self::assertTrue(true);
+    }
+
+    private function buildContract(?int $weeklyHours, string $trackingMode = Contract::TRACKING_TIME): Contract
+    {
+        return new Contract()
+            ->setName('Test')
+            ->setTrackingMode($trackingMode)
+            ->setWeeklyHours($weeklyHours)
+        ;
+    }
+
     private function buildCurrentPeriod(string $startDate, ?string $endDate): EmployeeContractPeriod
     {
         $contract = new Contract()

tests/Service/WorkHours/HolidayVirtualHoursResolverTest.php

@@ -0,0 +1,181 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Service\WorkHours;
+
+use App\Entity\Contract;
+use App\Service\Contracts\EmployeeContractResolver;
+use App\Service\PublicHolidayServiceInterface;
+use App\Service\WorkHours\DailyReferenceMinutesResolver;
+use App\Service\WorkHours\HolidayVirtualHoursResolver;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
+
+/**
+ * @internal
+ */
+final class HolidayVirtualHoursResolverTest extends TestCase
+{
+    private HolidayVirtualHoursResolver $resolver;
+
+    protected function setUp(): void
+    {
+        $holidayService = $this->createStub(PublicHolidayServiceInterface::class);
+        $holidayService->method('getHolidaysDayByYears')->willReturnCallback(
+            static fn (string $zone, string $year): array => [
+                // Mon 14/07/2025 (lundi)
+                '2025-07-14' => '14 juillet',
+                // Fri 15/08/2025 (vendredi)
+                '2025-08-15' => '15 août',
+                // Sat 11/11/2025 (samedi)
+                '2025-11-15' => 'Samedi test',
+                // Thu 25/12/2025
+                '2025-12-25' => 'Noël',
+            ]
+        );
+
+        $this->resolver = new HolidayVirtualHoursResolver(
+            new DailyReferenceMinutesResolver(),
+            $holidayService,
+            $this->createStub(EmployeeContractResolver::class),
+        );
+    }
+
+    public function testReturnsZeroWhenContractIsNull(): void
+    {
+        self::assertSame(0, $this->resolver->resolveVirtualCredit(null, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function testReturnsZeroForForfaitPresenceContract(): void
+    {
+        $contract = new Contract()
+            ->setName('Forfait')
+            ->setTrackingMode('PRESENCE')
+            ->setWeeklyHours(null)
+        ;
+
+        self::assertSame(0, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function testReturnsZeroWhenDayIsNotHoliday(): void
+    {
+        $contract = $this->build35hContract();
+        self::assertSame(0, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-07')));
+    }
+
+    public function testReturnsZeroWhenHolidayFallsOnSaturday(): void
+    {
+        $contract = $this->build35hContract();
+        self::assertSame(0, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-11-15')));
+    }
+
+    public function test35hMondayGetsSevenHours(): void
+    {
+        $contract = $this->build35hContract();
+        self::assertSame(7 * 60, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function test39hMondayGetsEightHours(): void
+    {
+        $contract = $this->build39hContract();
+        self::assertSame(8 * 60, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function test39hFridayGetsSevenHours(): void
+    {
+        $contract = $this->build39hContract();
+        self::assertSame(7 * 60, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-08-15')));
+    }
+
+    public function testCustomContractUsesProRataReference(): void
+    {
+        $contract = new Contract()
+            ->setName('28h')
+            ->setTrackingMode('TIME')
+            ->setWeeklyHours(28)
+        ;
+        // 28h / 5 = 5.6h = 336 min
+        self::assertSame(336, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function testInterimContractAlsoReceivesCredit(): void
+    {
+        $contract = new Contract()
+            ->setName('Interim')
+            ->setTrackingMode('TIME')
+            ->setWeeklyHours(35)
+        ;
+
+        self::assertSame(7 * 60, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function testEffectiveDailyMinutesReturnsActualWhenGreaterThanReference(): void
+    {
+        $contract = $this->build39hContract();
+        // 10h worked on a férié Monday with 39h contract (ref = 8h)
+        self::assertSame(600, $this->resolver->resolveEffectiveDailyMinutes($contract, new DateTimeImmutable('2025-07-14'), 600));
+    }
+
+    public function testEffectiveDailyMinutesReturnsReferenceWhenActualLower(): void
+    {
+        $contract = $this->build39hContract();
+        // 4h worked on a férié Monday with 39h contract (ref = 8h) → 8h
+        self::assertSame(8 * 60, $this->resolver->resolveEffectiveDailyMinutes($contract, new DateTimeImmutable('2025-07-14'), 240));
+    }
+
+    public function testEffectiveDailyMinutesDelegatesWhenRuleDoesNotApply(): void
+    {
+        $contract = $this->build39hContract();
+        // Non-holiday day: rule does not apply, return actual
+        self::assertSame(420, $this->resolver->resolveEffectiveDailyMinutes($contract, new DateTimeImmutable('2025-07-07'), 420));
+    }
+
+    public function testFallsBackGracefullyWhenHolidayServiceFails(): void
+    {
+        $failingService = $this->createStub(PublicHolidayServiceInterface::class);
+        $failingService->method('getHolidaysDayByYears')->willThrowException(new RuntimeException('boom'));
+
+        $resolver = new HolidayVirtualHoursResolver(
+            new DailyReferenceMinutesResolver(),
+            $failingService,
+            $this->createStub(EmployeeContractResolver::class),
+        );
+
+        self::assertSame(0, $resolver->resolveVirtualCredit($this->build35hContract(), new DateTimeImmutable('2025-07-14')));
+    }
+
+    public function testScheduledWorkdayGetsCreditOnHoliday(): void
+    {
+        // 4h contract, schedule Mon 2h + Thu 2h
+        $contract = new Contract()->setName('4h')->setTrackingMode('TIME')->setWeeklyHours(4);
+        // Holiday 2025-07-14 is a Monday → 120 min credit
+        self::assertSame(120, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14'), false, [1 => 120, 4 => 120]));
+    }
+
+    public function testUnscheduledWorkdayGetsZeroOnHoliday(): void
+    {
+        $contract = new Contract()->setName('4h')->setTrackingMode('TIME')->setWeeklyHours(4);
+        // Holiday 2025-07-14 is a Monday but schedule only Tue+Fri → 0
+        self::assertSame(0, $this->resolver->resolveVirtualCredit($contract, new DateTimeImmutable('2025-07-14'), false, [2 => 120, 5 => 120]));
+    }
+
+    private function build35hContract(): Contract
+    {
+        return new Contract()
+            ->setName('35h')
+            ->setTrackingMode('TIME')
+            ->setWeeklyHours(35)
+        ;
+    }
+
+    private function build39hContract(): Contract
+    {
+        return new Contract()
+            ->setName('39h')
+            ->setTrackingMode('TIME')
+            ->setWeeklyHours(39)
+        ;
+    }
+}

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(
-            new DailyReferenceMinutesResolver(),
-            $service,
-            $this->createStub(EmployeeContractResolver::class),
-        );
+        return $service;
     }
 
     private function buildResolverStub(): EmployeeContractResolver