diff --git a/backend/src/State/Evenement/ActiviteBeneficiaireProvider.php b/backend/src/State/Evenement/ActiviteBeneficiaireProvider.php index b2c1ee1..afd27fa 100644 --- a/backend/src/State/Evenement/ActiviteBeneficiaireProvider.php +++ b/backend/src/State/Evenement/ActiviteBeneficiaireProvider.php @@ -42,6 +42,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c ->withPaginationEnabled(false); $interventionsOperation = (clone $operation)->withClass(InterventionForfait::class) + ->withStateOptions(null) ->withPaginationEnabled(false); if (array_key_exists('filters', $context) && array_key_exists('beneficiaires', $context['filters'])) { diff --git a/backend/src/State/Evenement/ActiviteIntervenantProvider.php b/backend/src/State/Evenement/ActiviteIntervenantProvider.php index aedf452..4ebc0c8 100644 --- a/backend/src/State/Evenement/ActiviteIntervenantProvider.php +++ b/backend/src/State/Evenement/ActiviteIntervenantProvider.php @@ -48,6 +48,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c ->withPaginationEnabled(false); $interventionsOperation = (clone $operation)->withClass(InterventionForfait::class) + ->withStateOptions(null) ->withPaginationEnabled(false); $context['filters']['exists']['intervenant'] = true; @@ -76,7 +77,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c $taux = $this->transformerService->transform(entity: $tauxEntity, to: TauxHoraire::class); } $campusId = $item instanceof InterventionForfait ? 'undefined' : $item->getCampus()->getId(); - $key = $item->getIntervenant()->getId() . '#' . $campusId ?? 'undefined' . '#' . $item->getType()->getId() . '#' . ($taux->id ?? 'undefined'); + $key = $item->getIntervenant()->getId() . '#' . $campusId . '#' . $item->getType()->getId() . '#' . ($taux->id ?? 'undefined'); if (!array_key_exists($key, $results)) { $results[$key] = new ActiviteIntervenant( id: $key,