chore: bump version to v0.1.24

.claude/settings.local.json

@@ -6,7 +6,8 @@
       "Bash(php:*)",
       "Bash(docker compose:*)",
       "Bash(make test:*)",
-      "Bash(grep:*)"
+      "Bash(grep:*)",
+      "Bash(docker exec:*)"
     ]
   }
 }

config/services.yaml

@@ -22,6 +22,10 @@ services:
     App\:
         resource: '../src/'
 
+    App\Service\PublicHolidayService:
+        arguments:
+            $holidayUrl: '%env(HOLIDAY_URL)%'
+
     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.20'
+    app.version: '0.1.24'

frontend/components/employees/ContractTab.vue

@@ -162,9 +162,9 @@
           <input id="create-contract-start-date" v-model="createContractForm.startDate" type="date" :class="createContractStartDateFieldClass" />
         </div>
 
-        <div v-if="requiresCreateContractEndDate">
+        <div v-if="showsCreateContractEndDate">
           <label class="text-md font-semibold text-neutral-700" for="create-contract-end-date">
-            Fin contrat <span class="text-red-600">*</span>
+            Fin contrat <span v-if="requiresCreateContractEndDate" class="text-red-600">*</span>
           </label>
           <input id="create-contract-end-date" v-model="createContractForm.endDate" type="date" :class="createContractEndDateFieldClass" />
         </div>
