Merge branch 'develop' into feat/week-comments

# Conflicts:
#	src/State/WorkHourWeeklySummaryProvider.php
#	tests/State/WorkHourWeeklySummaryProviderTest.php

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
@@ -991,6 +995,7 @@ export const useDriverHoursPage = () => {
     getRowMetrics,
     getRowAbsenceLabel,
     getRowAbsenceStyle,
+    getRowContractNature,
     getRowUpdatedAt,
     openAbsenceDrawer,
     submitAbsence,

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/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 ''
@@ -1183,6 +1187,7 @@ export const useHoursPage = () => {
     getRowAbsenceStyle,
     hasRowFormation,
     getRowFormationLabel,
+    getRowContractNature,
     getRowUpdatedAt,
     getPresenceDayValue,
     openAbsenceDrawer,