chore: bump version to v0.1.83

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.81'
+    app.version: '0.1.83'

frontend/components/driver-hours/DriverHoursDayView.vue

@@ -25,19 +25,7 @@
               @change="onBulkValidationChange"
           />
         </span>
-                <span v-else-if="isSiteManager" class="inline-flex items-center gap-2">
-          <span>Site</span>
-          <input
-              ref="bulkSiteValidationInput"
-              :checked="isBulkSiteValidationChecked"
-              type="checkbox"
-              class="h-4 w-4"
-              :class="canBulkToggleSiteValidation ? 'cursor-pointer' : 'cursor-not-allowed opacity-50'"
-              :disabled="!canBulkToggleSiteValidation"
-              @change="onBulkSiteValidationChange"
-          />
-        </span>
-                <span v-else>Site <Icon name="mdi:check-bold" class="ml-1"/></span>
+                <span v-else-if="!isSiteManager">Site <Icon name="mdi:check-bold" class="ml-1"/></span>
                 <span v-if="!isAdmin">RH <Icon name="mdi:check-bold" class="ml-1"/></span>
             </div>
 
@@ -147,16 +135,8 @@
                             @change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
                         />
                     </div>
-                    <div v-else class="text-right p-5">
-                        <input
-                            v-if="isSiteManager"
-                            :checked="rows[employee.id]?.isSiteValid ?? false"
-                            type="checkbox"
-                            class="h-4 w-4 cursor-pointer"
-                            :disabled="(!canToggleSiteValidation(employee.id) && !canCreateSiteValidationRowFromAbsence(employee.id)) || isSiteValidationPending(employee.id)"
-                            @change="onToggleSiteValidation(employee.id, ($event.target as HTMLInputElement).checked)"
-                        />
-                        <span v-else-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
+                    <div v-else-if="!isSiteManager" class="text-right p-5">
+                        <span v-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
                         <span v-else class="text-xs text-neutral-500">-</span>
                     </div>
                     <div v-if="!isAdmin">

frontend/components/hours/HoursDayView.vue

@@ -26,19 +26,7 @@
               @change="onBulkValidationChange"
           />
         </span>
-                <span v-else-if="isSiteManager" class="inline-flex items-center gap-2">
-          <span>Site</span>
-          <input
-              ref="bulkSiteValidationInput"
-              :checked="isBulkSiteValidationChecked"
-              type="checkbox"
-              class="h-4 w-4"
-              :class="canBulkToggleSiteValidation ? 'cursor-pointer' : 'cursor-not-allowed opacity-50'"
-              :disabled="!canBulkToggleSiteValidation"
-              @change="onBulkSiteValidationChange"
-          />
-        </span>
-                <span v-else>Site <Icon name="mdi:check-bold" class="ml-1"/></span>
+                <span v-else-if="!isSiteManager">Site <Icon name="mdi:check-bold" class="ml-1"/></span>
                 <span v-if="!isAdmin">RH  <Icon name="mdi:check-bold" class="ml-1"/></span>
             </div>
 
@@ -181,16 +169,8 @@
                         @change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
                     />
                 </div>
-                <div v-else class="text-right p-5">
-                    <input
-                        v-if="isSiteManager"
-                        :checked="rows[employee.id]?.isSiteValid ?? false"
-                        type="checkbox"
-                        class="h-4 w-4 cursor-pointer"
-                        :disabled="(!canToggleSiteValidation(employee.id) && !canCreateSiteValidationRowFromAbsence(employee.id)) || isSiteValidationPending(employee.id)"
-                        @change="onToggleSiteValidation(employee.id, ($event.target as HTMLInputElement).checked)"
-                    />
-                    <span v-else-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
+                <div v-else-if="!isSiteManager" class="text-right p-5">
+                    <span v-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
                     <span v-else class="text-xs text-neutral-500">-</span>
                 </div>
                 <div v-if="!isAdmin">

frontend/composables/useDriverHoursPage.ts

@@ -71,7 +71,7 @@ export const useDriverHoursPage = () => {
 
   const dayGridCols = computed(() => {
     const metricCol = '0.4fr'
-    const validationCols = isAdmin.value ? `${metricCol}` : `${metricCol} ${metricCol}`
+    const validationCols = isAdmin.value || isSiteManager.value ? `${metricCol}` : `${metricCol} ${metricCol}`
     return `1.2fr 0.6fr 0.8fr 0.8fr 0.8fr ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
   })
 

frontend/composables/useHoursPage.ts

@@ -73,7 +73,7 @@ export const useHoursPage = () => {
 
   const dayGridCols = computed(() => {
     const metricCol = '0.4fr'
-    const validationCols = isAdmin.value ? `${metricCol}` : `${metricCol} ${metricCol}`
+    const validationCols = isAdmin.value || isSiteManager.value ? `${metricCol}` : `${metricCol} ${metricCol}`
     return `1.2fr 0.6fr repeat(6, 0.8fr) ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
   })
 

src/State/EmployeeLeaveSummaryProvider.php

@@ -330,6 +330,13 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $this->resolveCurrentLeaveYear($today);
     }
 
+    public function resolvePaidLeaveDays(Employee $employee, string $ruleCode, int $year): float
+    {
+        $balance = $this->leaveBalanceRepository->findOneByEmployeeRuleAndYear($employee, $ruleCode, $year);
+
+        return null !== $balance ? $balance->getPaidLeaveDays() : 0.0;
+    }
+
     private function resolveEffectivePeriodStart(
         Employee $employee,
         DateTimeImmutable $from,
@@ -778,13 +785,6 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return null !== $balance ? $balance->getFractionedDays() : 0.0;
     }
 
-    private function resolvePaidLeaveDays(Employee $employee, string $ruleCode, int $year): float
-    {
-        $balance = $this->leaveBalanceRepository->findOneByEmployeeRuleAndYear($employee, $ruleCode, $year);
-
-        return null !== $balance ? $balance->getPaidLeaveDays() : 0.0;
-    }
-
     private function resolveCurrentLeaveYear(DateTimeImmutable $today): int
     {
         $year  = (int) $today->format('Y');

src/State/LeaveRecapPrintProvider.php

@@ -104,6 +104,13 @@ class LeaveRecapPrintProvider implements ProviderInterface
 
             if (null !== $yearSummary) {
                 if ($isForfait) {
+                    $paidLeaveDays = $this->leaveSummaryProvider->resolvePaidLeaveDays($employee, $yearSummary['ruleCode'], $leaveYear);
+                    if ($paidLeaveDays > 0.0) {
+                        $recomputed = $this->leaveSummaryProvider->computeYearSummary($employee, $leaveYear, $paidLeaveDays);
+                        if (null !== $recomputed) {
+                            $yearSummary = $recomputed;
+                        }
+                    }
                     $cpN1Remaining     = round($yearSummary['previousYearRemainingDays'], 2);
                     $cpN               = (string) round($yearSummary['acquiredDays'], 2);
                     $acquiredSaturdays = '-';