Merge remote-tracking branch 'origin/master' into rector/rules-up-to-php80

Conflicts: src/Bundle/ChillActivityBundle/Controller/ActivityController.php src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php src/Bundle/ChillEventBundle/Search/EventSearch.php src/Bundle/ChillMainBundle/Controller/ExportController.php src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php src/Bundle/ChillMainBundle/Cron/CronManager.php src/Bundle/ChillMainBundle/Entity/CronJobExecution.php src/Bundle/ChillMainBundle/Export/ExportManager.php src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php src/Bundle/ChillMainBundle/Repository/NotificationRepository.php src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
2025-08-25 00:53:48 +00:00 · 2023-07-17 12:49:13 +02:00
parent 737f5f9275 1ebf68683f
commit 224c2c74e8
544 changed files with 18622 additions and 2105 deletions
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -33,11 +33,23 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class DocumentAccompanyingCourseController extends AbstractController
 {
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected TranslatorInterface $translator;
+
    /**
     * DocumentAccompanyingCourseController constructor.
     */
-    public function __construct(protected TranslatorInterface $translator, protected EventDispatcherInterface $eventDispatcher, protected AuthorizationHelper $authorizationHelper, private PaginatorFactory $paginatorFactory, private AccompanyingCourseDocumentRepository $courseRepository)
-    {
+    public function __construct(
+        TranslatorInterface $translator,
+        EventDispatcherInterface $eventDispatcher,
+        AuthorizationHelper $authorizationHelper,
+    ) {
+        $this->translator = $translator;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->authorizationHelper = $authorizationHelper;
    }

    /**
@@ -62,7 +74,7 @@ class DocumentAccompanyingCourseController extends AbstractController
                return $this->redirect($request->query->get('returnPath'));
            }

-            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-period_index', ['id' => $course->getId()]);
        }

        return $this->render(
@@ -116,40 +128,6 @@ class DocumentAccompanyingCourseController extends AbstractController
        );
    }

-    /**
-     * @Route("/", name="accompanying_course_document_index", methods="GET")
-     */
-    public function index(AccompanyingPeriod $course): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if (null === $course) {
-            throw $this->createNotFoundException('Accompanying period not found');
-        }
-
-        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);
-
-        $total = $this->courseRepository->countByCourse($course);
-        $pagination = $this->paginatorFactory->create($total);
-
-        $documents = $this->courseRepository
-            ->findBy(
-                ['course' => $course],
-                ['date' => 'DESC', 'id' => 'DESC'],
-                $pagination->getItemsPerPage(),
-                $pagination->getCurrentPageFirstItemNumber()
-            );
-
-        return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:index.html.twig',
-            [
-                'documents' => $documents,
-                'accompanyingCourse' => $course,
-                'pagination' => $pagination,
-            ]
-        );
-    }
-
    /**
     * @Route("/new", name="accompanying_course_document_new", methods="GET|POST")
     */
@@ -182,7 +160,7 @@ class DocumentAccompanyingCourseController extends AbstractController

            $this->addFlash('success', $this->translator->trans('The document is successfully registered'));

