Gestion du changement de type de contrat + correction du calcule des RTT sur un contrat qui commence en milieu de semaine #19

tristan · 2026-05-19T13:15:02Z

tristan commented

2026-05-19 13:15:02 +00:00

Numéro du ticket	Titre du ticket

Description de la PR

Modification du .env

Check list

Pas de régression
TU/TI/TF rédigée
TU/TI/TF OK
CHANGELOG modifié

| Numéro du ticket | Titre du ticket | |------------------|-----------------| | | | ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [x] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié

tristan self-assigned this 2026-05-19 13:15:02 +00:00

tristan added 28 commits 2026-05-19 13:15:03 +00:00

docs(spec) : contract phase view selector design a2874b545a

Add design spec for the contract-phase picker on the employee detail page.
Lets HR navigate past contract phases (e.g. 39h before a switch to FORFAIT,
or a closed CDD) so they can view and settle leftover CP/RTT balances
without changing the default behavior for the current contract.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(plan) : contract phase view implementation plan 7ee2e91e71

Step-by-step task plan derived from the design spec, covering backend
service + providers, frontend composables + picker UI, and documentation
updates required by CLAUDE.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(contracts) : add EmployeeContractPhaseResolver service a56f797ed7

feat(employee) : expose contractPhases on read API e7035a7c30

feat(leave) : phaseId support in EmployeeLeaveSummaryProvider 9efe0e81a0

The provider now resolves a target ContractPhase from a ?phaseId query
parameter and propagates it through resolveYear, resolvePeriodBounds,
resolveLeavePolicy, resolveAccrualCalculationEndDate,
resolveTakenCalculationEndDate, and resolveFirstComputationYear.

- phaseId missing → current phase (legacy behavior preserved)
- phaseId valid → past/current phase used for rule code, weekly hours
  and period bounds (capped at phase end)
- phaseId invalid (non-numeric or unknown) → 422
- year missing + phaseId → year derived from phase end date
- year out of phase range + phaseId → silent clamp to phase boundaries

Public methods computeYearSummary/resolvePaidLeaveDays/resolveLeaveYearForToday
remain backward-compatible for external callers (LeaveRecapRowBuilder,
DumpVerificationSnapshotCommand).

refactor(leave) : address Task 3 review (helper, dead param, phase nature, regression test) 5a2a43bf51

- Extract private helper `exerciseYearForDate(date, isForfait)` to dedupe
  the date->leave-exercise-year expression duplicated across `clampYearToPhase`
  and `resolveFirstComputationYear` (4 copies collapsed into 1 helper + 4
  call sites).

- Remove the unused `ContractPhase $phase` parameter from
  `resolveLeavePeriodBounds`: the body never reads it (the phase cap is
  applied later by `resolvePeriodBounds`).

- Add `ContractNature $contractNature` to `ContractPhase` DTO, populated
  from the first period of the group by `EmployeeContractPhaseResolver`.
  Drop the `resolveNatureForPhase` lookup in `EmployeeLeaveSummaryProvider`
  in favor of `$phase->contractNature`. Expose `contractNature` in
  `Employee::getContractPhases()` array shape for frontend use.

- Fix regression for terminated employees calling `computeYearSummary`
  without an explicit phase (LeaveRecapRowBuilder,
  DumpVerificationSnapshotCommand). Before the refactor the period bounds,
  accrual end and taken end were NOT capped at the contract end for
  terminated employees, because `Employee::getCurrentContractEndDate()`
  returns null when no period covers "today". The new fallback phase
  (`isCurrent=false`, real `endDate`) was silently capping `to`. Add an
  internal `applyPhaseEndCap` flag, true when phase is explicit, false
  for legacy callers, threaded through `resolvePeriodBounds`,
  `resolveAccrualCalculationEndDate` and `resolveTakenCalculationEndDate`.

- Add regression test
  `testTerminatedEmployeeWithoutExplicitPhaseSkipsPhaseEndCap` proving
  that legacy callers keep the natural exercise upper bound while explicit
  phase callers get the cap.

- Add `contractNature` assertion in `EmployeeContractPhaseResolverTest`.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(rtt) : phaseId support in EmployeeRttSummaryProvider 8684d240bc

Mirror Task 3 (leave provider) on the RTT side: accept an optional `?phaseId`
query parameter and cap the exercise window to the phase boundaries when set.

- Inject EmployeeContractPhaseResolver.
- New helpers: resolveTargetPhase, clampYearToPhase, exerciseYearForDate.
- resolveYear now takes the phase: default year falls back to the phase end
  date when phaseId is provided; explicit year is silently clamped to the
  phase range.
- provide() narrows periodFrom / periodTo / limitDate to the phase end date
  for past phases.
- Default behavior (no phaseId) unchanged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(rtt) : allow payment on closed phase last exercise 613ac02e1d

refactor(exercise) : extract ExerciseYearResolver to dedup year formula 8f355e05ad

