diff --git a/frontend/composables/useEmployeeLeave.ts b/frontend/composables/useEmployeeLeave.ts index 53d721f..d19ea5d 100644 --- a/frontend/composables/useEmployeeLeave.ts +++ b/frontend/composables/useEmployeeLeave.ts @@ -91,8 +91,11 @@ export const useEmployeeLeave = ( try { const isForfait = isForfaitOnPhase.value const leaveYear = selectedLeaveYear.value - const from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01` - const to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31` + let from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01` + let to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31` + const phase = selectedPhase.value + if (phase?.startDate && phase.startDate > from) from = phase.startDate + if (phase?.endDate && phase.endDate < to) to = phase.endDate const holidayYears = isForfait ? [leaveYear] : [leaveYear - 1, leaveYear] const [absences, summary, ...holidayResults] = await Promise.all([