feat : ajout d'un champ commentaire sur les contrats + correction de plusieurs bugs

frontend/composables/useEmployeeDetailPage.ts

@@ -9,6 +9,7 @@ import { listContracts } from '~/services/contracts'
 import { getEmployeeLeaveSummary } from '~/services/employee-leave-summary'
 import { getEmployeeRttSummary } from '~/services/employee-rtt-summary'
 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'
 
@@ -22,6 +23,7 @@ export const useEmployeeDetailPage = () => {
   const employeeAbsences = ref<Absence[]>([])
   const leaveSummary = ref<EmployeeLeaveSummary | null>(null)
   const rttSummary = ref<EmployeeRttSummary | null>(null)
+  const publicHolidays = ref<Record<string, string>>({})
   const isContractDrawerOpen = ref(false)
   const isContractSubmitting = ref(false)
   const isCreateContractDrawerOpen = ref(false)
@@ -34,7 +36,8 @@ export const useEmployeeDetailPage = () => {
     contractNature: 'CDI' as 'CDI' | 'CDD' | 'INTERIM',
     startDate: '',
     endDate: '',
-    paidLeaveSettled: false
+    paidLeaveSettled: false,
+    comment: ''
   })
 
   const validationTouched = reactive({
@@ -138,6 +141,7 @@ export const useEmployeeDetailPage = () => {
     contractForm.startDate = active.startDate
     contractForm.endDate = getTodayYmd()
     contractForm.paidLeaveSettled = false
+    contractForm.comment = ''
   }
 
   const openCloseContractDrawer = () => {
@@ -198,7 +202,10 @@ export const useEmployeeDetailPage = () => {
       const to = isForfait
         ? `${leaveYear}-12-31`
         : `${leaveYear}-05-31`
-      const [absences, summary, rtt] = await Promise.all([
+      const holidayYears = isForfait
+        ? [leaveYear]
+        : [leaveYear - 1, leaveYear]
+      const [absences, summary, rtt, ...holidayResults] = await Promise.all([
         listAbsences({
           from,
           to,
@@ -207,11 +214,13 @@ export const useEmployeeDetailPage = () => {
         showLeaveTab.value
           ? getEmployeeLeaveSummary(loadedEmployee.id, leaveYear)
           : Promise.resolve(null),
-        getEmployeeRttSummary(loadedEmployee.id, rttYear)
+        getEmployeeRttSummary(loadedEmployee.id, rttYear),
+        ...holidayYears.map((y) => listPublicHolidays('metropole', y))
       ])
       employeeAbsences.value = absences
       leaveSummary.value = summary
       rttSummary.value = rtt
+      publicHolidays.value = Object.assign({}, ...holidayResults)
       if (!showLeaveTab.value && activeTab.value === 'leave') {
         activeTab.value = 'contract'
       }
@@ -242,7 +251,8 @@ export const useEmployeeDetailPage = () => {
         siteId: employee.value.site?.id ?? null,
         contractId: Number(contractForm.contractId),
         contractEndDate: contractForm.endDate || null,
-        contractPaidLeaveSettled: contractForm.paidLeaveSettled
+        contractPaidLeaveSettled: contractForm.paidLeaveSettled,
+        contractComment: contractForm.comment || null
       })
 
       isContractDrawerOpen.value = false
@@ -309,6 +319,7 @@ export const useEmployeeDetailPage = () => {
     employeeAbsences,
     leaveSummary,
     rttSummary,
+    publicHolidays,
     showLeaveTab,
     contractHistory,
     employeeContractWorkLabel,

frontend/composables/useHoursPage.ts

@@ -341,7 +341,8 @@ export const useHoursPage = () => {
     isPresentMorning: false,
     isPresentAfternoon: false,
     isSiteValid: false,
-    isValid: false
+    isValid: false,
+    updatedAt: null
   })
 
   const isPresenceTracking = (employee: Employee) => employee.contract?.trackingMode === TRACKING_MODES.PRESENCE
@@ -463,6 +464,14 @@ export const useHoursPage = () => {
     return { backgroundColor: dayRow.absenceColor || '#dc2626' }
   }
 
+  const getRowUpdatedAt = (employeeId: number): string => {
+    const raw = rows.value[employeeId]?.updatedAt
+    if (!raw) return ''
+    const date = new Date(raw)
+    if (Number.isNaN(date.getTime())) return ''
+    return date.toLocaleDateString('fr-FR', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })
+  }
+
   const getPresenceDayValue = (employeeId: number) => {
     const row = rows.value[employeeId]
     const dayRow = dayContextByEmployeeId.value.get(employeeId)
@@ -521,7 +530,8 @@ export const useHoursPage = () => {
         isPresentMorning: workHour?.isPresentMorning ?? false,
         isPresentAfternoon: workHour?.isPresentAfternoon ?? false,
         isSiteValid: workHour?.isSiteValid ?? false,
-        isValid: workHour?.isValid ?? false
+        isValid: workHour?.isValid ?? false,
+        updatedAt: workHour?.updatedAt ?? null
       }
     }
 
@@ -1140,6 +1150,7 @@ export const useHoursPage = () => {
     getRowMetrics,
     getRowAbsenceLabel,
     getRowAbsenceStyle,
+    getRowUpdatedAt,
     getPresenceDayValue,
     openAbsenceDrawer,
     submitAbsence,