diff --git a/src/Domain/AIPD/Controller/AnalyseImpactController.php b/src/Domain/AIPD/Controller/AnalyseImpactController.php index b2ef1a8a500ea6802325a91c656549487de2a01a..8649d949757d6b8891e5753b38ea31740be8ed56 100644 --- a/src/Domain/AIPD/Controller/AnalyseImpactController.php +++ b/src/Domain/AIPD/Controller/AnalyseImpactController.php @@ -365,9 +365,6 @@ class AnalyseImpactController extends CRUDController public function printAction(Request $request, string $id) { - /** - * @var AnalyseImpact|null $object - */ if (null === $object = $this->repository->findOneById($id)) { throw new NotFoundHttpException("No object found with ID '{$id}'"); } diff --git a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php index 4c58eb937fef92faf5356995162d169e5f3b88e7..e9232572bfff4d4f19586701fcfd60c85eaa6414 100644 --- a/src/Infrastructure/ORM/Registry/Repository/Mesurement.php +++ b/src/Infrastructure/ORM/Registry/Repository/Mesurement.php @@ -375,15 +375,12 @@ class Mesurement extends CRUDRepository implements Repository\Mesurement // Add old actions again. // Fixes https://gitlab.adullact.net/soluris/madis/-/issues/529 //$date = new \DateTime(); - $queryBuilder = $this->createQueryBuilder(); + $queryBuilder = $this->createQueryBuilder(); + $expr = $queryBuilder->expr(); $queryBuilder->select('u') ->from(Model\Mesurement::class, 'u') - //->where('u.planificationDate >= :date_start') - ->andWhere('u.status = :status') - //->setParameter('date_start', $date->format('Y-m-d')) - ->setParameter('status', 'not-applied') + ->where($expr->neq('u.status', $expr->literal('not-applicable'))) ->orderBy('u.planificationDate', 'DESC') - ->setMaxResults($limit) ; if ($collectivity) { @@ -393,13 +390,12 @@ class Mesurement extends CRUDRepository implements Repository\Mesurement ; } - $actions = $queryBuilder - ->getQuery() - ->getResult(); - - $actions_limit = array_slice($actions, 0, (int) $limit); - - return $actions_limit; + $query = $queryBuilder + ->groupBy('u.id') + ->setMaxResults((int) $limit) + ->getQuery(); + + return $query->getResult(); } public function resetClonedFromCollectivity(Collectivity $collectivity) diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig index c0145cd77124533f8c4dd1d1bb25722a1dcd51ea..49fb5dedec88c4929f575435a759f1f1124e986a 100644 --- a/templates/Aipd/Analyse_impact/pdf.html.twig +++ b/templates/Aipd/Analyse_impact/pdf.html.twig @@ -290,7 +290,7 @@ </tr> </table> <div class="separator"></div> - {% set critere = object.criterePrincipeFondamentalByCode('description_fonctionnelle') %} + {% set critere = object.criterePrincipeFondamentalByCode('identification_biens') %} {% if critere and critere.reponse != 'non_renseigne' %} <table class="table table-bordered"> <tr>