feat : modification de la gestion des jours fériés

frontend/composables/useDriverHoursPage.ts

@@ -368,12 +368,23 @@ export const useDriverHoursPage = () => {
 
   const getRowMetrics = (employeeId: number) => {
     const row = rows.value[employeeId] ?? emptyRow()
-    const credited = dayContextByEmployeeId.value.get(employeeId)?.creditedMinutes ?? 0
-    const dayMinutes = toMinutes(row.dayHours) + credited
+    const dayRow = dayContextByEmployeeId.value.get(employeeId)
+    const credited = dayRow?.creditedMinutes ?? 0
+    let dayMinutes = toMinutes(row.dayHours) + credited
     const nightMinutes = toMinutes(row.nightHours)
     const workshopMinutes = toMinutes(row.workshopHours)
-    const totalMinutes = dayMinutes + nightMinutes + workshopMinutes
-    return { dayMinutes, nightMinutes, workshopMinutes, totalMinutes }
+    let totalMinutes = dayMinutes + nightMinutes + workshopMinutes
+
+    // Virtual holiday credit: backend already applies the contract-period
+    // schedule and absence-override rule; consume the value as-is.
+    const virtualHolidayMinutes = dayRow?.virtualHolidayMinutes ?? 0
+    if (virtualHolidayMinutes > totalMinutes) {
+      const delta = virtualHolidayMinutes - totalMinutes
+      dayMinutes += delta
+      totalMinutes = virtualHolidayMinutes
+    }
+
+    return { dayMinutes, nightMinutes, workshopMinutes, totalMinutes, virtualHolidayMinutes }
   }
 
   const getRowAbsenceLabel = (employeeId: number) => {
@@ -466,7 +477,6 @@ export const useDriverHoursPage = () => {
 
   const openAbsenceDrawer = (employeeId: number) => {
     if (!hasContractAtSelectedDate(employeeId)) return
-    if (isSelectedDateHoliday.value) return
 
     const existing = absences.value.find((absence) => {
       if (absence.employee?.id !== employeeId) return false

frontend/composables/useEmployeeContract.ts

@@ -5,7 +5,7 @@ import { listContracts } from '~/services/contracts'
 import { updateEmployee } from '~/services/employees'
 import { createSuspension, updateSuspension } from '~/services/contractSuspensions'
 import { formatNullableYmdToFr, getTodayYmd, shiftYmd } from '~/utils/date'
-import { contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate } from '~/utils/contract'
+import { contractNatureLabel, formatWorkDaysHoursSummary, isContractNature, requiresContractEndDate, requiresWorkDaysHours, showsContractEndDate } from '~/utils/contract'
 
 type SuspensionForm = {
   id: number | null
@@ -32,7 +32,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     startDate: '',
     endDate: '',
     paidLeaveSettled: false,
-    comment: ''
+    comment: '',
+    workDaysHours: null as Record<number, number> | null
   })
 
   const validationTouched = reactive({
@@ -44,7 +45,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     contractNature: 'CDI' as 'CDI' | 'CDD' | 'INTERIM',
     startDate: '',
     endDate: '',
-    isDriver: false
+    isDriver: false,
+    workDaysHours: null as Record<number, number> | null
   })
 
   const createValidationTouched = reactive({
@@ -59,10 +61,11 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
   const formatDate = (value?: string | null) => formatNullableYmdToFr(value)
 
   const contractHistoryLabel = (item: ContractHistoryItem) => {
-    if (item.weeklyHours !== null && item.weeklyHours !== undefined) {
-      return `${item.weeklyHours} heures`
-    }
-    return item.contractName ?? '-'
+    const base = item.weeklyHours !== null && item.weeklyHours !== undefined
+      ? `${item.weeklyHours} heures`
+      : (item.contractName ?? '-')
+    const scheduleSummary = formatWorkDaysHoursSummary(item.workDaysHours)
+    return scheduleSummary ? `${base} (${scheduleSummary})` : base
   }
 
   const currentActiveContractPeriod = computed(() => {
@@ -111,11 +114,27 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
   const isCreateContractNatureValid = computed(() => isContractNature(createContractForm.contractNature))
   const isCreateContractStartDateValid = computed(() => createContractForm.startDate !== '')
   const isCreateContractEndDateValid = computed(() => !requiresCreateContractEndDate.value || createContractForm.endDate !== '')
+  const selectedCreateContract = computed<Contract | null>(() =>
+    contracts.value.find((c) => c.id === Number(createContractForm.contractId)) ?? null
+  )
+  const requiresCreateWorkDaysHours = computed(() =>
+    requiresWorkDaysHours(selectedCreateContract.value, createContractForm.contractNature)
+  )
+  const createScheduleTotalMinutes = computed(() => {
+    const raw = createContractForm.workDaysHours ?? {}
+    return Object.values(raw).reduce((s, n) => s + (Number(n) || 0), 0)
+  })
+  const isCreateScheduleValid = computed(() => {
+    if (!requiresCreateWorkDaysHours.value) return true
+    const expected = (selectedCreateContract.value?.weeklyHours ?? 0) * 60
+    return expected > 0 && createScheduleTotalMinutes.value === expected
+  })
   const isCreateContractFormValid = computed(() =>
     isCreateContractValid.value &&
     isCreateContractNatureValid.value &&
     isCreateContractStartDateValid.value &&
-    isCreateContractEndDateValid.value
+    isCreateContractEndDateValid.value &&
+    isCreateScheduleValid.value
   )
 
   const baseInputClass =
@@ -159,6 +178,7 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     contractForm.endDate = period.endDate ?? getTodayYmd()
     contractForm.paidLeaveSettled = false
     contractForm.comment = ''
+    contractForm.workDaysHours = period.workDaysHours ?? null
   }
 
   const openCloseContractDrawer = () => {
@@ -186,6 +206,7 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     createContractForm.contractNature = 'CDI'
     createContractForm.endDate = ''
     createContractForm.isDriver = false
+    createContractForm.workDaysHours = null
     createContractForm.startDate = editableContractPeriod.value?.endDate
       ? (shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate)
       : getTodayYmd()
@@ -261,7 +282,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
         contractNature: createContractForm.contractNature,
         contractStartDate: createContractForm.startDate,
         contractEndDate: createContractForm.endDate || null,
-        isDriverInput: createContractForm.isDriver
+        isDriverInput: createContractForm.isDriver,
+        workDaysHoursInput: requiresCreateWorkDaysHours.value ? createContractForm.workDaysHours : null
       })
       isCreateContractDrawerOpen.value = false
       await reloadEmployee()
@@ -319,6 +341,12 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     }
   })
 
+  watch(requiresCreateWorkDaysHours, (required) => {
+    if (!required) {
+      createContractForm.workDaysHours = null
+    }
+  })
+
   return {
     contracts,
     contractHistory,
@@ -342,6 +370,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
     requiresCreateContractEndDate,
     createContractEndDateFieldClass,
     isCreateContractFormValid,
+    requiresCreateWorkDaysHours,
+    selectedCreateContract,
     contractNatureLabel,
     contractHistoryLabel,
     formatDate,

frontend/composables/useHoursPage.ts

@@ -447,10 +447,21 @@ export const useHoursPage = () => {
       nightMinutes += nightIntervalMinutes(from, to)
     }
 
-    const creditedMinutes = dayContextByEmployeeId.value.get(employeeId)?.creditedMinutes ?? 0
+    const dayRow = dayContextByEmployeeId.value.get(employeeId)
+    const creditedMinutes = dayRow?.creditedMinutes ?? 0
     totalMinutes += creditedMinutes
-    const dayMinutes = Math.max(0, totalMinutes - nightMinutes)
-    return { dayMinutes, nightMinutes, totalMinutes }
+    let dayMinutes = Math.max(0, totalMinutes - nightMinutes)
+
+    // Virtual holiday credit: the backend already applies the contract-period
+    // schedule (workDaysHours) and the absence-override rule, so just use the
+    // computed value instead of recomputing on the client.
+    const virtualHolidayMinutes = dayRow?.virtualHolidayMinutes ?? 0
+    if (virtualHolidayMinutes > totalMinutes) {
+      dayMinutes += virtualHolidayMinutes - totalMinutes
+      totalMinutes = virtualHolidayMinutes
+    }
+
+    return { dayMinutes, nightMinutes, totalMinutes, virtualHolidayMinutes }
   }
 
   const getRowAbsenceLabel = (employeeId: number) => {
@@ -583,7 +594,6 @@ export const useHoursPage = () => {
 
   const openAbsenceDrawer = (employeeId: number) => {
     if (!hasContractAtSelectedDate(employeeId)) return
-    if (isSelectedDateHoliday.value) return
 
     const existing = absences.value.find((absence) => {
       if (absence.employee?.id !== employeeId) return false