From 7834b6e7f1f63dc85045c670e42762f860f63e08 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Mon, 7 Apr 2025 13:07:40 +0200
Subject: [PATCH] =?UTF-8?q?Changement=20des=20=C3=A9tats=20pr=C3=A9s=C3=A9?=
=?UTF-8?q?lectionn=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/Controller/DemandeExterneController.php | 4 ++--
.../src/Service/DemandeExterne/DemandeExterneService.php | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/module/DemandeExterne/src/Controller/DemandeExterneController.php b/module/DemandeExterne/src/Controller/DemandeExterneController.php
index 246f2673..b9f653e2 100644
--- a/module/DemandeExterne/src/Controller/DemandeExterneController.php
+++ b/module/DemandeExterne/src/Controller/DemandeExterneController.php
@@ -62,7 +62,7 @@ class DemandeExterneController extends AbstractActionController
use UploadFormAwareTrait;
- public function traiterParamsFromQueries(array $fromQueries, array $etatsListe): array
+ public function traiterParamsFromQueries(array $fromQueries, ?array $etatsListe): array
{
$params = [
'agent' => $this->getAgentService()->getAgent($fromQueries['agent-filtre']['id'] ?? null),
@@ -91,7 +91,7 @@ class DemandeExterneController extends AbstractActionController
public function indexAction(): ViewModel
{
- $params = $this->traiterParamsFromQueries($this->params()->fromQuery(), DemandeExterneEtats::ETATS_OUVERTS);
+ $params = $this->traiterParamsFromQueries($this->params()->fromQuery(), []);
$demandes = $this->getDemandeExterneService()->getDemandesExternesWithFiltre($params);
$etats = $this->getEtatTypeService()->getEtatsTypesByCategorieCode(DemandeExterneEtats::TYPE);
diff --git a/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php b/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php
index 7c86da3d..ce7f8acf 100644
--- a/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php
+++ b/module/DemandeExterne/src/Service/DemandeExterne/DemandeExterneService.php
@@ -61,6 +61,8 @@ class DemandeExterneService
if (!empty($etats)) {
$qb = $qb->andWhere('decorateurEtatType.code in (:etats)')
->setParameter('etats', $etats);
+ } else {
+ $qb = $qb->andWhere('decorateurEtat.type IS NULL');
}
return $qb;
}
--
GitLab