tristan
a41bd632cf
Auto Tag Develop / tag (push) Successful in 11s
## Correctifs RH (branche fix/retour-rh) ### Vue Jour (Heures) - Mode saisie/présence, libellé de contrat et sauvegarde résolus **à la date affichée** (et non au contrat courant). Corrige les salariés passés 39h/35h → Forfait. ### RTT — heures supplémentaires - Proratisation du **plafond 25%/50%** pour les embauches en milieu de semaine (la bande +25% se décale au lieu de rester bloquée à 43h). Témoin Dylan : 4h à 25% + 3h à 50%. ### Récap salaire (PDF mensuel) - Forfait : congés imputés **N-1** non affichés et comptés en présence. - Colonne « Heures payés » **scindée 25% / 50%** (en-tête fusionné). - **Exclusion des salariés sans contrat** sur le mois (ex. Marine, contrat terminé). ### Exports heures annuelles (par salarié + tous) - **Tous les jours sous contrat** affichés, même vides/non saisis (corrige les lignes manquantes). - Samedis/dimanches en **gris plus foncé**. ### Panier de nuit - **Ne s'applique pas aux conducteurs** (vue semaine + récap salaire). ## Tests - 11 tests ajoutés. Suite verte hors un test legacy pré-existant dépendant de la date (`EmployeeRttSummaryProviderTest::testNoQueryParamsKeepsLegacyYearDefaulting`, non modifié par cette branche). ## À noter (hors scope) - L'export heures annuelles *tous salariés* peut dépasser `memory_limit=256M` (Dompdf) — limitation **pré-existante**, non corrigée ici. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: #21 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>
142 lines
3.5 KiB
TypeScript
142 lines
3.5 KiB
TypeScript
import type { Employee } from './employee'
|
|
import type { ContractType, TrackingMode } from './contract'
|
|
|
|
export type WorkHour = {
|
|
id: number
|
|
employee: Employee
|
|
workDate: string
|
|
morningFrom?: string | null
|
|
morningTo?: string | null
|
|
afternoonFrom?: string | null
|
|
afternoonTo?: string | null
|
|
eveningFrom?: string | null
|
|
eveningTo?: string | null
|
|
isPresentMorning?: boolean
|
|
isPresentAfternoon?: boolean
|
|
dayHoursMinutes?: number | null
|
|
nightHoursMinutes?: number | null
|
|
workshopHoursMinutes?: number | null
|
|
hasBreakfast?: boolean
|
|
hasLunch?: boolean
|
|
hasDinner?: boolean
|
|
hasOvernight?: boolean
|
|
isSiteValid?: boolean
|
|
isValid?: boolean
|
|
updatedAt?: string | null
|
|
}
|
|
|
|
export type WorkHourEntryPayload = {
|
|
employeeId: number
|
|
morningFrom?: string | null
|
|
morningTo?: string | null
|
|
afternoonFrom?: string | null
|
|
afternoonTo?: string | null
|
|
eveningFrom?: string | null
|
|
eveningTo?: string | null
|
|
isPresentMorning?: boolean
|
|
isPresentAfternoon?: boolean
|
|
dayHoursMinutes?: number | null
|
|
nightHoursMinutes?: number | null
|
|
workshopHoursMinutes?: number | null
|
|
hasBreakfast?: boolean
|
|
hasLunch?: boolean
|
|
hasDinner?: boolean
|
|
hasOvernight?: boolean
|
|
}
|
|
|
|
export type WeeklyWorkHourDailySummary = {
|
|
date: string
|
|
dayMinutes: number
|
|
nightMinutes: number
|
|
workshopMinutes?: number
|
|
totalMinutes: number
|
|
present?: number | null
|
|
hasAbsence?: boolean
|
|
absenceLabel?: string | null
|
|
absenceColor?: string | null
|
|
hasNightBasket?: boolean
|
|
hasBreakfast?: boolean
|
|
hasLunch?: boolean
|
|
hasDinner?: boolean
|
|
hasOvernight?: boolean
|
|
virtualHolidayMinutes?: number
|
|
holidayLabel?: string | null
|
|
}
|
|
|
|
export type WeeklyWorkHourRowSummary = {
|
|
employeeId: number
|
|
firstName: string
|
|
lastName: string
|
|
siteName?: string | null
|
|
contractName?: string | null
|
|
contractType?: ContractType | null
|
|
trackingMode?: TrackingMode | null
|
|
daily: WeeklyWorkHourDailySummary[]
|
|
weeklyDayMinutes: number
|
|
weeklyNightMinutes: number
|
|
weeklyWorkshopMinutes?: number
|
|
weeklyTotalMinutes: number
|
|
weeklyPresenceCount?: number
|
|
weeklyOvertimeTotalMinutes?: number
|
|
weeklyOvertime25Minutes?: number
|
|
weeklyOvertime50Minutes?: number
|
|
weeklyRecoveryMinutes?: number
|
|
weeklyNightBasketCount?: number
|
|
isDriver?: boolean
|
|
weeklyBreakfastCount?: number
|
|
weeklyLunchCount?: number
|
|
weeklyDinnerCount?: number
|
|
weeklyOvernightCount?: number
|
|
hasContractForWeek?: boolean
|
|
contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
|
|
comment?: string | null
|
|
commentId?: number | null
|
|
}
|
|
|
|
export type WeeklyWorkHourSummary = {
|
|
weekStart: string
|
|
weekEnd: string
|
|
days: string[]
|
|
rows: WeeklyWorkHourRowSummary[]
|
|
}
|
|
|
|
export type WorkHourDayContextRow = {
|
|
employeeId: number
|
|
hasContractAtDate: boolean
|
|
absenceLabel?: string | null
|
|
absenceColor?: string | null
|
|
absenceHalf?: 'AM' | 'PM' | null
|
|
absentMorning: boolean
|
|
absentAfternoon: boolean
|
|
creditedMinutes: number
|
|
creditedPresenceUnits: number
|
|
isDriverContract?: boolean
|
|
hasFormation?: boolean
|
|
formationLabel?: string | null
|
|
virtualHolidayMinutes?: number
|
|
contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
|
|
trackingMode?: TrackingMode | null
|
|
weeklyHours?: number | null
|
|
contractType?: ContractType | null
|
|
contractName?: string | null
|
|
}
|
|
|
|
export type WorkHourDayContext = {
|
|
workDate: string
|
|
rows: WorkHourDayContextRow[]
|
|
}
|
|
|
|
export type DriverHourRow = {
|
|
workHourId: number | null
|
|
dayHours: string
|
|
nightHours: string
|
|
workshopHours: string
|
|
hasBreakfast: boolean
|
|
hasLunch: boolean
|
|
hasDinner: boolean
|
|
hasOvernight: boolean
|
|
isSiteValid: boolean
|
|
isValid: boolean
|
|
updatedAt: string | null
|
|
}
|