Merge branch 'develop' into feat/week-comments
# Conflicts: # src/State/WorkHourWeeklySummaryProvider.php # tests/State/WorkHourWeeklySummaryProviderTest.php
This commit is contained in:
@@ -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