-            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-period_index', ['id' => $course->getId()]);
        }

        if ($form->isSubmitted() && !$form->isValid()) {
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -39,11 +39,23 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class DocumentPersonController extends AbstractController
 {
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected TranslatorInterface $translator;
+
    /**
     * DocumentPersonController constructor.
     */
-    public function __construct(protected TranslatorInterface $translator, protected EventDispatcherInterface $eventDispatcher, protected AuthorizationHelper $authorizationHelper, private PaginatorFactory $paginatorFactory, private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository)
-    {
+    public function __construct(
+        TranslatorInterface $translator,
+        EventDispatcherInterface $eventDispatcher,
+        AuthorizationHelper $authorizationHelper,
+    ) {
+        $this->translator = $translator;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->authorizationHelper = $authorizationHelper;
    }

    /**
@@ -68,7 +80,7 @@ class DocumentPersonController extends AbstractController
                return $this->redirect($request->query->get('returnPath'));
            }

-            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-person_index', ['id' => $person->getId()]);
        }

        return $this->render(
@@ -140,45 +152,6 @@ class DocumentPersonController extends AbstractController
        );
    }

-    /**
-     * @Route("/", name="person_document_index", methods="GET")
-     */
-    public function index(Person $person): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if (null === $person) {
-            throw $this->createNotFoundException('Person not found');
-        }
-
-        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-
-        $total = $this->personDocumentACLAwareRepository->countByPerson($person);
-        $pagination = $this->paginatorFactory->create($total);
-
-        $documents = $this->personDocumentACLAwareRepository->findByPerson(
-            $person,
-            ['date' => 'DESC', 'id' => 'DESC'],
-            $pagination->getItemsPerPage(),
-            $pagination->getCurrentPageFirstItemNumber()
-        );
-
-        $event = new PrivacyEvent($person, [
-            'element_class' => PersonDocument::class,
-            'action' => 'index',
-        ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        return $this->render(
-            'ChillDocStoreBundle:PersonDocument:index.html.twig',
-            [
-                'documents' => $documents,
-                'person' => $person,
-                'pagination' => $pagination,
-            ]
-        );
-    }
-
    /**
     * @Route("/new", name="person_document_new", methods="GET|POST")
     */
@@ -213,7 +186,7 @@ class DocumentPersonController extends AbstractController

            $this->addFlash('success', $this->translator->trans('The document is successfully registered'));

-            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-person_index', ['id' => $person->getId()]);
        }

        if ($form->isSubmitted() && !$form->isValid()) {
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
@@ -0,0 +1,98 @@
+<?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\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\GenericDoc\Manager;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Symfony\Bundle\TwigBundle\TwigEngine;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Templating\EngineInterface;
+
+final readonly class GenericDocForAccompanyingPeriodController
+{
+    public function __construct(
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        private Manager $manager,
+        private PaginatorFactory $paginator,
+        private Security $security,
+        private EngineInterface $twig,
+    ) {
+    }
+
+    /**
+     * @param AccompanyingPeriod $accompanyingPeriod
+     * @return Response
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @Route("/{_locale}/doc-store/generic-doc/by-period/{id}/index", name="chill_docstore_generic-doc_by-period_index")
+     */
+    public function list(AccompanyingPeriod $accompanyingPeriod): Response
+    {
+        if (!$this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod)) {
+            throw new AccessDeniedHttpException("not allowed to see the documents for accompanying period");
+        }
+
+        $filterBuilder = $this->filterOrderHelperFactory
+            ->create(self::class)
+            ->addSearchBox()
+            ->addDateRange('dateRange', 'generic_doc.filter.date-range');
+
+        if ([] !== $places = $this->manager->placesForAccompanyingPeriod($accompanyingPeriod)) {
+            $filterBuilder->addCheckbox('places', $places, [], array_map(
+                static fn (string $k) => 'generic_doc.filter.keys.' . $k,
+                $places
+            ));
+        }
+
+        $filter = $filterBuilder
+            ->build();
+
+        ['to' => $endDate, 'from' => $startDate ] = $filter->getDateRangeData('dateRange');
+        $content = $filter->getQueryString();
+
+        $nb = $this->manager->countDocForAccompanyingPeriod(
+            $accompanyingPeriod,
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+        $paginator = $this->paginator->create($nb);
+
+        $documents = $this->manager->findDocForAccompanyingPeriod(
+            $accompanyingPeriod,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage(),
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+
+        return new Response($this->twig->render(
+            '@ChillDocStore/GenericDoc/accompanying_period_list.html.twig',
+            [
+                'accompanyingCourse' => $accompanyingPeriod,
+                'pagination' => $paginator,
+                'documents' => iterator_to_array($documents),
+                'filter' => $filter,
+            ]
+        ));
+    }
+
+}
--- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
@@ -0,0 +1,95 @@
+<?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\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\GenericDoc\Manager;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Templating\EngineInterface;
+
+final readonly class GenericDocForPerson
+{
+    public function __construct(
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        private Manager $manager,
+        private PaginatorFactory $paginator,
+        private Security $security,
+        private EngineInterface $twig,
+    ) {
+    }
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @Route("/{_locale}/doc-store/generic-doc/by-person/{id}/index", name="chill_docstore_generic-doc_by-person_index")
+     */
+    public function list(Person $person): Response
+    {
+        if (!$this->security->isGranted(PersonDocumentVoter::SEE, $person)) {
+            throw new AccessDeniedHttpException("not allowed to see the documents for person");
+        }
+
+        $filterBuilder = $this->filterOrderHelperFactory
+            ->create(self::class)
+            ->addSearchBox()
+            ->addDateRange('dateRange', 'generic_doc.filter.date-range');
+
+        if ([] !== $places = $this->manager->placesForPerson($person)) {
+            $filterBuilder->addCheckbox('places', $places, [], array_map(
+                static fn (string $k) => 'generic_doc.filter.keys.' . $k,
+                $places
+            ));
+        }
+
+        $filter = $filterBuilder
+            ->build();
+
+        ['to' => $endDate, 'from' => $startDate ] = $filter->getDateRangeData('dateRange');
+        $content = $filter->getQueryString();
+
+        $nb = $this->manager->countDocForPerson(
+            $person,
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+        $paginator = $this->paginator->create($nb);
+
+        $documents = $this->manager->findDocForPerson(
+            $person,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage(),
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+
+        return new Response($this->twig->render(
+            '@ChillDocStore/GenericDoc/person_list.html.twig',
+            [
+                'person' => $person,
+                'pagination' => $paginator,
+                'documents' => iterator_to_array($documents),
+                'filter' => $filter,
+            ]
+        ));
+    }
+
+}