@@ -235,6 +235,7 @@ defineProps<{
   createContractNatureFieldClass: string
   createContractFieldClass: string
   createContractStartDateFieldClass: string
+  showsCreateContractEndDate: boolean
   requiresCreateContractEndDate: boolean
   createContractEndDateFieldClass: string
   isCreateContractFormValid: boolean

frontend/composables/useEmployeeDetailPage.ts

@@ -11,7 +11,7 @@ import { getEmployeeRttSummary, createRttPayment } from '~/services/employee-rtt
 import { getEmployee, updateEmployee } from '~/services/employees'
 import { listPublicHolidays } from '~/services/public-holidays'
 import { formatNullableYmdToFr, getTodayYmd, shiftYmd } from '~/utils/date'
-import { contractNatureLabel, isContractNature, requiresContractEndDate } from '~/utils/contract'
+import { contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate } from '~/utils/contract'
 
 export const useEmployeeDetailPage = () => {
   const route = useRoute()
@@ -99,6 +99,7 @@ export const useEmployeeDetailPage = () => {
   const isContractEndDateValid = computed(() => contractForm.endDate !== '')
   const showContractEndDateError = computed(() => validationTouched.endDate && !isContractEndDateValid.value)
 
+  const showsCreateContractEndDate = computed(() => showsContractEndDate(createContractForm.contractNature))
   const requiresCreateContractEndDate = computed(() => requiresContractEndDate(createContractForm.contractNature))
   const isCreateContractValid = computed(() => createContractForm.contractId !== '')
   const isCreateContractNatureValid = computed(() => isContractNature(createContractForm.contractNature))
@@ -314,8 +315,8 @@ export const useEmployeeDetailPage = () => {
     await loadEmployee()
   }
 
-  watch(requiresCreateContractEndDate, (required) => {
+  watch(showsCreateContractEndDate, (shows) => {
-    if (!required) {
+    if (!shows) {
       createContractForm.endDate = ''
     }
   })
@@ -353,6 +354,7 @@ export const useEmployeeDetailPage = () => {
     createContractNatureFieldClass,
     createContractFieldClass,
     createContractStartDateFieldClass,
+    showsCreateContractEndDate,
     requiresCreateContractEndDate,
     createContractEndDateFieldClass,
     isCreateContractFormValid,

frontend/pages/employees/[id].vue

@@ -78,6 +78,7 @@
                     :create-contract-nature-field-class="createContractNatureFieldClass"
                     :create-contract-field-class="createContractFieldClass"
                     :create-contract-start-date-field-class="createContractStartDateFieldClass"
+                    :shows-create-contract-end-date="showsCreateContractEndDate"
                     :requires-create-contract-end-date="requiresCreateContractEndDate"
                     :create-contract-end-date-field-class="createContractEndDateFieldClass"
                     :is-create-contract-form-valid="isCreateContractFormValid"
@@ -131,6 +132,7 @@ const {
     createContractNatureFieldClass,
     createContractFieldClass,
     createContractStartDateFieldClass,
+    showsCreateContractEndDate,
     requiresCreateContractEndDate,
     createContractEndDateFieldClass,
     isCreateContractFormValid,

frontend/pages/employees/index.vue

@@ -154,7 +154,7 @@
                             La date de début est obligatoire.
                         </p>
                     </div>
-                    <div v-if="requiresContractEndDateComputed">
+                    <div v-if="showsContractEndDateComputed">
                         <label class="text-md font-semibold text-neutral-700" for="contract-end-date">
                             Fin contrat
                             <span v-if="requiresContractEndDateComputed" class="text-red-600">*</span>
@@ -166,7 +166,7 @@
                             :class="contractEndDateFieldClass"
                         />
                         <p v-if="showContractEndDateError" class="mt-1 text-sm text-red-600">
-                            La date de fin est obligatoire pour un CDD ou un intérim.
+                            La date de fin est obligatoire pour un CDD.
                         </p>
                     </div>
                 </template>
@@ -199,7 +199,7 @@ 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 {contractNatureLabel, isContractNature, requiresContractEndDate} from '~/utils/contract'
+import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
 
 useHead({
     title: 'Employés'
@@ -264,6 +264,7 @@ const isSiteValid = computed(() => form.siteId !== '')
 const isContractValid = computed(() => form.contractId !== '')
 const isContractNatureValid = computed(() => isContractNature(form.contractNature))
 const isContractStartDateValid = computed(() => form.contractStartDate !== '')
+const showsContractEndDateComputed = computed(() => showsContractEndDate(form.contractNature))
 const requiresContractEndDateComputed = computed(() => requiresContractEndDate(form.contractNature))
 const isContractEndDateValid = computed(() => {
     if (!requiresContractEndDateComputed.value) return true
@@ -429,7 +430,7 @@ const handleSubmit = async () => {
                 contractId: Number(form.contractId),
                 contractNature: form.contractNature,
                 contractStartDate: form.contractStartDate,
-                contractEndDate: requiresContractEndDateComputed.value ? form.contractEndDate : null
+                contractEndDate: form.contractEndDate || null
             })
         }
 
@@ -460,8 +461,8 @@ watch(isDrawerOpen, (isOpen) => {
     }
 })
 
-watch(requiresContractEndDateComputed, (required) => {
+watch(showsContractEndDateComputed, (shows) => {
-    if (!required) {
+    if (!shows) {
         form.contractEndDate = ''
     }
 })

frontend/utils/contract.ts

@@ -8,10 +8,14 @@ export const contractNatureLabel = (value?: ContractNature) => {
   return 'CDI'
 }
 
-export const requiresContractEndDate = (nature: ContractNature) => {
+export const showsContractEndDate = (nature: ContractNature) => {
   return nature === 'CDD' || nature === 'INTERIM'
 }
 
+export const requiresContractEndDate = (nature: ContractNature) => {
+  return nature === 'CDD'
+}
+
 export const isContractNature = (value: string): value is ContractNature => {
   return (CONTRACT_NATURES as readonly string[]).includes(value)
 }

src/Service/Leave/LeaveBalanceComputationService.php

@@ -349,14 +349,25 @@ final readonly class LeaveBalanceComputationService
             }
 
             for ($cursor = $rangeStart; $cursor <= $rangeEnd; $cursor = $cursor->modify('+1 day')) {
+                $dayOfWeek = (int) $cursor->format('N');
+
+                if ($splitSaturdays) {
+                    if (7 === $dayOfWeek) {
+                        continue;
+                    }
+                } else {
+                    if ($dayOfWeek >= 6) {
+                        continue;
+                    }
+                }
+
                 [$am, $pm] = $this->resolveSegmentsForDate($absence, $cursor->format('Y-m-d'));
                 $dayAmount = ($am ? 0.5 : 0.0) + ($pm ? 0.5 : 0.0);
                 if ($dayAmount <= 0.0) {
                     continue;
                 }
 
-                $isSaturday = $splitSaturdays && '6' === $cursor->format('N');
+                if ($splitSaturdays && 6 === $dayOfWeek) {
-                if ($isSaturday) {
                     $takenSaturdays += $dayAmount;
                 } else {
                     $takenDays += $dayAmount;

src/Service/PublicHolidayService.php

@@ -13,12 +13,11 @@ use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
 
-final class PublicHolidayService implements PublicHolidayServiceInterface
+final readonly class PublicHolidayService implements PublicHolidayServiceInterface
 {
-    private const string BASE_URL = 'https://calendrier.api.gouv.fr/jours-feries/';
-
     public function __construct(
-        private readonly HttpClientInterface $client,
+        private HttpClientInterface $client,
+        private string $holidayUrl
     ) {}
 
     /**
@@ -31,7 +30,7 @@ final class PublicHolidayService implements PublicHolidayServiceInterface
     public function getHolidaysDay(string $zone): array
     {
         $zone = strtolower(trim($zone));
-        $url  = self::BASE_URL."{$zone}.json";
+        $url  = $this->holidayUrl."{$zone}.json";
 
         try {
             $response = $this->client->request(
@@ -61,7 +60,7 @@ final class PublicHolidayService implements PublicHolidayServiceInterface
     {
         $zone  = strtolower(trim($zone));
         $years = trim($years);
-        $url   = self::BASE_URL."{$zone}/{$years}.json";
+        $url   = $this->holidayUrl."{$zone}/{$years}.json";
 
         try {
             $response = $this->client->request('GET', $url);

src/State/EmployeeLeaveSummaryProvider.php

@@ -163,12 +163,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
             $effectiveFrom   = $this->resolveEffectivePeriodStart($employee, $from, $to);
             $hasShiftedStart = $effectiveFrom > $from;
-            if ($hasShiftedStart) {
+            if ($hasShiftedStart && null === $openingBalance) {
                 $carryDays      = 0.0;
                 $carrySaturdays = 0.0;
             }
 
-            $calculationEnd = $this->resolveCalculationEndDate($leavePolicy['ruleCode'], $year, $to);
+            $calculationEnd = $this->resolveCalculationEndDate($leavePolicy['ruleCode'], $year, $to, $employee);
             $generatedDays  = $leavePolicy['accrualPerMonth'] > 0.0
                 ? $this->computeAccruedDaysFromStart(
                     $leavePolicy['acquiredDays'],
@@ -356,7 +356,8 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     private function resolveCalculationEndDate(
         string $ruleCode,
         int $year,
-        DateTimeImmutable $periodEnd
+        DateTimeImmutable $periodEnd,
+        Employee $employee
     ): ?DateTimeImmutable {
         $today       = new DateTimeImmutable('today');
         $currentYear = LeaveRuleCode::FORFAIT_218->value === $ruleCode
@@ -364,18 +365,27 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             : $this->resolveCurrentLeaveYear($today);
 
         if ($year < $currentYear) {
-            return $periodEnd;
+            $end = $periodEnd;
-        }
+        } elseif ($year > $currentYear) {
-        if ($year > $currentYear) {
+            $end = null;
-            return null;
+        } else {
+            $lastDayPreviousMonth = $today
+                ->modify('first day of this month')
+                ->modify('-1 day')
+            ;
+            $end = $lastDayPreviousMonth < $periodEnd ? $lastDayPreviousMonth : $periodEnd;
         }
 
-        $lastDayPreviousMonth = $today
+        // Cap at contract end date if the employee has left.
-            ->modify('first day of this month')
+        $contractEndRaw = $employee->getCurrentContractEndDate();
-            ->modify('-1 day')
+        if (null !== $end && null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
-        ;
+            $contractEnd = DateTimeImmutable::createFromFormat('Y-m-d', $contractEndRaw);
+            if ($contractEnd instanceof DateTimeImmutable && $contractEnd < $end) {
+                $end = $contractEnd;
+            }
+        }
 
-        return $lastDayPreviousMonth < $periodEnd ? $lastDayPreviousMonth : $periodEnd;
+        return $end;
     }
 
     /**
@@ -622,14 +632,27 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             }
 
             for ($cursor = $rangeStart; $cursor <= $rangeEnd; $cursor = $cursor->modify('+1 day')) {
+                $dayOfWeek = (int) $cursor->format('N');
+
+                if ($splitSaturdays) {
+                    // Mode CDI/CDD : dimanche ignoré, samedi compté séparément.
+                    if (7 === $dayOfWeek) {
+                        continue;
+                    }
+                } else {
+                    // Mode forfait : seuls les jours ouvrés (lun-ven) comptent.
+                    if ($dayOfWeek >= 6) {
+                        continue;
+                    }
+                }
+
                 [$am, $pm] = $this->resolveSegmentsForDate($absence, $cursor->format('Y-m-d'));
                 $dayAmount = ($am ? 0.5 : 0.0) + ($pm ? 0.5 : 0.0);
                 if ($dayAmount <= 0.0) {
                     continue;
                 }
 
-                $isSaturday = $splitSaturdays && '6' === $cursor->format('N');
+                if ($splitSaturdays && 6 === $dayOfWeek) {
-                if ($isSaturday && $splitSaturdays) {
                     $takenSaturdays += $dayAmount;
                 } else {
                     $takenDays += $dayAmount;