Pull the "date -> leave/RTT exercise year" formula out of
EmployeeRttPaymentProcessor, EmployeeRttSummaryProvider and
EmployeeLeaveSummaryProvider into a single
App\Service\Exercise\ExerciseYearResolver. Forfait flag is parameterised
so the leave (calendar year) and RTT (Juin N-1 -> Mai N) variants share
the same implementation. Pure refactor, no behavioural change.

feat(employee) : add contractPhases TS DTO 5fc9dd1ec9

feat(employee) : add useEmployeeContractPhase composable 03acaae135

feat(api) : phaseId query parameter on leave/rtt endpoints ac53bbd5a1

feat(leave) : phase-aware leave tab loading 2730e34f31

feat(rtt) : phase-aware RTT tab loading 3209be8c33

feat(employee) : wire contract phase into detail page composable fd9e551542

feat(employee) : contract phase picker + past-mode banner 9d4a12f6cb

feat(rtt) : enable pay button on closed phase last exercise a5c75a9129

docs : add contract-phase-view documentation 835e758ed1

docs : leave/rtt tabs reference phase selector 9c82e4a0f2

docs(in-app) : add contract phase view help article f0dec14b29

docs(claude-md) : document contract phase view selector fd71e2ab65

fix(leave) : clip leave-tab absence fetch to selected phase bounds 3da1cab2c8

The annual calendar in LeaveTab.vue was showing absences from outside
the selected phase's lifespan. For an employee who switched contract
type mid-year, this leaked the old phase's absences into the new
phase's calendar view (and vice versa via the phase picker).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(contracts) : hide contract phases entirely before RTT_START_DATE f48f1d2f3a

EmployeeContractPhaseResolver now accepts the data-start date and filters
out phases whose endDate is strictly before it. No work-hour or absence
data exists before the application launch date, so legacy contract
periods that ended before that date would surface meaningless RTT/CP
figures in the phase picker.

For employees who joined long before the software (typical legacy 35h
contracts, in production since 2014), only the current phase remains
visible — which also collapses the picker (threshold ≥ 2 phases).

The Employee entity reads RTT_START_DATE from $_SERVER/$_ENV directly
since it has no DI. The resolver service is wired via services.yaml.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(leave) : do not cap from at phase.startDate for non-forfait phases bbde6ddcf3

The CP exercise (Juin N-1 → Mai N) is annual and continuous across
contract-signature changes within the same leave rule (e.g. 35h → 39h,
isDriver flip, weeklyHours bump). Capping `from` at the phase start
truncated the accrual to just the months under the latest phase,
producing wrong "en cours d'acquisition" values and dropping presence
days from earlier months on the leave-tab calendar.

For Damien GUILLOT (35h until 2025-10-31, then 39h), this gave 15 days
acquired (6 months Nov→Apr) instead of the expected 27.5 days
(11 months Jun→Apr at 2.5/month). After this fix, the H39 view shows
the full annual accrual as expected.

FORFAIT phases keep the from cap: the 218-day target is calendar-year
scoped and only counts the FORFAIT portion of the year.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

style(employee) : use MalioSelect built-in label for the phase picker 2acee03e00

Replaces the inline <label> with the MalioSelect's native `label` prop
to match the visual style of other selects on the employee detail page.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix : README.md 54d9a30f71

fix(rtt) : do not cap periodFrom at phase.startDate 653845655f

The RTT week table was hiding all weeks before the phase's startDate,
so for an employee hired mid-exercise (e.g. Dylan CHABOISSON, CDD
starting 2026-03-19) March displayed only from week 12 instead of
week 9, with no visible padding for the pre-hire weeks of the exercise.

Mirrors the same fix applied to the leave provider: the exercise unit
for RTT is annual (Juin→Mai). Capping periodFrom artificially clipped
the displayed weeks. Days without a contract naturally contribute 0
minutes (no reference, no worked hours), so the cumul is correct
without the cap.

periodTo and limitDate caps at phase.endDate are preserved for closed
phases so the table doesn't extend past the phase end.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(rtt) : skip non-contracted days in overtime 25% threshold 750f2bffa8

computeWeeklyOvertime25StartMinutes used a ternary that fell back to 35h
when a day had no active contract. Once periodFrom was uncapped (so the
RTT week iterates the full exercise), pre-hire days were silently
contributing 7h each to the weekly threshold, erasing the 25% overtime
for the employee's first partial week.

Dylan CHABOISSON week 12 (Mar 19 hire, worked Thu 9h + Fri 9h30 +
Sat 3h30 = 22h): threshold was 36h (incorrect), now back to 15h (Thu 8h
+ Fri 7h) so the 7h above threshold + 1h45 bonus are correctly credited.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

tristan added 16 commits 2026-05-20 15:15:21 +00:00

