fix : redirection après login + écran des heures chauffeurs

2026-03-16 09:13:35 +01:00
parent 3d26d6b50f
commit 01f8058f56
14 changed files with 255 additions and 77 deletions
--- a/src/State/WorkHourBulkUpsertProcessor.php
+++ b/src/State/WorkHourBulkUpsertProcessor.php
@@ -229,8 +229,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * }
     */
@@ -238,37 +240,41 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
    {
        if ($isDriver) {
            return [
-                'morningFrom'        => null,
-                'morningTo'          => null,
-                'afternoonFrom'      => null,
-                'afternoonTo'        => null,
-                'eveningFrom'        => null,
-                'eveningTo'          => null,
-                'isPresentMorning'   => false,
-                'isPresentAfternoon' => false,
-                'dayHoursMinutes'    => $this->normalizeMinutes($entry['dayHoursMinutes'] ?? null, $employeeId, 'dayHoursMinutes'),
-                'nightHoursMinutes'  => $this->normalizeMinutes($entry['nightHoursMinutes'] ?? null, $employeeId, 'nightHoursMinutes'),
-                'hasBreakfast'       => $this->normalizePresence($entry['hasBreakfast'] ?? false, $employeeId, 'hasBreakfast'),
-                'hasLunch'           => $this->normalizePresence($entry['hasLunch'] ?? false, $employeeId, 'hasLunch'),
-                'hasOvernight'       => $this->normalizePresence($entry['hasOvernight'] ?? false, $employeeId, 'hasOvernight'),
+                'morningFrom'          => null,
+                'morningTo'            => null,
+                'afternoonFrom'        => null,
+                'afternoonTo'          => null,
+                'eveningFrom'          => null,
+                'eveningTo'            => null,
+                'isPresentMorning'     => false,
+                'isPresentAfternoon'   => false,
+                'dayHoursMinutes'      => $this->normalizeMinutes($entry['dayHoursMinutes'] ?? null, $employeeId, 'dayHoursMinutes'),
+                'nightHoursMinutes'    => $this->normalizeMinutes($entry['nightHoursMinutes'] ?? null, $employeeId, 'nightHoursMinutes'),
+                'workshopHoursMinutes' => $this->normalizeMinutes($entry['workshopHoursMinutes'] ?? null, $employeeId, 'workshopHoursMinutes'),
+                'hasBreakfast'         => $this->normalizePresence($entry['hasBreakfast'] ?? false, $employeeId, 'hasBreakfast'),
+                'hasLunch'             => $this->normalizePresence($entry['hasLunch'] ?? false, $employeeId, 'hasLunch'),
+                'hasDinner'            => $this->normalizePresence($entry['hasDinner'] ?? false, $employeeId, 'hasDinner'),
+                'hasOvernight'         => $this->normalizePresence($entry['hasOvernight'] ?? false, $employeeId, 'hasOvernight'),
            ];
        }

        if ($isPresenceTracking) {
            return [
-                'morningFrom'        => null,
-                'morningTo'          => null,
-                'afternoonFrom'      => null,
-                'afternoonTo'        => null,
-                'eveningFrom'        => null,
-                'eveningTo'          => null,
-                'isPresentMorning'   => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
-                'isPresentAfternoon' => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
-                'dayHoursMinutes'    => null,
-                'nightHoursMinutes'  => null,
-                'hasBreakfast'       => false,
-                'hasLunch'           => false,
-                'hasOvernight'       => false,
+                'morningFrom'          => null,
+                'morningTo'            => null,
+                'afternoonFrom'        => null,
+                'afternoonTo'          => null,
+                'eveningFrom'          => null,
+                'eveningTo'            => null,
+                'isPresentMorning'     => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
+                'isPresentAfternoon'   => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
+                'dayHoursMinutes'      => null,
+                'nightHoursMinutes'    => null,
+                'workshopHoursMinutes' => null,
+                'hasBreakfast'         => false,
+                'hasLunch'             => false,
+                'hasDinner'            => false,
+                'hasOvernight'         => false,
            ];
        }

@@ -281,13 +287,15 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            'eveningTo'     => $this->normalizeTime($entry['eveningTo'] ?? null, $employeeId, 'eveningTo'),
            // On conserve aussi la présence si envoyée (cas forfait affiché côté UI),
            // même si le contrat résolu ce jour est en suivi horaire.
-            'isPresentMorning'   => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
-            'isPresentAfternoon' => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
-            'dayHoursMinutes'    => null,
-            'nightHoursMinutes'  => null,
-            'hasBreakfast'       => false,
-            'hasLunch'           => false,
-            'hasOvernight'       => false,
+            'isPresentMorning'     => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
+            'isPresentAfternoon'   => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
+            'dayHoursMinutes'      => null,
+            'nightHoursMinutes'    => null,
+            'workshopHoursMinutes' => null,
+            'hasBreakfast'         => false,
+            'hasLunch'             => false,
+            'hasDinner'            => false,
+            'hasOvernight'         => false,
        ];
    }

