Merge branch 'develop' into feat/week-comments
# Conflicts: # src/State/WorkHourWeeklySummaryProvider.php # tests/State/WorkHourWeeklySummaryProviderTest.php
This commit is contained in:
@@ -15,5 +15,6 @@ export type EmployeeLeaveSummary = {
|
||||
previousYearRemainingDays: number
|
||||
previousYearPaidDays: number
|
||||
presenceDaysByMonth: Record<string, number>
|
||||
presenceDaysToToday: number
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ export type EmployeeRttWeekSummary = {
|
||||
base50Minutes: number
|
||||
bonus50Minutes: number
|
||||
totalMinutes: number
|
||||
cumulativeBalanceMinutes: number
|
||||
}
|
||||
|
||||
export type RttMonthPayment = {
|
||||
|
||||
@@ -20,6 +20,8 @@ export type ContractHistoryItem = {
|
||||
suspensions?: ContractSuspension[]
|
||||
isDriver?: boolean
|
||||
workDaysHours?: Record<number, number> | null
|
||||
interimAgencyId?: number | null
|
||||
interimAgencyName?: string | null
|
||||
}
|
||||
|
||||
export type Employee = {
|
||||
@@ -37,4 +39,6 @@ export type Employee = {
|
||||
displayOrder?: number
|
||||
entryDate?: string | null
|
||||
currentSuspensions?: ContractSuspension[]
|
||||
currentInterimAgencyId?: number | null
|
||||
currentInterimAgencyName?: string | null
|
||||
}
|
||||
|
||||
@@ -60,6 +60,7 @@ export type WeeklyWorkHourDailySummary = {
|
||||
hasDinner?: boolean
|
||||
hasOvernight?: boolean
|
||||
virtualHolidayMinutes?: number
|
||||
holidayLabel?: string | null
|
||||
}
|
||||
|
||||
export type WeeklyWorkHourRowSummary = {
|
||||
@@ -113,6 +114,7 @@ export type WorkHourDayContextRow = {
|
||||
hasFormation?: boolean
|
||||
formationLabel?: string | null
|
||||
virtualHolidayMinutes?: number
|
||||
contractNature?: 'CDI' | 'CDD' | 'INTERIM' | null
|
||||
}
|
||||
|
||||
export type WorkHourDayContext = {
|
||||
|
||||
Reference in New Issue
Block a user