docs(leave) : plan for forfait mid-year entry leave calculation 907eb1a277

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : add prorated forfait repo days helper 2718d05cfe

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : detect forfait mid-year entry exercise 7570b3b19f

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : resolve phase immediately preceding a given phase ffa185dc5d

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : source carried CP from prior non-forfait phase dc9b49e254

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : clarify fractioned days excluded from carried CP b43f854528

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : forfait mid-year entry credits prorated repos + carried CP 37c718c839

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : note bonusDays deliberately omitted on forfait entry year 7bc3cd6d25

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : keep posted saturdays credited in forfait carried CP 52d11119a1

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : record forfait entry validation results and saturday rule ac40cb9813

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : clarify carried CP docblock (net weekdays + gross saturdays) d2a9bd5191

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : document forfait mid-year entry leave calculation 0e5661bb7f

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : sharpen carried CP docblock (net accruing, prior-forfait case) f3d94a8590

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(rtt) : anchor week contract type on first contracted day 066ed7746f

Mid-week hire weeks (e.g. CDD starting Thursday) had their first day with no
contract, so the week was classified CUSTOM and the 25%/50% overtime bonuses
were disabled. Anchor the week's contract type/nature on the first contracted
day instead, so a 35h/39h hire week keeps its overtime tiers.
Dylan CHABOISSON week 12: 7h → 8h45 (7h × 1.25).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(rtt) : document week contract-type anchor on first contracted day 1e01962d7c

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

style(rtt) : fix displaced docblock after week-anchor helper 5f2ab39cd7

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

tristan added 11 commits 2026-05-21 06:36:30 +00:00

feat(leave) : prorate forfait work-target days in employee header e310f65d81

The header hardcoded '218 jours' and '218 - presence restants', wrong for a
forfait entered mid-year. Expose forfaitWorkTargetDays = businessDays(period) -
acquiredDays (218 full year, prorated otherwise) and show
'Forfait - {target} jours ({presence} présence · {target-presence} restants)'.
Grégory: 155 jours (11 présence · 144 restants).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : document prorated forfait work-target in header c018b58990

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : in-app note for forfait header work-target days 18fffeb411

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(leave) : forfait work-target ignores bonus/fractioned days 03add0d45a

The header target subtracted summary.acquiredDays, which includes fractionedDays
(and bonusDays via the full-year acquired), so a full-year forfait with weekend
work or HR fractioned days showed <218. Full year = contractual 218 (capped at
period business days); entry year = businessDays − entry acquired (repos + carried
CP, excluding bonus/fractioned). Extracted computeForfaitWorkTargetDays + 3 tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

feat(leave) : show presence days in header for non-forfait, bound to contract start 0ad2f0c624

Non-forfait header now shows '{weeklyHours} heures ({presence} présence)'.
Presence (presenceDaysByMonth/presenceDaysToToday) is bounded to the employee's
contract start so business days before hire are not counted (Dylan CDD: 43.5,
was 246). No change for employees present before the exercise or for forfait
(already capped at phase start). Leave summary now eager-loaded for any employee
with a leave tab to feed the header.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(leave) : document non-forfait header presence + contract-start bound d5565ae8c3

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(leave) : refresh header présence on phase switch; document gap limitation 480f2a4d4e

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(calendar) : exclude departed employees from absence PDF print ddd1b8116e

The calendar view hides employees whose contract doesn't intersect the displayed
month, but the absence PDF print still listed them. Apply the same intersection
filter (hasContractInRange over [from, to]) in AbsencePrintProvider, and reject
invalid from/to dates. A employee who left in April no longer appears on a May print.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(calendar) : absence print excludes departed employees b91aafe6d5

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fix(calendar) : date-only contract filter + eager-load periods for print e56539f40c

Review follow-ups: (1) createFromFormat('Y-m-d') keeps the current time, so a raw
DateTime comparison wrongly excluded an employee ending on the from-day (and dropped
first-day absences); normalize from/to to day bounds and compare contract periods on
date only (Y-m-d), mirroring the calendar view. (2) eager-load contractPeriods in
findForPrintBySiteIds to avoid an N+1 during filtering. Added a boundary test.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

docs(calendar) : document absence print contract-intersection filter d84605bd27

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

tristan changed title from ~~WIP: Gestion du changement de type de contrat + correction du calcule des RTT sur un contrat qui commence en milieu de semaine~~ to Gestion du changement de type de contrat + correction du calcule des RTT sur un contrat qui commence en milieu de semaine

2026-05-21 06:41:51 +00:00

tristan merged commit abdaf809f8 into develop

2026-05-22 06:42:33 +00:00

tristan deleted branch feat/contract-phase-view-selector

2026-05-22 06:42:33 +00:00

tristan referenced this issue from a commit

2026-05-22 06:42:35 +00:00

Gestion du changement de type de contrat + correction du calcule des RTT sur un contrat qui commence en milieu de semaine (#19)

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MALIO-DEV/SIRH#19