@@ -368,8 +376,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -385,8 +395,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            && false === $entry['isPresentAfternoon']
            && (null === $entry['dayHoursMinutes'] || 0 === $entry['dayHoursMinutes'])
            && (null === $entry['nightHoursMinutes'] || 0 === $entry['nightHoursMinutes'])
+            && (null === $entry['workshopHoursMinutes'] || 0 === $entry['workshopHoursMinutes'])
            && false === $entry['hasBreakfast']
            && false === $entry['hasLunch']
+            && false === $entry['hasDinner']
            && false === $entry['hasOvernight'];
    }

@@ -402,8 +414,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -420,8 +434,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            ->setIsPresentAfternoon($entry['isPresentAfternoon'])
            ->setDayHoursMinutes($entry['dayHoursMinutes'])
            ->setNightHoursMinutes($entry['nightHoursMinutes'])
+            ->setWorkshopHoursMinutes($entry['workshopHoursMinutes'])
            ->setHasBreakfast($entry['hasBreakfast'])
            ->setHasLunch($entry['hasLunch'])
+            ->setHasDinner($entry['hasDinner'])
            ->setHasOvernight($entry['hasOvernight'])
            // Toute modification invalide la validation chef de site.
            ->setIsSiteValid(false)
@@ -442,8 +458,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -459,8 +477,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            && $workHour->getIsPresentAfternoon() === $entry['isPresentAfternoon']
            && $workHour->getDayHoursMinutes() === $entry['dayHoursMinutes']
            && $workHour->getNightHoursMinutes() === $entry['nightHoursMinutes']
+            && $workHour->getWorkshopHoursMinutes() === $entry['workshopHoursMinutes']
            && $workHour->getHasBreakfast() === $entry['hasBreakfast']
            && $workHour->getHasLunch() === $entry['hasLunch']
+            && $workHour->getHasDinner() === $entry['hasDinner']
            && $workHour->getHasOvernight() === $entry['hasOvernight'];
    }
 }
--- a/src/State/WorkHourWeeklySummaryProvider.php
+++ b/src/State/WorkHourWeeklySummaryProvider.php
@@ -127,14 +127,16 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
            // Pré-calcul des métriques par salarié/date pour simplifier l'agrégation finale.
            $dateKey                                      = $workHour->getWorkDate()->format('Y-m-d');
            $metricsByEmployeeDate[$employeeId][$dateKey] = [
-                'metrics'            => $this->computeMetrics($workHour),
-                'isPresentMorning'   => $workHour->getIsPresentMorning(),
-                'isPresentAfternoon' => $workHour->getIsPresentAfternoon(),
-                'dayHoursMinutes'    => $workHour->getDayHoursMinutes(),
-                'nightHoursMinutes'  => $workHour->getNightHoursMinutes(),
-                'hasBreakfast'       => $workHour->getHasBreakfast(),
-                'hasLunch'           => $workHour->getHasLunch(),
-                'hasOvernight'       => $workHour->getHasOvernight(),
+                'metrics'              => $this->computeMetrics($workHour),
+                'isPresentMorning'     => $workHour->getIsPresentMorning(),
+                'isPresentAfternoon'   => $workHour->getIsPresentAfternoon(),
+                'dayHoursMinutes'      => $workHour->getDayHoursMinutes(),
+                'nightHoursMinutes'    => $workHour->getNightHoursMinutes(),
+                'workshopHoursMinutes' => $workHour->getWorkshopHoursMinutes(),
+                'hasBreakfast'         => $workHour->getHasBreakfast(),
+                'hasLunch'             => $workHour->getHasLunch(),
+                'hasDinner'            => $workHour->getHasDinner(),
+                'hasOvernight'         => $workHour->getHasOvernight(),
            ];
        }

@@ -185,14 +187,16 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                continue;
            }

-            $weeklyDayMinutes     = 0;
-            $weeklyNightMinutes   = 0;
-            $weeklyTotalMinutes   = 0;
-            $weeklyPresenceCount  = 0.0;
-            $weeklyBreakfastCount = 0;
-            $weeklyLunchCount     = 0;
-            $weeklyOvernightCount = 0;
-            $daily                = [];
+            $weeklyDayMinutes      = 0;
+            $weeklyNightMinutes    = 0;
+            $weeklyWorkshopMinutes = 0;
+            $weeklyTotalMinutes    = 0;
+            $weeklyPresenceCount   = 0.0;
+            $weeklyBreakfastCount  = 0;
+            $weeklyLunchCount      = 0;
+            $weeklyDinnerCount     = 0;
+            $weeklyOvernightCount  = 0;
+            $daily                 = [];
            // Les contrats au suivi "présence" ne manipulent pas les heures, mais des demi-journées.
            $weekAnchorContract = $contractsByEmployeeDate[$employeeId][$anchorDateYmd]
                ?? $contractsByEmployeeDate[$employeeId][$days[0]]
