Merge branch '111_exports_suite' into 641_issues_with_children

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php

@@ -14,9 +14,8 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
 
-final class EvaluationRepository implements ObjectRepository
+final class EvaluationRepository implements EvaluationRepositoryInterface
 {
     private EntityRepository $repository;
 
@@ -38,6 +37,11 @@ final class EvaluationRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    public function findAllActive(): array
+    {
+        return $this->findBy(['active' => true]);
+    }
+
     /**
      * @param mixed|null $limit
      * @param mixed|null $offset

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Repository\SocialWork;
+
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Doctrine\Persistence\ObjectRepository;
+
+interface EvaluationRepositoryInterface extends ObjectRepository
+{
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Evaluation;
+
+    /**
+     * @return array<int, Evaluation>
+     */
+    public function findAll(): array;
+
+    /**
+     * @return array<int, Evaluation>
+     */
+    public function findAllActive(): array;
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return array<int, Evaluation>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation;
+
+    /**
+     * @return class-string
+     */
+    public function getClassName(): string;
+}

src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -62,17 +63,21 @@ final class GoalRepository implements ObjectRepository
     }
 
     /**
-     * @param mixed|null $orderBy
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
      * @return Goal[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, $orderBy = null, $limit = null, $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('g');
 
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()->isNull('g.desactivationDate'),
+                $qb->expr()->gt('g.desactivationDate', ':now')
+            )
+        )
+            ->setParameter('now', new DateTime('now'));
+
         foreach ($orderBy as $sort => $order) {
             $qb->addOrderBy('g.' . $sort, $order);
         }

src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php

@@ -96,13 +96,9 @@ final class ResultRepository implements ObjectRepository
     }
 
     /**
-     * @param mixed|null $orderBy
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
      * @return Result[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, $orderBy = null, $limit = null, $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('r');