MALIO-DEV/SIRH
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

Gestion du changement de type de contrat + correction du calcule des RTT sur un contrat qui commence en milieu de semaine #19

Merged
tristan merged 55 commits from feat/contract-phase-view-selector into develop 2026-05-22 06:42:33 +00:00
Conversation 0 Commits 55 Files Changed 40 +5 -2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3da1cab2c8 - Show all commits

7
frontend/composables/useEmployeeLeave.ts
View File

@@ -91,8 +91,11 @@ export const useEmployeeLeave = (
try { try {
const isForfait = isForfaitOnPhase.value const isForfait = isForfaitOnPhase.value
const leaveYear = selectedLeaveYear.value const leaveYear = selectedLeaveYear.value
const from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01` let from = isForfait ? `${leaveYear}-01-01` : `${leaveYear - 1}-06-01`
const to = isForfait ? `${leaveYear}-12-31` : `${leaveYear}-05-31` 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 holidayYears = isForfait ? [leaveYear] : [leaveYear - 1, leaveYear]
const [absences, summary, ...holidayResults] = await Promise.all([ const [absences, summary, ...holidayResults] = await Promise.all([