@@ -217,21 +221,27 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface

                $hasBreakfast = false;
                $hasLunch     = false;
+                $hasDinner    = false;
                $hasOvernight = false;

                if ($isDateDriver) {
-                    $dayMinutes   = ($entry['dayHoursMinutes'] ?? 0);
-                    $nightMinutes = ($entry['nightHoursMinutes'] ?? 0);
-                    $totalMinutes = $dayMinutes + $nightMinutes;
-                    $hasBreakfast = $entry['hasBreakfast'] ?? false;
-                    $hasLunch     = $entry['hasLunch'] ?? false;
-                    $hasOvernight = $entry['hasOvernight'] ?? false;
+                    $dayMinutes      = ($entry['dayHoursMinutes'] ?? 0);
+                    $nightMinutes    = ($entry['nightHoursMinutes'] ?? 0);
+                    $workshopMinutes = ($entry['workshopHoursMinutes'] ?? 0);
+                    $totalMinutes    = $dayMinutes + $nightMinutes + $workshopMinutes;
+                    $hasBreakfast    = $entry['hasBreakfast'] ?? false;
+                    $hasLunch        = $entry['hasLunch'] ?? false;
+                    $hasDinner       = $entry['hasDinner'] ?? false;
+                    $hasOvernight    = $entry['hasOvernight'] ?? false;
                    if ($hasBreakfast) {
                        ++$weeklyBreakfastCount;
                    }
                    if ($hasLunch) {
                        ++$weeklyLunchCount;
                    }
+                    if ($hasDinner) {
+                        ++$weeklyDinnerCount;
+                    }
                    if ($hasOvernight) {
                        ++$weeklyOvernightCount;
                    }
@@ -239,9 +249,10 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    $metrics = $entry['metrics'] ?? new WorkMetrics();
                    // Les absences "comptées comme travaillées" alimentent le total du jour.
                    $metrics->addCreditedMinutes($creditedMinutes);
-                    $dayMinutes   = $metrics->dayMinutes;
-                    $nightMinutes = $metrics->nightMinutes;
-                    $totalMinutes = $metrics->totalMinutes;
+                    $dayMinutes      = $metrics->dayMinutes;
+                    $nightMinutes    = $metrics->nightMinutes;
+                    $workshopMinutes = 0;
+                    $totalMinutes    = $metrics->totalMinutes;
                }

                $present = null;
@@ -256,6 +267,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface

                $weeklyDayMinutes += $dayMinutes;
                $weeklyNightMinutes += $nightMinutes;
+                $weeklyWorkshopMinutes += $workshopMinutes;
                $weeklyTotalMinutes += $totalMinutes;
                if (null !== $present) {
                    $weeklyPresenceCount += $present;
@@ -265,6 +277,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    date: $date,
                    dayMinutes: $dayMinutes,
                    nightMinutes: $nightMinutes,
+                    workshopMinutes: $workshopMinutes,
                    totalMinutes: $totalMinutes,
                    present: $present,
                    hasAbsence: $absenceByEmployeeDate[$employeeId][$date] ?? false,
@@ -272,6 +285,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    absenceColor: $absenceColorByEmployeeDate[$employeeId][$date] ?? null,
                    hasBreakfast: $hasBreakfast,
                    hasLunch: $hasLunch,
+                    hasDinner: $hasDinner,
                    hasOvernight: $hasOvernight,
                );
            }
@@ -304,6 +318,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                daily: $daily,
                weeklyDayMinutes: $weeklyDayMinutes,
                weeklyNightMinutes: $weeklyNightMinutes,
+                weeklyWorkshopMinutes: $weeklyWorkshopMinutes,
                weeklyTotalMinutes: $weeklyTotalMinutes,
                weeklyPresenceCount: $weeklyPresenceCount,
                weeklyOvertimeTotalMinutes: $weeklyOvertimeTotalMinutes,
@@ -313,6 +328,7 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                isDriver: $isDriver,
                weeklyBreakfastCount: $weeklyBreakfastCount,
                weeklyLunchCount: $weeklyLunchCount,
+                weeklyDinnerCount: $weeklyDinnerCount,
                weeklyOvernightCount: $weeklyOvernightCount,
            );
        }