chore: bump version to v0.1.61

CLAUDE.md

@@ -45,7 +45,8 @@
 - Contracts >= 39h: +25% from 39h to 43h, +50% beyond
 - CUSTOM contracts (weeklyHours ≠ 35 and ≠ 39, not INTERIM/FORFAIT): reference = actual contractual hours, no 25%/50% bonuses (1h overtime = 1h recovery), deficit doesn't impact balance
 - INTERIM: no overtime bonuses, no recovery time
-- Driver contracts: no overtime calculation
+- Driver contracts: RTT uses `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` instead of morning/afternoon/evening time ranges
+- FORFAIT weekend/holiday bonus: each weekend or public holiday day worked gives bonus leave (full day if morning+afternoon, 0.5 if only one). Added to acquired days, no cap. PRESENCE mode only.
 
 ## Frais (MileageAllowance)
 - Onglet "Frais" (anciennement "Frais Kms") sur la fiche employé

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.59'
+    app.version: '0.1.61'

doc/functional-rules.md

@@ -154,7 +154,7 @@ Documents complementaires:
   - jour/nuit/atelier par jour + indicateurs repas/dîner/nuitée
   - panier de nuit (PN): affiché par jour si (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit au moins 4h de travail entre 21h et 6h), et total hebdo dans la colonne Jour/Nuit sem.
   - totaux hebdo: jour, nuit, atelier, total, compteurs petit déj/déjeuner/dîner/nuitée
-  - pas de calcul d'heures supplémentaires pour les conducteurs
+  - les conducteurs utilisent `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` pour le calcul RTT (au lieu des créneaux morning/afternoon/evening)
 - Le flag `isDriver` est sur `EmployeeContractPeriod` (un employé peut changer de statut chauffeur selon la période)
 - Exposé en API via un getter virtuel sur `Employee` (`employee:read`) qui résout depuis la période active
 
@@ -231,6 +231,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
         - en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22
       - contrat `FORFAIT`:
         - base annuelle: `jours ouvrés de l'exercice (lundi-vendredi, hors jours fériés métropole) - 218`
+        - bonus weekend/férié: chaque jour travaillé un weekend ou jour férié donne 1 jour de congé supplémentaire (journée ≥ 5h = 1.0 jour, demi-journée > 0h et < 5h = 0.5 jour), sans plafond
         - prorata: en cas de démarrage/fin de contrat en cours d'année civile, le calcul ne couvre que l'intervalle actif du contrat dans l'année
         - reste à prendre: `acquis - absences` (toutes absences, demi-journées incluses)
         - pas de samedi (`0`)

src/Repository/WorkHourRepository.php

@@ -191,6 +191,57 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
         return $result;
     }
 
+    /**
+     * Count weekend and public holiday worked days for forfait bonus leave (PRESENCE mode only).
+     * Morning + afternoon = 1.0 day, one only = 0.5 day.
+     *
+     * @param list<string> $publicHolidayDates Y-m-d formatted weekday public holiday dates
+     */
+    public function countWeekendAndHolidayWorkedDays(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidayDates = []): float
+    {
+        $targetDates = [];
+
+        // Collect weekend dates in range
+        for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
+            if ((int) $cursor->format('N') >= 6) {
+                $targetDates[] = $cursor;
+            }
+        }
+
+        // Add weekday public holidays
+        foreach ($publicHolidayDates as $date) {
+            $targetDates[] = new DateTimeImmutable($date);
+        }
+
+        if ([] === $targetDates) {
+            return 0.0;
+        }
+
+        $dateStrings = array_map(static fn (DateTimeImmutable $d): string => $d->format('Y-m-d'), $targetDates);
+
+        /** @var list<WorkHour> $rows */
+        $rows = $this->createQueryBuilder('w')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate IN (:dates)')
+            ->andWhere('w.isPresentMorning = true OR w.isPresentAfternoon = true')
+            ->setParameter('employee', $employee)
+            ->setParameter('dates', $dateStrings)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $total = 0.0;
+        foreach ($rows as $row) {
+            if ($row->isPresentMorning() && $row->isPresentAfternoon()) {
+                $total += 1.0;
+            } else {
+                $total += 0.5;
+            }
+        }
+
+        return $total;
+    }
+
     /**
      * Return the set of Y-m-d dates where the employee has worked hours on the given dates.
      *

src/Service/Rtt/RttRecoveryComputationService.php

@@ -252,6 +252,20 @@ final readonly class RttRecoveryComputationService
 
     private function computeMetrics(WorkHour $workHour): WorkMetrics
     {
+        $driverDay      = $workHour->getDayHoursMinutes() ?? 0;
+        $driverNight    = $workHour->getNightHoursMinutes() ?? 0;
+        $driverWorkshop = $workHour->getWorkshopHoursMinutes() ?? 0;
+
+        if ($driverDay > 0 || $driverNight > 0 || $driverWorkshop > 0) {
+            $totalMinutes = $driverDay + $driverNight + $driverWorkshop;
+
+            return new WorkMetrics(
+                dayMinutes: $driverDay + $driverWorkshop,
+                nightMinutes: $driverNight,
+                totalMinutes: $totalMinutes,
+            );
+        }
+
         $ranges = [
             [$workHour->getMorningFrom(), $workHour->getMorningTo()],
             [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],

src/State/EmployeeLeaveSummaryProvider.php

@@ -535,10 +535,21 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $type = $employee->getContract()?->getType();
         if (ContractType::FORFAIT === $type) {
             $businessDaysInPeriod = $this->countBusinessDays($from, $to);
+            $publicHolidays       = $this->buildPublicHolidayMap($from, $to);
+            $weekdayHolidays      = array_filter(
+                array_keys($publicHolidays),
+                static fn (string $date): bool => (int) new DateTimeImmutable($date)->format('N') <= 5
+            );
+            $bonusDays = $this->workHourRepository->countWeekendAndHolidayWorkedDays(
+                $employee,
+                $from,
+                $to,
+                array_values($weekdayHolidays)
+            );
 
             return [
                 'ruleCode'                => LeaveRuleCode::FORFAIT_218->value,
-                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS),
+                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS) + $bonusDays,
                 'acquiredSaturdays'       => 0.0,
                 'accrualPerMonth'         => 0.0,
                 'saturdayAccrualPerMonth' => 0.0,