fix : affichage des absences dans les heures vue semaine + refacto
This commit is contained in:
@@ -5,6 +5,7 @@ import type { WorkHour, WorkHourDayContext, WeeklyWorkHourSummary } from '~/serv
|
||||
import type { AbsenceType } from '~/services/dto/absence-type'
|
||||
import type { Absence } from '~/services/dto/absence'
|
||||
import type { HalfDay } from '~/services/dto/half-day'
|
||||
import { CONTRACT_TYPES, TRACKING_MODES } from '~/services/dto/contract'
|
||||
import type { HourRow } from '~/components/hours/types'
|
||||
import { listScopedEmployees } from '~/services/employees'
|
||||
import { listAbsenceTypes } from '~/services/absence-types'
|
||||
@@ -275,14 +276,17 @@ export const useHoursPage = () => {
|
||||
isValid: false
|
||||
})
|
||||
|
||||
const isPresenceTracking = (employee: Employee) => employee.contract?.trackingMode === 'PRESENCE'
|
||||
const isPresenceTracking = (employee: Employee) => employee.contract?.trackingMode === TRACKING_MODES.PRESENCE
|
||||
const isTimeTracking = (employee: Employee) => !isPresenceTracking(employee)
|
||||
const isRowLocked = (employeeId: number) => rows.value[employeeId]?.isValid ?? false
|
||||
|
||||
const contractLabel = (employee: Employee) => {
|
||||
const contract = employee.contract
|
||||
if (!contract) return '-'
|
||||
if (contract.weeklyHours !== null && contract.weeklyHours !== undefined && contract.trackingMode === 'TIME') {
|
||||
if (contract.type === CONTRACT_TYPES.INTERIM) {
|
||||
return contract.name
|
||||
}
|
||||
if (contract.weeklyHours !== null && contract.weeklyHours !== undefined && contract.trackingMode === TRACKING_MODES.TIME) {
|
||||
return `${contract.weeklyHours}h`
|
||||
}
|
||||
return contract.name
|
||||
@@ -392,7 +396,7 @@ export const useHoursPage = () => {
|
||||
const isEveningLockedByAbsence = (employeeId: number) => {
|
||||
const dayRow = dayContextByEmployeeId.value.get(employeeId)
|
||||
if (!dayRow) return false
|
||||
return dayRow.absentMorning && dayRow.absentAfternoon
|
||||
return dayRow.absentAfternoon
|
||||
}
|
||||
|
||||
const formatMinutes = (minutes: number) => {
|
||||
@@ -475,6 +479,42 @@ export const useHoursPage = () => {
|
||||
isAbsenceDrawerOpen.value = true
|
||||
}
|
||||
|
||||
const applyLocalClearFromAbsence = (employeeId: number, startHalf: HalfDay, endHalf: HalfDay) => {
|
||||
const row = rows.value[employeeId]
|
||||
if (!row) return
|
||||
|
||||
if (startHalf === 'AM' && endHalf === 'AM') {
|
||||
row.morningFrom = ''
|
||||
row.morningTo = ''
|
||||
return
|
||||
}
|
||||
|
||||
if (startHalf === 'PM' && endHalf === 'PM') {
|
||||
row.afternoonFrom = ''
|
||||
row.afternoonTo = ''
|
||||
row.eveningFrom = ''
|
||||
row.eveningTo = ''
|
||||
return
|
||||
}
|
||||
|
||||
row.morningFrom = ''
|
||||
row.morningTo = ''
|
||||
row.afternoonFrom = ''
|
||||
row.afternoonTo = ''
|
||||
row.eveningFrom = ''
|
||||
row.eveningTo = ''
|
||||
}
|
||||
|
||||
const refreshAfterAbsenceChange = async () => {
|
||||
if (isAdmin.value) {
|
||||
await Promise.all([loadWeeklySummary(), loadDayContext(), loadAbsences()])
|
||||
return
|
||||
}
|
||||
|
||||
weeklySummary.value = null
|
||||
await Promise.all([loadDayContext(), loadAbsences()])
|
||||
}
|
||||
|
||||
const submitAbsence = async () => {
|
||||
const form = absenceForm.value
|
||||
if (isAbsenceSubmitting.value || form.employeeId === '' || form.typeId === '') return
|
||||
@@ -504,9 +544,9 @@ export const useHoursPage = () => {
|
||||
})
|
||||
}
|
||||
|
||||
applyLocalClearFromAbsence(Number(form.employeeId), form.startHalf, form.endHalf)
|
||||
closeAbsenceDrawer()
|
||||
await refreshByDate()
|
||||
await loadAbsences()
|
||||
await refreshAfterAbsenceChange()
|
||||
} finally {
|
||||
isAbsenceSubmitting.value = false
|
||||
}
|
||||
@@ -519,8 +559,7 @@ export const useHoursPage = () => {
|
||||
try {
|
||||
await deleteAbsence(editingAbsence.value.id)
|
||||
closeAbsenceDrawer()
|
||||
await refreshByDate()
|
||||
await loadAbsences()
|
||||
await refreshAfterAbsenceChange()
|
||||
} finally {
|
||||
isAbsenceSubmitting.value = false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user