feat : modification de la gestion des jours fériés
All checks were successful
Auto Tag Develop / tag (push) Successful in 6s
All checks were successful
Auto Tag Develop / tag (push) Successful in 6s
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user