Merge remote-tracking branch 'origin/testing' into chill_amli

.gitignore

@@ -3,9 +3,7 @@ composer
 composer.phar
 composer.lock
 docs/build/
-node_modules/*
 .php_cs.cache
-.cache/*
 
 ###> symfony/framework-bundle ###
 /.env.local
@@ -26,5 +24,3 @@ node_modules/*
 /.php-cs-fixer.cache
 /.idea/
 /.psalm/
-
-node_modules/*

.php_cs.dist.php

@@ -1,14 +1,15 @@
 <?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.
  */
 
+declare(strict_types=1);
+
+/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
 $config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
 
 $config

CHANGELOG.md

@@ -16,8 +16,6 @@ and this project adheres to
 * [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
 * [person][export] Fixed: some inconsistency with date filter on accompanying courses
 * [person][export] Fixed: use left join for related entities in accompanying course aggregators
-* [workflow] Feature: allow user to copy and send manually the access link for the workflow
-* [workflow] Feature: show the email addresses that received an access link for the workflow
 
 ## Test releases
 
@@ -34,12 +32,8 @@ and this project adheres to
 * [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
 * [search]: Order of birthdate fields changed in advanced search to avoid confusion.
 * [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
-* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
 * [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
 * [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
-* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
-
-## Test releases
 
 ### 2022-05-30
 

composer.json

@@ -9,22 +9,18 @@
     ],
     "require": {
         "php": "^7.4",
-        "ext-json": "*",
-        "ext-openssl": "*",
-        "ext-redis": "*",
         "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
-        "champs-libres/wopi-bundle": "dev-master@dev",
-        "champs-libres/wopi-lib": "dev-master@dev",
+        "champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
+        "champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
         "doctrine/doctrine-bundle": "^2.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.13.0",
+        "doctrine/orm": "^2.7",
         "erusev/parsedown": "^1.7",
         "graylog2/gelf-php": "^1.5",
         "knplabs/knp-menu-bundle": "^3.0",
         "knplabs/knp-time-bundle": "^1.12",
         "knpuniversity/oauth2-client-bundle": "^2.10",
         "league/csv": "^9.7.1",
-        "lexik/jwt-authentication-bundle": "^2.16",
         "nyholm/psr7": "^1.4",
         "ocramius/package-versions": "^1.10 || ^2",
         "odolbeau/phone-number-bundle": "^3.6",
@@ -33,12 +29,12 @@
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
         "spomky-labs/base64url": "^2.0",
+        "symfony/asset": "^4.4",
         "symfony/browser-kit": "^4.4",
         "symfony/css-selector": "^4.4",
         "symfony/expression-language": "^4.4",
         "symfony/form": "^4.4",
         "symfony/framework-bundle": "^4.4",
-        "symfony/http-client": "^4.4 || ^5",
         "symfony/http-foundation": "^4.4",
         "symfony/intl": "^4.4",
         "symfony/mailer": "^5.4",
@@ -52,6 +48,7 @@
         "symfony/translation": "^4.4",
         "symfony/twig-bundle": "^4.4",
         "symfony/validator": "^4.4",
+        "symfony/web-link": "*",
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^4.4",
         "symfony/yaml": "^4.4",
@@ -75,7 +72,8 @@
         "symfony/maker-bundle": "^1.20",
         "symfony/phpunit-bridge": "^4.4",
         "symfony/stopwatch": "^4.4",
-        "symfony/var-dumper": "^4.4"
+        "symfony/var-dumper": "^4.4",
+        "symfony/web-profiler-bundle": "^4.4"
     },
     "conflict": {
         "symfony/symfony": "*"

docs/source/_static/code/exports/BirthdateFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;

docs/source/_static/code/exports/CountPerson.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
@@ -18,6 +18,7 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
 class CountPerson implements ExportInterface
 {
@@ -72,9 +73,9 @@ class CountPerson implements ExportInterface
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()
@@ -105,9 +106,9 @@ class CountPerson implements ExportInterface
         return $qb;
     }
 
-    public function requiredRole(): string
+    public function requiredRole()
     {
-        return PersonVoter::STATS;
+        return new Role(PersonVoter::STATS);
     }
 
     public function supportsModifiers()

docs/source/development/cronjob.rst

@@ -1,93 +0,0 @@
-
-.. Copyright (C)  2014-2023 Champs Libres Cooperative SCRLFS
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-.. _cronjob:
-
-Cron jobs
-*********
-
-Some tasks must be executed regularly: refresh some materialized views, remove old data, ...
-
-For this purpose, one can programmatically implements a "cron job", which will be scheduled by a specific command.
-
-The command :code:`chill:cron-job:execute`
-==========================================
-
-The command :code:`chill:cron-job:execute` will schedule a task, one by one. In a classical implementation, it should
-be executed every 15 minutes (more or less), to ensure that every task can be executed.
-
-.. warning::
-
-   This command should not be executed in parallel. The installer should ensure that two job are executed concurrently.
-
-How to implements a cron job ?
-==============================
-
-Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
-
-.. code-block:: php
-
-    namespace Chill\MainBundle\Service\Something;
-
-    use Chill\MainBundle\Cron\CronJobInterface;
-    use Chill\MainBundle\Entity\CronJobExecution;
-    use DateInterval;
-    use DateTimeImmutable;
-
-    class MyCronJob implements CronJobInterface
-    {
-        public function canRun(?CronJobExecution $cronJobExecution): bool
-        {
-            // the parameter $cronJobExecution contains data about the last execution of the cronjob
-            // if it is null, it should be executed immediatly
-            if (null === $cronJobExecution) {
-                return true;
-            }
-
-            if ($cronJobExecution->getKey() !== $this->getKey()) {
-                throw new UnexpectedValueException();
-            }
-
-            // this cron job should be executed if the last execution is greater than one day, but only during the night
-
-            $now = new DateTimeImmutable('now');
-
-            return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
-                && in_array($now->format('H'), self::ACCEPTED_HOURS, true)
-                // introduce a random component to ensure a roll of task execution when multiple instances are hosted on same machines
-                && mt_rand(0, 5) === 0;
-        }
-
-        public function getKey(): string
-        {
-            return 'arbitrary-and-unique-key';
-        }
-
-        public function run(): void
-        {
-            // here, we execute the command
-        }
-    }
-
-How are cron job scheduled ?
-============================
-
-If the command :code:`chill:cron-job:execute` is run with one or more :code:`job` argument, those jobs are run, **without checking that the job can run** (the method :code:`canRun` is not executed).
-
-If any :code:`job` argument is given, the :code:`CronManager` schedule job with those steps:
-
-* the tasks are ordered, with:
-   * a priority is given for tasks that weren't never executed;
-   * then, the tasks are ordered, the last executed are the first in the list
-* then, for each tasks, and in the given order, the first task where :code:`canRun` return :code:`TRUE` will be executed.
-
-The command :code:`chill:cron-job:execute` execute **only one** task.
-
-
-

docs/source/development/index.rst

@@ -34,7 +34,6 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
     Useful snippets <useful-snippets.rst>
     manual/index.rst
     Assets <assets.rst>
-    Cron Jobs <cronjob.rst>
 
 Layout and UI
 **************

docs/source/development/pagination/example.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;

docs/source/development/user-interface/widgets/ChillMainExtension.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;

docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;

docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;

docs/source/development/user-interface/widgets/ChillPersonExtension.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

docs/source/installation/index.rst

@@ -18,7 +18,6 @@ Installation & Usage
    :maxdepth: 2
 
    prod.rst
-   load-addresses.rst
    prod-calendar-sms-sending.rst
    msgraph-configure.rst
 
@@ -29,42 +28,34 @@ Requirements
 - This project use `docker  <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
 - Make is used to automate scripts.
 
-Installation
-************
-
-If you plan to run chill in production:
-
-1. install it locally first, and check if everything is ok on your local machine;
-2. once ready, build the image from your local machine, and deploy them.
-
-If you want to develop some bundles, the first step is sufficient (until you deploy on production).
-
+Installation in development mode
+********************************
 
 1. Get the code
 ===============
 
-Clone or download the chill-skeleton project and `cd` into the main directory.
+Clone or download the chill-app project and `cd` into the main directory.
 
 
 .. code-block:: bash
 
-   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
+   git clone https://gitlab.com/Chill-Projet/chill-app.git
    cd chill-app
 
 
 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
 
-2. Prepare composer to download the sources
-===========================================
+2. Prepare composer download of sources
+=======================================
 
-As you are running in dev, you must configure an auth token for getting the source code.
+As you are running in dev, you must configure an auth token for getting the source code. 
 
 .. warning
 
    If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
 
 1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
-2. add a file called ```.composer/auth.json``` with this content:
+2. add a file called ```.composer/auth.json```:
 
    .. code-block:: json
 
@@ -77,25 +68,13 @@ As you are running in dev, you must configure an auth token for getting the sour
 2. Prepare your variables and environment
 =========================================
 
-Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
+Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml``` 
 
 .. code-block:: bash
 
    cp docker-compose.override.dev.template.yml docker-compose.override.yml
 
-2. Prepare your variables and docker-compose
-============================================
-
-Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
-
-1. copy the file as ``.env.local``: ``cp .env .env.local``
-2. you may replace some variables inside ``.env``
-
-Prepare also you docker-compose installation, and adapt it to your needs:
-
-1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
-2. adapt to your needs.
-
+Configure your environment variables, by creating a .env.local file and override the desired variables.
 
 **Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.
 
@@ -111,21 +90,10 @@ This script can be run using `make`
 This script will :
 
 1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
-2. run an install script to download `composer <https://getcomposer.org>`_ ;
+2. run an install script to download `composer <https://getcomposer.org>`_ ; 
 3. install the php dependencies
 4. build assets
 
-.. warning::
-
-   The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
-   you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
-
-   .. code-block:: bash
-
-      #!/bin/bash
-
-      /usr/bin/docker compose "$@"
-
 
 .. note::
 
@@ -149,20 +117,13 @@ This script will :
 
 .. code-block:: bash
 
-   # mount into to container
-   ./docker-php.sh
-   # and load fixtures
-   bin/console doctrine:migrations:migrate
-
+   make migrate
 
 Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run
 
 .. code-block:: bash
 
-   # mount into to container
-   ./docker-php.sh
-   # and load fixtures
-   bin/console doctrine:fixtures:load --purge-with-truncate
+   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
 
 There are several users available:
 
@@ -171,7 +132,29 @@ There are several users available:
 
 The password is always ``password``.
 
-Now, read `Operations` below. For running in production, read `prod_`.
+Now, read `Operations` below.
+
+Prepare for development
+***********************
+
+Add a Gitlab token to ensure that you get always the source code:
+
+1. generate a gitlab token there: https://gitlab.com/oauth/token
+2. run this command (in php container, at the app's root): :code:`composer config gitlab-token.gitlab.com <your token>`
+
+The auth token should appears now in the directory :code:`.composer`:
+
+.. code-block: bash
+
+   $ cat .composer/auth.json
+   {
+       "gitlab-token": {
+           "gitlab.com": "<your token>"
+       }
+   }
+
+
+See also "how to switch branch and get new dependencies".
 
 
 Operations
@@ -180,7 +163,7 @@ Operations
 Build assets
 ============
 
-run those commands:
+run those commands: 
 
 .. code-block:: bash
 
@@ -192,8 +175,8 @@ How to execute the console ?
 .. code-block:: bash
 
    # if a container is running
-   ./docker-php.sh
-   # if not
+   docker-compose exec --user $(id -u) php bin/console
+   # if not 
    docker-compose run --user $(id -u) php bin/console
 
 How to create the database schema (= run migrations) ?
@@ -202,9 +185,8 @@ How to create the database schema (= run migrations) ?
 .. code-block:: bash
 
    # if a container is running
-   ./docker-php.sh
-   bin/console doctrine:migrations:migrate
-   # if not
+   docker-compose exec --user $(id -u) php bin/console doctrine:migrations:migrate
+   # if not 
    docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
 
 
@@ -221,9 +203,8 @@ How to load fixtures ? (development mode only)
 .. code-block:: bash
 
    # if a container is running
-   ./docker-php.sh
-   bin/console doctrine:fixtures:load
-   # if not
+   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load
+   # if not 
    docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load
 
 How to open a terminal in the project
@@ -232,8 +213,8 @@ How to open a terminal in the project
 .. code-block:: bash
 
    # if a container is running
-   ./docker-php.sh
-   # if not
+   docker-compose exec --user $(id -u) php /bin/bash
+   # if not 
    docker-compose run --user $(id -u) php /bin/bash
 
 How to run composer ?
@@ -242,22 +223,21 @@ How to run composer ?
 .. code-block:: bash
 
    # if a container is running
-   ./docker-php.sh
-   composer
-   # if not
-   docker-compose run --user $(id -u) php composer
+   docker-compose exec --user $(id -u) php ./composer.phar
+   # if not 
+   docker-compose run --user $(id -u) php ./composer.phar
 
 How to access to PGADMIN ?
 ==========================
 
-Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.
+Pgadmin is installed with docker-compose.
 
 You can access it at ``http://localhost:8002``.
 
 Credentials:
 
-- login: from the variable you set into ``docker-composer.override.yml``
-- password: same :-)
+- login: admin@chill.social
+- password: password
 
 How to run tests ?
 ==================
@@ -266,44 +246,18 @@ Tests reside inside the installed bundles. You must `cd` into that directory, do
 
 **Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.
 
-Exemple, for running unit test inside `main` bundle:
+Exemple, for running test inside `main` bundle: 
 
 .. code-block:: bash
 
    # mount into the php image
-   ./docker-php.sh
+   docker-compose run --user $(id -u) php /bin/bash
    # cd into main directory
-   cd vendor/chill-project/chill-bundles
+   cd vendor/chill-project/main
    # download deps
-   git submodule init
-   git submodule update
-   composer install
+   php ../../../composer.phar install
    # run tests
-   bin/phpunit src/Bundle/path/to/your/test
-
-Or for running tests to check code style and php conventions with csfixer and phpstan:
-
-.. code-block:: bash
-
-    # run code style fixer
-    bin/grumphp run --tasks=phpcsfixer
-    # run phpstan
-    bin/grumphp run --tasks=phpstan
-
-
-.. note::
-
-    To avoid phpstan block your commits:
-
-    .. code-block:: bash
-
-        git commit -n ...
-
-    To avoid phpstan block your commits permanently:
-
-    .. code-block:: bash
-
-        ./bin/grumphp git:deinit
+   /vendor/bin/phpunit
 
 How to run webpack interactively
 ================================
@@ -315,14 +269,10 @@ How to switch the branch for chill-bundles, and get new dependencies
 
 During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.
 
-.. warning::
-
-   Ensure that you have gitlab-token ready before updating your branches. See above.
-
 In order to do that without pain, use those steps:
 
 0. Ensuire you have a token, set
-1. at the app's root, update the ``composer.json`` to your current branch:
+1. at the app's root, update the `composer.json` to your current branch:
 
 .. code-block:: json
 
@@ -331,7 +281,14 @@ In order to do that without pain, use those steps:
           "chill-bundles": "dev-<my-branch>@dev"
    }
 
-2. mount into the php container (``./docker-php.sh``), and run ``composer update``
+2. mount into the php container, and run `composer update`
+
+Build the documentation API
+===========================
+
+A basic configuration of `sami <https://github.com/FriendsOfPhp/Sami>`_ is embedded within the project. 
+
+A configuration file for `phpDocumentor <https://www.phpdoc.org>`_ is present.
 
 Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
 ====================================================================================================================================================================
@@ -345,9 +302,8 @@ Currently, to run this software in production, the *state of the art* is the fol
 
 1. Run the software locally and tweak the configuration to your needs ;
 2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
-
-   To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
-3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
+   
+   To be sure to target the correct container registry, you have to adapt the values ``IMAGE_NGINX`` and ``IMAGE_PHP`` date in the ``.env`` file.
 3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.
 
    See also the :ref:`running-production-tips-and-tricks` below.
@@ -379,7 +335,7 @@ It is worth having an eye on the configuration of logstash container.
 Design principles
 *****************
 
-Why the DB URL is also set in environment, and not in .env file ?
+Why the DB URL is set in environment, and not in parameters.yml ?
 =================================================================
 
 Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).

docs/source/installation/load-addresses.rst

@@ -1,50 +0,0 @@
-
-.. _addresses:
-
-Addresses
-*********
-
-Chill can store a list of geolocated address references, which are used to suggest address and ensure that the data is correctly stored.
-
-Those addresses may be load from a dedicated source.
-
-In France
-=========
-
-The address are loaded from the `BANO <https://bano.openstreetmap.fr/>`_. The postal codes are loaded from `the official list of
-postal codes <https://datanova.laposte.fr/explore/dataset/laposte_hexasmal/information/>`_
-
-.. code-block:: bash
-
-   # first, load postal codes
-   bin/console chill:main:postal-code:load:FR
-   # then, load all addresses, by departement (multiple departement can be loaded by repeating the departement code
-   bin/console chill:main:address-ref-from-bano 57 54 51
-
-In Belgium
-==========
-
-Addresses are prepared from the `BeST Address data <https://www.geo.be/catalog/details/ca0fd5c0-8146-11e9-9012-482ae30f98d9>`_.
-
-Postal code are loaded from this database. There is no need to load postal codes from another source (actually, this is strongly discouraged).
-
-The data are prepared for Chill (`See this repository <https://gitea.champs-libres.be/Chill-project/belgian-bestaddresses-transform/releases>`_).
-One can select postal code by his first number (:code:`1xxx` for postal codes from 1000 to 1999), or a limited list for development purpose.
-
-.. code-block:: bash
-
-   # load postal code from 1000 to 3999:
-   bin/console chill:main:address-ref-from-best-addresse 1xxx 2xxx 3xxx
-
-   # load only an extract (for dev purposes)
-   bin/console chill:main:address-ref-from-best-addresse extract
-
-   # load full addresses (discouraged)
-   bin/console chill:main:address-ref-from-best-addresse full
-
-.. note::
-
-   There is a possibility to load the full list of addresses is discouraged: the loading is optimized with smaller extracts.
-
-   Once you load the full list, it is not possible to load smaller extract: each extract loaded **after** will not
-   delete the addresses loaded with the full extract (and some addresses will be present twice).

docs/source/installation/prod.rst

@@ -1,12 +1,10 @@
 .. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-.. _prod:
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 
 Installation for production
 ###########################
@@ -38,25 +36,12 @@ This should be adapted to your needs:
 
 * Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
 
-Cron jobs
-=========
-
-The command :code:`chill:cron-job:execute` should be executed every 15 minutes (more or less).
-
-This command should never be executed concurrently. It should be not have more than one process for a single instance.
-
-Post-install tasks
-==================
-
-- import addresses. See :ref:`addresses`.
-
-
 Tweak symfony messenger
 =======================
 
 Calendar sync is processed using symfony messenger.
 
-You can tweak the configuration
+You can tweak the configuration 
 
 Going further:
 

exports_alias_conventions.md

@@ -5,70 +5,67 @@ Add condition with distinct alias on each export join clauses (Indicators + Filt
 
 These are alias conventions :
 
-| Entity                                  | Join                                    | Attribute                                  | Alias                                  |
-|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
-| AccompanyingPeriod::class               |                                         |                                            | acp                                    |
-|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                   |
-|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                |
-|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                 |
-|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                              |
-|                                         | UserJob::class                          | acp.job                                    | acpjob                                 |
-|                                         | Origin::class                           | acp.origin                                 | acporigin                              |
-|                                         | Scope::class                            | acp.scopes                                 | acpscope                               |
-|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
-|                                         | User::class                             | acp.user                                   | acpuser                                |
-|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
-| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
-|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
-|                                         | User::class                             | acpw.referrers                             | acpwuser                               |
-|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                       |
-|                                         | Goal::class                             | acpw.goals                                 | goal                                   |
-|                                         | Result::class                           | acpw.results                               | result                                 |
-| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                |
-|                                         | Person::class                           | acppart.person                             | partperson                             |
-| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                               |
-|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                   |
-| Goal::class                             |                                         |                                            | goal                                   |
-|                                         | Result::class                           | goal.results                               | goalresult                             |
-| Person::class                           |                                         |                                            | person                                 |
-|                                         | Center::class                           | person.center                              | center                                 |
-|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                        |
-|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                          |
-|                                         | VendeePerson::class                     |                                            | vp                                     |
-|                                         | VendeePersonMineur::class               |                                            | vpm                                    |
-|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date) |
-| ResidentialAddress::class               |                                         |                                            | resaddr                                |
-|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                 |
-| ThirdParty::class                       |                                         |                                            | tparty                                 |
-|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                              |
-| HouseholdMember::class                  |                                         |                                            | householdmember                        |
-|                                         | Household::class                        | householdmember.household                  | household                              |
-|                                         | Person::class                           | householdmember.person                     | memberperson                           |
-|                                         |                                         | memberperson.center                        | membercenter                           |
-| Household::class                        |                                         |                                            | household                              |
-|                                         | HouseholdComposition::class             | household.compositions                     | composition                            |
-| Activity::class                         |                                         |                                            | activity                               |
-|                                         | Person::class                           | activity.person                            | actperson                              |
-|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                    |
-|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity       |
-|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity      |
-|                                         | ActivityType::class                     | activity.activityType                      | acttype                                |
-|                                         | Location::class                         | activity.location                          | actloc                                 |
-|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                        |
-|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                          |
-|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                              |
-|                                         | User::class                             | activity.user                              | actuser                                |
-|                                         | User::class                             | activity.users                             | actusers                               |
-|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                             |
-|                                         | Center::class                           | actperson.center                           | actcenter                              |
-|                                         | Person::class                           | activity.createdBy                         | actcreator                             |
-| ActivityReason::class                   |                                         |                                            | actreasons                             |
-|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                           |
-| Calendar::class                         |                                         |                                            | cal                                    |
-|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                              |
-|                                         | Location::class                         | cal.location                               | calloc                                 |
-|                                         | User::class                             | cal.user                                   | caluser                                |
-| VendeePerson::class                     |                                         |                                            | vp                                     |
-|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                 |
-|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                  |
-|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                   |
+| Entity                                  | Join                                    | Attribute                                  | Alias                             |
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:----------------------------------|
+| AccompanyingPeriod::class               |                                         |                                            | acp                               |
+|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                              |
+|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                           |
+|                                         | Location::class                         | acp.administrativeLocation                 | acploc                            |
+|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                         |
+|                                         | UserJob::class                          | acp.job                                    | acpjob                            |
+|                                         | Origin::class                           | acp.origin                                 | acporigin                         |
+|                                         | Scope::class                            | acp.scopes                                 | acpscope                          |
+|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                    |
+|                                         | User::class                             | acp.user                                   | acpuser                           |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                              |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                          |
+|                                         | User::class                             | acpw.referrers                             | acpwuser                          |
+|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                  |
+|                                         | Goal::class                             | acpw.goals                                 | goal                              |
+|                                         | Result::class                           | acpw.results                               | result                        |
+| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                           |
+|                                         | Person::class                           | acppart.person                             | partperson                        |
+| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                          |
+|                                         | Evaluation::class                       | workeval.evaluation                        | eval                              |
+| Goal::class                             |                                         |                                            | goal                              |
+|                                         | Result::class                           | goal.results                               | goalresult                        |
+| Person::class                           |                                         |                                            | person                            |
+|                                         | Center::class                           | person.center                              | center                            |
+|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                   |
+|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                     |
+|                                         | VendeePerson::class                     |                                            | vp                                |
+|                                         | VendeePersonMineur::class               |                                            | vpm                               |
+| ResidentialAddress::class               |                                         |                                            | resaddr                           |
+|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                            |
+| ThirdParty::class                       |                                         |                                            | tparty                            |
+|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                         |
+| HouseholdMember::class                  |                                         |                                            | householdmember                   |
+|                                         | Household::class                        | householdmember.household                  | household                         |
+|                                         | Person::class                           | householdmember.person                     | memberperson                      |
+|                                         |                                         | memberperson.center                        | membercenter                      |
+| Household::class                        |                                         |                                            | household                         |
+|                                         | HouseholdComposition::class             | household.compositions                     | composition                       |
+| Activity::class                         |                                         |                                            | activity                          |
+|                                         | Person::class                           | activity.person                            | actperson                         |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                            |
+|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity  |
+|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity |
+|                                         | ActivityType::class                     | activity.activityType                      | acttype                           |
+|                                         | Location::class                         | activity.location                          | actloc                            |
+|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                   |
+|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                     |
+|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                         |
+|                                         | User::class                             | activity.user                              | actuser                           |
+|                                         | User::class                             | activity.users                             | actusers                          |
+|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                        |
+|                                         | Center::class                           | actperson.center                           | actcenter                         |
+| ActivityReason::class                   |                                         |                                            | actreasons                        |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                      |
+| Calendar::class                         |                                         |                                            | cal                               |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                         |
+|                                         | Location::class                         | cal.location                               | calloc                            |
+|                                         | User::class                             | cal.user                                   | caluser                           |
+| VendeePerson::class                     |                                         |                                            | vp                                |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                            |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                             |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                              |

package.json

@@ -1,67 +0,0 @@
-{
-    "name": "chill",
-    "version": "2.0.0",
-    "devDependencies": {
-    "@alexlafroscia/yaml-merge": "^4.0.0",
-    "@apidevtools/swagger-cli": "^4.0.4",
-    "@babel/core": "^7.20.5",
-    "@babel/preset-env": "^7.20.2",
-    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
-    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
-    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
-    "@ckeditor/ckeditor5-vue": "^4.0.1",
-    "@symfony/webpack-encore": "^4.1.0",
-    "@tsconfig/node14": "^1.0.1",
-    "bindings": "^1.5.0",
-    "bootstrap": "^5.0.1",
-    "chokidar": "^3.5.1",
-    "fork-awesome": "^1.1.7",
-    "jquery": "^3.6.0",
-    "node-sass": "^8.0.0",
-    "popper.js": "^1.16.1",
-    "postcss-loader": "^7.0.2",
-    "raw-loader": "^4.0.2",
-    "sass-loader": "^13.0.0",
-    "select2": "^4.0.13",
-    "select2-bootstrap-theme": "0.1.0-beta.10",
-    "style-loader": "^3.3.1",
-    "ts-loader": "^9.3.1",
-    "typescript": "^4.7.2",
-    "vue-loader": "^17.0.0",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
-  },
-  "dependencies": {
-    "@fullcalendar/core": "^5.11.0",
-    "@fullcalendar/daygrid": "^5.11.0",
-    "@fullcalendar/interaction": "^5.11.0",
-    "@fullcalendar/list": "^5.11.0",
-    "@fullcalendar/timegrid": "^5.11.0",
-    "@fullcalendar/vue3": "^5.11.1",
-    "@popperjs/core": "^2.9.2",
-    "dropzone": "^5.7.6",
-    "es6-promise": "^4.2.8",
-    "leaflet": "^1.7.1",
-    "masonry-layout": "^4.2.2",
-    "mime": "^3.0.0",
-    "swagger-ui": "^4.15.5",
-    "vis-network": "^9.1.0",
-    "vue": "^3.2.37",
-    "vue-i18n": "^9.1.6",
-    "vue-multiselect": "3.0.0-alpha.2",
-    "vue-toast-notification": "^2.0",
-    "vuex": "^4.0.0"
-  },
-  "browserslist": [
-    "Firefox ESR"
-  ],
-  "scripts": {
-    "dev-server": "encore dev-server",
-    "dev": "encore dev",
-    "watch": "encore dev --watch",
-    "build": "encore production --progress"
-  },
-  "private": true
-}

phpstan-critical.neon

@@ -5,6 +5,11 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+
         -
             message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$work\\.$#"
             count: 1
@@ -25,6 +30,11 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
 
+        -
+            message: "#^Undefined variable\\: \\$choiceSlug$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
         -
             message: "#^Undefined variable\\: \\$choiceSlug$#"
             count: 1

phpstan-deprecations.neon

@@ -23,6 +23,150 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityReasonAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityTypeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityUserAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\CountActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityReasonFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityTypeFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+
 		-
 			message: """
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -31,6 +175,13 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
 
 		-
 			message: """
@@ -143,6 +294,14 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
 
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -215,6 +374,38 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
+		-
+			message: """
+				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportInterface.php
+
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ModifierInterface\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+
 		-
 			message: """
 				#^Class Chill\\\\MainBundle\\\\Form\\\\Event\\\\CustomizeFormEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
@@ -374,6 +565,142 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/Person.php
 
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AgeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\CountPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: """
+				#^Call to deprecated method execute\\(\\) of class Doctrine\\\\DBAL\\\\Statement\\:
+				Statement\\:\\:execute\\(\\) is deprecated, use Statement\\:\\:executeQuery\\(\\) or executeStatement\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodClosingFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodOpeningFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\BirthdateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\NationalityFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
+
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -427,6 +754,14 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
 
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -435,6 +770,37 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
 
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: """
+				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Filter\\\\ReportDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
 
 		-
 			message: """
@@ -444,6 +810,14 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Form/ReportType.php
 
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
+
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -452,6 +826,13 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
 
+		-
+			message: """
+				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+				Use getReachableCircles$#
+			"""
+			count: 2
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
 
 		-
 			message: """
@@ -517,6 +898,14 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 
+		-
+			message: """
+				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskAclAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+			"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:

phpstan-types.neon

@@ -10,6 +10,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getTitle\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -235,6 +245,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -320,6 +335,21 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -340,6 +370,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -42,8 +42,8 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
+
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
 
 final class ActivityController extends AbstractController
@@ -74,8 +74,6 @@ final class ActivityController extends AbstractController
 
     private ThirdPartyRepository $thirdPartyRepository;
 
-    private TranslatorInterface $translator;
-
     private UserRepositoryInterface $userRepository;
 
     public function __construct(
@@ -92,8 +90,7 @@ final class ActivityController extends AbstractController
         LoggerInterface $logger,
         SerializerInterface $serializer,
         UserRepositoryInterface $userRepository,
-        CenterResolverManagerInterface $centerResolver,
-        TranslatorInterface $translator
+        CenterResolverManagerInterface $centerResolver
     ) {
         $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->activityTypeRepository = $activityTypeRepository;
@@ -109,7 +106,6 @@ final class ActivityController extends AbstractController
         $this->serializer = $serializer;
         $this->userRepository = $userRepository;
         $this->centerResolver = $centerResolver;
-        $this->translator = $translator;
     }
 
     /**
@@ -165,7 +161,7 @@ final class ActivityController extends AbstractController
                 $this->entityManager->remove($activity);
                 $this->entityManager->flush();
 
-                $this->addFlash('success', $this->translator
+                $this->addFlash('success', $this->get('translator')
                     ->trans('The activity has been successfully removed.'));
 
                 $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
@@ -250,7 +246,7 @@ final class ActivityController extends AbstractController
                 );
             }
 
-            $this->addFlash('success', $this->translator->trans('Success : activity updated!'));
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
 
             return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
@@ -368,7 +364,6 @@ final class ActivityController extends AbstractController
 
         if ($person instanceof Person) {
             $entity->setPerson($person);
-            $entity->getPersons()->add($person);
         }
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
@@ -478,7 +473,7 @@ final class ActivityController extends AbstractController
                 );
             }
 
-            $this->addFlash('success', $this->translator->trans('Success : activity created!'));
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
 

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -1,36 +1,27 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
-use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * ActivityReason controller.
  */
 class ActivityReasonController extends AbstractController
 {
-    private ActivityReasonRepository $activityReasonRepository;
-
-    public function __construct(ActivityReasonRepository $activityReasonRepository)
-    {
-        $this->activityReasonRepository = $activityReasonRepository;
-    }
-
     /**
      * Creates a new ActivityReason entity.
      */
@@ -65,8 +56,8 @@ class ActivityReasonController extends AbstractController
 
         $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
-        if (null === $entity) {
-            throw new NotFoundHttpException('Unable to find ActivityReason entity.');
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
         }
 
         $editForm = $this->createEditForm($entity);
@@ -84,7 +75,7 @@ class ActivityReasonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entities = $this->activityReasonRepository->findAll();
+        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
 
         return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
             'entities' => $entities,

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReason;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -1,22 +1,18 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
@@ -59,12 +55,8 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     getUserFunction="getUser",
  * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
 {
-    use TrackCreationTrait;
-
-    use TrackUpdateTrait;
-
     public const SENTRECEIVED_RECEIVED = 'received';
 
     public const SENTRECEIVED_SENT = 'sent';

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
@@ -63,8 +63,10 @@ class ActivityReason
 
     /**
      * Get category.
+     *
+     * @return ActivityReasonCategory
      */
-    public function getCategory(): ?ActivityReasonCategory
+    public function getCategory()
     {
         return $this->category;
     }
@@ -105,11 +107,6 @@ class ActivityReason
         return $this->name;
     }
 
-    public function isActiveAndParentActive(): bool
-    {
-        return $this->active && null !== $this->getCategory() && $this->getCategory()->getActive();
-    }
-
     /**
      * Set active.
      *

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\EntityListener;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php

@@ -1,68 +0,0 @@
-<?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\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByActivityNumberAggregator implements AggregatorInterface
-{
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data): void
-    {
-        $qb
-            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
-            ->addGroupBy('activity_by_number_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        // No form needed
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return static function ($value) {
-            if ('_header' === $value) {
-                return '';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            return $value;
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['activity_by_number_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group acp by activity number';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,7 +65,7 @@ class BySocialActionAggregator implements AggregatorInterface
                 return 'Social action';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,7 +65,7 @@ class BySocialIssueAggregator implements AggregatorInterface
                 return 'Social issues';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,7 +65,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
                 return 'Accepted thirdparty';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php

@@ -1,31 +1,32 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
-class ByCreatorAggregator implements AggregatorInterface
+class ByUserAggregator implements AggregatorInterface
 {
     private UserRender $userRender;
 
-    private UserRepositoryInterface $userRepository;
+    private UserRepository $userRepository;
 
     public function __construct(
-        UserRepositoryInterface $userRepository,
+        UserRepository $userRepository,
         UserRender $userRender
     ) {
         $this->userRepository = $userRepository;
@@ -39,8 +40,12 @@ class ByCreatorAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
-        $qb->addGroupBy('creator_aggregator');
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb->addSelect('actusers.id AS users_aggregator');
+        $qb->addGroupBy('users_aggregator');
     }
 
     public function applyOn(): string
@@ -57,10 +62,10 @@ class ByCreatorAggregator implements AggregatorInterface
     {
         return function ($value): string {
             if ('_header' === $value) {
-                return 'Created by';
+                return 'Accepted users';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 
@@ -72,11 +77,11 @@ class ByCreatorAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['creator_aggregator'];
+        return ['users_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by creator';
+        return 'Group activity by linked users';
     }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -1,18 +1,19 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
+use DateTime;
 use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -49,17 +50,14 @@ class DateAggregator implements AggregatorInterface
         switch ($data['frequency']) {
             case 'month':
                 $fmt = 'YYYY-MM';
-
                 break;
 
             case 'week':
                 $fmt = 'YYYY-IW';
-
                 break;
 
             case 'year':
                 $fmt = 'YYYY'; $order = 'DESC';
-
                 break; // order DESC does not works !
 
             default:
@@ -100,6 +98,7 @@ class DateAggregator implements AggregatorInterface
 
             switch ($data['frequency']) {
                 case 'month':
+
                 case 'week':
                     //return $this->translator->trans('for week') .' '. $value ;
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,13 +65,11 @@ class LocationTypeAggregator implements AggregatorInterface
                 return 'Accepted locationtype';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 
-            if (null === $lt = $this->locationTypeRepository->find($value)) {
-                return '';
-            }
+            $lt = $this->locationTypeRepository->find($value);
 
             return $this->translatableStringHelper->localize(
                 $lt->getTitle()

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -19,7 +19,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
-class CreatorScopeAggregator implements AggregatorInterface
+class UserScopeAggregator implements AggregatorInterface
 {
     private ScopeRepository $scopeRepository;
 
@@ -40,12 +40,12 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.createdBy', 'actcreator');
+        if (!in_array('actuser', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.user', 'actuser');
         }
 
-        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
-        $qb->addGroupBy('creatorscope_aggregator');
+        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
+        $qb->addGroupBy('userscope_aggregator');
     }
 
     public function applyOn(): string
@@ -65,7 +65,7 @@ class CreatorScopeAggregator implements AggregatorInterface
                 return 'Scope';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 
@@ -79,11 +79,11 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['creatorscope_aggregator'];
+        return ['userscope_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by creator scope';
+        return 'Group activity by userscope';
     }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -16,6 +16,7 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Closure;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
@@ -44,7 +45,7 @@ class ActivityTypeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acttype', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.activityType', 'acttype');
+            $qb->join('activity.activityType', 'acttype');
         }
 
         $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
@@ -71,7 +72,7 @@ class ActivityTypeAggregator implements AggregatorInterface
                 return 'Activity type';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -61,12 +61,12 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getLabels($key, $values, $data): Closure
     {
-        return function ($value) {
+    return function ($value) {
             if ('_header' === $value) {
                 return 'Activity user';
             }
 
-            if (null === $value || '' === $value) {
+            if (null === $value) {
                 return '';
             }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php

@@ -1,86 +0,0 @@
-<?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\ActivityBundle\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ActivityUsersAggregator implements AggregatorInterface
-{
-    private UserRender $userRender;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
-    {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
-
-        $qb
-            ->addSelect('actusers.id AS activity_users_aggregator')
-            ->addGroupBy('activity_users_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add on the form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value) {
-            if ('_header' === $value) {
-                return 'Activity users';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['activity_users_aggregator'];
-    }
-
-    public function getTitle()
-    {
-        return 'Aggregate by activity users';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php

@@ -1,87 +0,0 @@
-<?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\ActivityBundle\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Repository\UserJobRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
-{
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserJobRepositoryInterface $userJobRepository;
-
-    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->userJobRepository = $userJobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
-
-        $qb
-            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
-            ->addGroupBy('activity_users_job_aggregator');
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Users \'s job';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $j = $this->userJobRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $j->getLabel()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['activity_users_job_aggregator'];
-    }
-
-    public function getTitle()
-    {
-        return 'Aggregate by users job';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php

@@ -1,87 +0,0 @@
-<?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\ActivityBundle\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
-{
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
-
-        $qb
-            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
-            ->addGroupBy('activity_users_main_scope_aggregator');
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Users \'s scope';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['activity_users_main_scope_aggregator'];
-    }
-
-    public function getTitle()
-    {
-        return 'Aggregate by users scope';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -25,8 +25,8 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use function array_key_exists;
 use function count;
-use function in_array;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -67,7 +67,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!in_array( 'actreasons', $qb->getAllAliases(), true)) {
             $qb->innerJoin('activity.reasons', 'actreasons');
         }
 
@@ -134,10 +134,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                 return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
             }
 
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
             switch ($data['level']) {
                 case 'reasons':
                     $r = $this->activityReasonRepository->find($value);

src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php

@@ -1,84 +0,0 @@
-<?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\ActivityBundle\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Doctrine\ORM\QueryBuilder;
-use LogicException;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class SentReceivedAggregator implements AggregatorInterface
-{
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data): void
-    {
-        $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
-            ->addGroupBy('activity_sentreceived_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        // No form needed
-    }
-
-    public function getLabels($key, array $values, $data): callable
-    {
-        return function (?string $value): string {
-            if ('_header' === $value) {
-                return 'export.aggregator.activity.by_sent_received.Sent or received';
-            }
-
-            switch ($value) {
-                case null:
-                case '':
-                    return '';
-
-                case 'sent':
-                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is sent');
-
-                case 'received':
-                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['activity_sentreceived_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.aggregator.activity.by_sent_received.Group activity by sentreceived';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export;
 
 /**

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
@@ -58,7 +55,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
@@ -69,9 +66,9 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_avg_activity_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -86,10 +83,6 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
-
         $qb = $this->repository->createQueryBuilder('activity');
 
         $qb
@@ -97,17 +90,6 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
             ->select('AVG(activity.durationTime) as export_avg_activity_duration')
             ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
 
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
-                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            ->setParameter('authorized_centers', $centers);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -59,7 +56,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
@@ -70,9 +67,9 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_activity_visit_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -87,27 +84,13 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
-
         $qb = $this->repository->createQueryBuilder('activity');
 
         $qb
             ->join('activity.accompanyingPeriod', 'acp')
             ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
-
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
-                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            ->setParameter('authorized_centers', $centers);
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'))
+            ;
 
         return $qb;
     }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,8 +17,6 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -69,9 +67,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -86,24 +84,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $qb = $this->repository->createQueryBuilder('activity');
 
-        $qb = $this->repository
-            ->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp');
-
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
-                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            ->setParameter('authorized_centers', $centers);
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
 
         $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php

@@ -1,165 +0,0 @@
-<?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\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Export\ListActivityHelper;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
-use Chill\MainBundle\Export\ListInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ListActivity implements ListInterface, GroupedExportInterface
-{
-    private EntityManagerInterface $entityManager;
-
-    private ListActivityHelper $helper;
-
-    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
-
-    public function __construct(
-        ListActivityHelper $helper,
-        EntityManagerInterface $entityManager,
-        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper
-    ) {
-        $this->helper = $helper;
-        $this->entityManager = $entityManager;
-        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $this->helper->buildForm($builder);
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return $this->helper->getAllowedFormattersTypes();
-    }
-
-    public function getDescription()
-    {
-        return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        switch ($key) {
-            case 'acpId':
-                return static function ($value) {
-                    if ('_header' === $value) {
-                        return ListActivityHelper::MSG_KEY . 'accompanying course id';
-                    }
-
-                    return $value ?? '';
-                };
-
-            case 'scopesNames':
-               return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
-
-            default:
-                return $this->helper->getLabels($key, $values, $data);
-        }
-    }
-
-    public function getQueryKeys($data)
-    {
-        return
-            array_merge(
-                $this->helper->getQueryKeys($data),
-                [
-                    'acpId',
-                    'scopesNames',
-                ]
-            );
-    }
-
-    public function getResult($query, $data)
-    {
-        return $this->helper->getResult($query, $data);
-    }
-
-    public function getTitle()
-    {
-        return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
-    }
-
-    public function getType()
-    {
-        return $this->helper->getType();
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
-
-        $qb = $this->entityManager->createQueryBuilder();
-
-        $qb
-            ->distinct()
-            ->from(Activity::class, 'activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-            ->leftJoin('acp.participations', 'acppart')
-            ->leftJoin('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1
-                    FROM ' . PersonCenterHistory::class . ' acl_count_person_history
-                    WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            // some grouping are necessary
-            ->addGroupBy('acp.id')
-            ->addOrderBy('activity.date')
-            ->addOrderBy('activity.id')
-            ->setParameter('authorized_centers', $centers);
-
-        $this->helper->addSelect($qb);
-
-        // add select for this step
-        $qb
-            ->addSelect('acp.id AS acpId')
-            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
-            ->addGroupBy('scopesNames');
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::LISTS;
-    }
-
-    public function supportsModifiers()
-    {
-        return array_merge(
-            $this->helper->supportsModifiers(),
-            [
-                \Chill\PersonBundle\Export\Declarations::ACP_TYPE,
-            ]
-        );
-    }
-}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
@@ -59,7 +56,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
@@ -70,9 +67,9 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_sum_activity_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -87,28 +84,15 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $qb = $this->repository->createQueryBuilder('activity');
 
-        $qb = $this->repository
-            ->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp');
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
 
         $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
             ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
 
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
-                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            ->setParameter('authorized_centers', $centers);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -59,7 +56,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
@@ -70,9 +67,9 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_sum_activity_visit_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -87,28 +84,15 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $qb = $this->repository->createQueryBuilder('activity');
 
-        $qb = $this->repository
-            ->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp');
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
 
         $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
             ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
 
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
-                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
-            ->setParameter('authorized_centers', $centers);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -65,9 +65,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()
@@ -84,24 +84,16 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        $qb = $this->activityRepository
-            ->createQueryBuilder('activity')
-            ->join('activity.person', 'person')
-            ->join('person.centerHistory', 'centerHistory');
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        if (!in_array('person', $qb->getAllAliases(), true)) {
+            $qb->join('activity.person', 'person');
+        }
 
         $qb->select('COUNT(activity.id) as export_count_activity');
 
         $qb
-            ->where(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('centerHistory.endDate'),
-                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
-                    )
-                )
-            )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+            ->where($qb->expr()->in('person.center', ':centers'))
             ->setParameter('centers', $centers);
 
         return $qb;

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
@@ -124,7 +124,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'attendee';
                     }
 
-                    return $value ? 'X' : '';
+                    return $value ? 1 : 0;
                 };
 
             case 'list_reasons':
@@ -210,20 +210,10 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'actperson')
-            ->join('actperson.centerHistory', 'centerHistory');
-
-        $qb->where(
-            $qb->expr()->andX(
-                $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('centerHistory.endDate'),
-                    $qb->expr()->gt('centerHistory.endDate', 'activity.date')
-                )
-            )
-        )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
-            ->setParameter('centers', $centers);
+            ->join('activity.person', 'person')
+            ->join('actperson.center', 'actcenter')
+            ->andWhere('actcenter IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
             if (in_array($f, $data['fields'], true)) {
@@ -234,17 +224,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'person_firstname':
-                        $qb->addSelect('actperson.firstName AS person_firstname');
+                        $qb->addSelect('person.firstName AS person_firstname');
 
                         break;
 
                     case 'person_lastname':
-                        $qb->addSelect('actperson.lastName AS person_lastname');
+                        $qb->addSelect('person.lastName AS person_lastname');
 
                         break;
 
                     case 'person_id':
-                        $qb->addSelect('actperson.id AS person_id');
+                        $qb->addSelect('person.id AS person_id');
 
                         break;
 
@@ -261,7 +251,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'type_name':
-                        $qb->join('activity.activityType', 'type');
+                        $qb->join('activity.type', 'type');
                         $qb->addSelect('type.name AS type_name');
 
                         break;
@@ -273,11 +263,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                         break;
 
-                    case 'attendee':
-                        $qb->addSelect('IDENTITY(activity.attendee) AS attendee');
-
-                        break;
-
                     default:
                         $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -64,8 +64,6 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         if (self::SUM === $this->action) {
             return 'Sum activities linked to a person duration by various parameters.';
         }
-
-        throw new LogicException('this action is not supported: ' . $this->action);
     }
 
     public function getGroup(): string
@@ -89,9 +87,9 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_stat_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($qb, $data)
     {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()
@@ -99,8 +97,6 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         if (self::SUM === $this->action) {
             return 'Sum activity linked to a person duration';
         }
-
-        throw new LogicException('This action is not supported: ' . $this->action);
     }
 
     public function getType(): string
@@ -123,24 +119,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             $select = 'SUM(activity.durationTime) AS export_stat_activity';
         }
 
-        $qb->select($select)
+        return $qb->select($select)
             ->join('activity.person', 'person')
-            ->join('person.centerHistory', 'centerHistory');
-
-        $qb
-            ->where(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('centerHistory.endDate'),
-                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
-                    )
-                )
-            )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
-            ->setParameter('centers', $centers);
-
-        return $qb;
+            ->join('actperson.center', 'actcenter')
+            ->where($qb->expr()->in('actcenter', ':centers'))
+            ->setParameter(':centers', $centers);
     }
 
     public function requiredRole(): string

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -1,269 +0,0 @@
-<?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\ActivityBundle\Export\Export;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityPresenceRepositoryInterface;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\Helper\DateTimeHelper;
-use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
-use Chill\MainBundle\Export\Helper\UserHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
-use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
-use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\QueryBuilder;
-use LogicException;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use const SORT_NUMERIC;
-
-class ListActivityHelper
-{
-    public const MSG_KEY = 'export.list.activity.';
-
-    private ActivityPresenceRepositoryInterface $activityPresenceRepository;
-
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private LabelPersonHelper $labelPersonHelper;
-
-    private LabelThirdPartyHelper $labelThirdPartyHelper;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatableStringExportLabelHelper $translatableStringLabelHelper;
-
-    private TranslatorInterface $translator;
-
-    private UserHelper $userHelper;
-
-    public function __construct(
-        ActivityPresenceRepositoryInterface $activityPresenceRepository,
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        DateTimeHelper $dateTimeHelper,
-        LabelPersonHelper $labelPersonHelper,
-        LabelThirdPartyHelper $labelThirdPartyHelper,
-        TranslatorInterface $translator,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        UserHelper $userHelper
-    ) {
-        $this->activityPresenceRepository = $activityPresenceRepository;
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->labelPersonHelper = $labelPersonHelper;
-        $this->labelThirdPartyHelper = $labelThirdPartyHelper;
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translatableStringLabelHelper = $translatableStringLabelHelper;
-        $this->userHelper = $userHelper;
-    }
-
-    public function addSelect(QueryBuilder $qb): void
-    {
-        $qb
-            ->addSelect('activity.id AS id')
-            ->addSelect('activity.date')
-            ->addSelect('IDENTITY(activity.activityType) AS typeName')
-            ->leftJoin('activity.reasons', 'reasons')
-            ->addSelect('AGGREGATE(reasons.name) AS listReasons')
-            ->leftJoin('activity.persons', 'actPerson')
-            ->addSelect('AGGREGATE(actPerson.id) AS personsIds')
-            ->addSelect('AGGREGATE(actPerson.id) AS personsNames')
-            ->leftJoin('activity.users', 'users_u')
-            ->addSelect('AGGREGATE(users_u.id) AS usersIds')
-            ->addSelect('AGGREGATE(users_u.id) AS usersNames')
-            ->leftJoin('activity.thirdParties', 'thirdparty')
-            ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
-            ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
-            ->addSelect('IDENTITY(activity.attendee) AS attendeeName')
-            ->addSelect('activity.durationTime')
-            ->addSelect('activity.travelTime')
-            ->addSelect('activity.emergency')
-            ->leftJoin('activity.location', 'location')
-            ->addSelect('location.name AS locationName')
-            ->addSelect('activity.sentReceived')
-            ->addSelect('IDENTITY(activity.createdBy) AS createdBy')
-            ->addSelect('activity.createdAt')
-            ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
-            ->addSelect('activity.updatedAt')
-            ->addGroupBy('activity.id')
-            ->addGroupBy('location.id');
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_LIST];
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        switch ($key) {
-            case 'createdAt':
-            case 'updatedAt':
-                return $this->dateTimeHelper->getLabel($key);
-
-            case 'createdBy':
-            case 'updatedBy':
-                return $this->userHelper->getLabel($key, $values, $key);
-
-            case 'date':
-                return $this->dateTimeHelper->getLabel(self::MSG_KEY . $key);
-
-            case 'attendeeName':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'Attendee';
-                    }
-
-                    if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize($presence->getName());
-                };
-
-            case 'listReasons':
-                return $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons');
-
-            case 'typeName':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'Activity type';
-                    }
-
-                    if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize($type->getName());
-                };
-
-            case 'usersNames':
-                return $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name');
-
-            case 'usersIds':
-            case 'thirdPartiesIds':
-            case 'personsIds':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        switch ($key) {
-                            case 'usersIds':
-                                return self::MSG_KEY . 'users ids';
-
-                            case 'thirdPartiesIds':
-                                return self::MSG_KEY . 'third parties ids';
-
-                            case 'personsIds':
-                                return self::MSG_KEY . 'persons ids';
-
-                            default:
-                                throw new LogicException('key not supported');
-                        }
-                    }
-
-                    $decoded = json_decode($value);
-
-                    return implode(
-                        '|',
-                        array_unique(
-                            array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
-                        )
-                    );
-                };
-
-            case 'personsNames':
-                return $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name');
-
-            case 'thirdPartiesNames':
-                return $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties');
-
-            case 'sentReceived':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return self::MSG_KEY . 'sent received';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translator->trans($value);
-                };
-
-            default:
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return self::MSG_KEY . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translator->trans($value);
-                };
-        }
-    }
-
-    public function getQueryKeys($data)
-    {
-        return [
-            'id',
-            'date',
-            'typeName',
-            'listReasons',
-            'attendeeName',
-            'durationTime',
-            'travelTime',
-            'emergency',
-            'locationName',
-            'sentReceived',
-            'personsIds',
-            'personsNames',
-            'usersIds',
-            'usersNames',
-            'thirdPartiesIds',
-            'thirdPartiesNames',
-            'createdBy',
-            'createdAt',
-            'updatedBy',
-            'updatedAt',
-        ];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function supportsModifiers()
-    {
-        return [
-            Declarations::ACTIVITY,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -17,6 +17,8 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -42,13 +44,14 @@ class ActivityTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->andWhere(
-            $qb->expr()->exists(
-                'SELECT 1 FROM ' . Activity::class . ' act_type_filter_activity
-                WHERE act_type_filter_activity.activityType IN (:act_type_filter_activity_types) AND act_type_filter_activity.accompanyingPeriod = acp'
-            )
-        );
-        $qb->setParameter('act_type_filter_activity_types', $data['accepted_activitytypes']);
+        if (!in_array('activity', $qb->getAllAliases(), true)) {
+            $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
+        }
+
+        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
+
+        $qb->andWhere($clause);
+        $qb->setParameter('selected_activity_types', $data['types']);
     }
 
     public function applyOn()

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -1,22 +1,23 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
@@ -36,17 +37,22 @@ class BySocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $where = $qb->getDQLPart('where');
+
         if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
         }
 
         $clause = $qb->expr()->in('actsocialaction.id', ':socialactions');
 
-        $qb->andWhere($clause)
-            ->setParameter(
-                'socialactions',
-                SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])
-            );
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('socialactions', $data['accepted_socialactions']);
     }
 
     public function applyOn(): string
@@ -56,8 +62,13 @@ class BySocialActionFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_socialactions', PickSocialActionType::class, [
+        $builder->add('accepted_socialactions', EntityType::class, [
+            'class' => SocialAction::class,
+            'choice_label' => function (SocialAction $sa) {
+                return $this->actionRender->renderString($sa, []);
+            },
             'multiple' => true,
+            'expanded' => true,
         ]);
     }
 
@@ -65,14 +76,12 @@ class BySocialActionFilter implements FilterInterface
     {
         $actions = [];
 
-        foreach ($data['accepted_socialactions'] as $action) {
-            $actions[] = $this->actionRender->renderString($action, [
-                'show_and_children' => true,
-            ]);
+        foreach ($data['accepted_socialactions'] as $sa) {
+            $actions[] = $this->actionRender->renderString($sa, []);
         }
 
         return ['Filtered activity by linked socialaction: only %actions%', [
-            '%actions%' => implode(', ', $actions),
+            '%actions%' => implode(', ou ', $actions),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -1,22 +1,23 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Form\Type\PickSocialIssueType;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
@@ -36,17 +37,22 @@ class BySocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $where = $qb->getDQLPart('where');
+
         if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
         $clause = $qb->expr()->in('actsocialissue.id', ':socialissues');
 
-        $qb->andWhere($clause)
-            ->setParameter(
-                'socialissues',
-                SocialIssue::getDescendantsWithThisForIssues($data['accepted_socialissues'])
-            );
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('socialissues', $data['accepted_socialissues']);
     }
 
     public function applyOn(): string
@@ -56,8 +62,13 @@ class BySocialIssueFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_socialissues', PickSocialIssueType::class, [
+        $builder->add('accepted_socialissues', EntityType::class, [
+            'class' => SocialIssue::class,
+            'choice_label' => function (SocialIssue $si) {
+                return $this->issueRender->renderString($si, []);
+            },
             'multiple' => true,
+            'expanded' => true,
         ]);
     }
 
@@ -65,14 +76,12 @@ class BySocialIssueFilter implements FilterInterface
     {
         $issues = [];
 
-        foreach ($data['accepted_socialissues'] as $issue) {
-            $issues[] = $this->issueRender->renderString($issue, [
-                'show_and_children' => true,
-            ]);
+        foreach ($data['accepted_socialissues'] as $si) {
+            $issues[] = $this->issueRender->renderString($si, []);
         }
 
         return ['Filtered activity by linked socialissue: only %issues%', [
-            '%issues%' => implode(', ', $issues),
+            '%issues%' => implode(', ou ', $issues),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php

@@ -1,24 +1,27 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
-class ByCreatorFilter implements FilterInterface
+class ByUserFilter implements FilterInterface
 {
     private UserRender $userRender;
 
@@ -34,11 +37,22 @@ class ByCreatorFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb
-            ->andWhere(
-                $qb->expr()->in('activity.createdBy', ':users')
-            )
-            ->setParameter('users', $data['accepted_users']);
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->join('activity.users', 'actusers');
+        }
+
+        $clause = $qb->expr()->in('actusers.id', ':users');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('users', $data['accepted_users']);
     }
 
     public function applyOn(): string
@@ -48,8 +62,13 @@ class ByCreatorFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
+        $builder->add('accepted_users', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
             'multiple' => true,
+            'expanded' => true,
         ]);
     }
 
@@ -61,13 +80,13 @@ class ByCreatorFilter implements FilterInterface
             $users[] = $this->userRender->renderString($u, []);
         }
 
-        return ['Filtered activity by creator: only %users%', [
-            '%users%' => implode(', ', $users),
+        return ['Filtered activity by linked users: only %users%', [
+            '%users%' => implode(', ou ', $users),
         ]];
     }
 
     public function getTitle(): string
     {
-        return 'Filter activity by creator';
+        return 'Filter activity by linked users';
     }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -74,13 +74,15 @@ class EmergencyFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string'): array
     {
-        return [
-            'Filtered by emergency: only %emergency%', [
-                '%emergency%' => $this->translator->trans(
-                    $data['accepted_emergency'] ? 'is emergency' : 'is not emergency'
-                ),
-            ],
-        ];
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['accepted_emergency']) {
+                $choice = $k;
+            }
+        }
+
+        return ['Filtered activity by emergency: only %emergency%', [
+            '%emergency%' => $this->translator->trans($choice),
+        ]];
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php

@@ -1,57 +0,0 @@
-<?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\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class HasNoActivityFilter implements FilterInterface
-{
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb
-            ->andWhere('
-                NOT EXISTS (
-                    SELECT 1 FROM ' . Activity::class . ' activity
-                    WHERE activity.accompanyingPeriod = acp
-                )
-            ');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        //no form needed
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        return ['Filtered acp which has no activities', []];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter acp which has no activity';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php

@@ -1,74 +0,0 @@
-<?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\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserLocationType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class LocationFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb->andWhere(
-            $qb->expr()->in('activity.location', ':location')
-        );
-
-        $qb->setParameter('location', $data['accepted_location']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_location', PickUserLocationType::class, [
-            'multiple' => true,
-            'label' => 'pick location',
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $locations = [];
-
-        foreach ($data['accepted_location'] as $location) {
-            $locations[] = $location->getName();
-        }
-
-        return ['Filtered activity by location: only %locations%', [
-            '%locations%' => implode(', ', $locations),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by location';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -1,22 +1,23 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickLocationTypeType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
@@ -60,9 +61,13 @@ class LocationTypeFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_locationtype', PickLocationTypeType::class, [
+        $builder->add('accepted_locationtype', EntityType::class, [
+            'class' => LocationType::class,
+            'choice_label' => function (LocationType $type) {
+                return $this->translatableStringHelper->localize($type->getTitle());
+            },
             'multiple' => true,
-            //'label' => false,
+            'expanded' => true,
         ]);
     }
 
@@ -77,7 +82,7 @@ class LocationTypeFilter implements FilterInterface
         }
 
         return ['Filtered activity by locationtype: only %types%', [
-            '%types%' => implode(', ', $types),
+            '%types%' => implode(', ou ', $types),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -1,22 +1,23 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class UserFilter implements FilterInterface
@@ -56,8 +57,13 @@ class UserFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
+        $builder->add('accepted_users', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
             'multiple' => true,
+            'expanded' => true,
             'label' => 'Creators',
         ]);
     }
@@ -71,7 +77,7 @@ class UserFilter implements FilterInterface
         }
 
         return ['Filtered activity by user: only %users%', [
-            '%users%' => implode(', ', $users),
+            '%users%' => implode(', ou ', $users),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
@@ -85,7 +85,7 @@ class UserScopeFilter implements FilterInterface
         }
 
         return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(', ', $scopes),
+            '%scopes%' => implode(', ou ', $scopes),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -1,22 +1,21 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\Export\FilterType;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use DateTime;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,14 +28,9 @@ class ActivityDateFilter implements FilterInterface
 {
     protected TranslatorInterface $translator;
 
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        TranslatorInterface $translator,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
+    public function __construct(TranslatorInterface $translator)
+    {
         $this->translator = $translator;
-        $this->rollingDateConverter = $rollingDateConverter;
     }
 
     public function addRole(): ?string
@@ -60,14 +54,8 @@ class ActivityDateFilter implements FilterInterface
         }
 
         $qb->add('where', $where);
-        $qb->setParameter(
-            'date_from',
-            $this->rollingDateConverter->convert($data['date_from'])
-        );
-        $qb->setParameter(
-            'date_to',
-            $this->rollingDateConverter->convert($data['date_to'])
-        );
+        $qb->setParameter('date_from', $data['date_from']);
+        $qb->setParameter('date_to', $data['date_to']);
     }
 
     public function applyOn(): string
@@ -78,13 +66,13 @@ class ActivityDateFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
+            ->add('date_from', ChillDateType::class, [
                 'label' => 'Activities after this date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'data' => new DateTime(),
             ])
-            ->add('date_to', PickRollingDateType::class, [
+            ->add('date_to', ChillDateType::class, [
                 'label' => 'Activities before this date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
+                'data' => new DateTime(),
             ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
@@ -133,8 +121,8 @@ class ActivityDateFilter implements FilterInterface
         return [
             'Filtered by date of activity: only between %date_from% and %date_to%',
             [
-                '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
-                '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
+                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
             ],
         ];
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityType;
@@ -17,6 +17,8 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -77,8 +79,8 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
             'multiple' => true,
             'expanded' => false,
             'attr' => [
-                'class' => 'select2',
-            ],
+                'class' => 'select2'
+            ]
         ]);
     }
 
@@ -91,7 +93,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         );
 
         return ['Filtered by activity type: only %list%', [
-            '%list%' => implode(', ', $reasonsNames),
+            '%list%' => implode(', ou ', $reasonsNames),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php

@@ -1,77 +0,0 @@
-<?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\ActivityBundle\Export\Filter;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ActivityUsersFilter implements FilterInterface
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $orX = $qb->expr()->orX();
-
-        foreach ($data['accepted_users'] as $key => $user) {
-            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
-            $qb->setParameter('activity_users_filter_u' . $key, $user);
-        }
-
-        $qb->andWhere($orX);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
-            'multiple' => true,
-            'label' => 'Users',
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by users: only %users%', [
-            '%users%' => implode(', ', $users),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by users';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
@@ -19,13 +19,14 @@ use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use function array_key_exists;
 use function count;
-use function in_array;
 
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
@@ -50,7 +51,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
     {
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
-        $clause = $qb->expr()->in('actreasons', ':selected_activity_reasons');
+        $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
 
         if (!in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->join('activity.reasons', 'actreasons');
@@ -77,7 +78,6 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
             'class' => ActivityReason::class,
             'choice_label' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
             'group_by' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
-            'attr' => ['class' => 'select2 '],
             'multiple' => true,
             'expanded' => false,
         ]);

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\Activity;

src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php

@@ -1,81 +0,0 @@
-<?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\ActivityBundle\Export\Filter;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class UsersJobFilter implements FilterInterface
-{
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
-                JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND  activity_users_job_filter_act = activity '
-                )
-            )
-            ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('jobs', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [
-            '%jobs%' => implode(
-                ', ',
-                array_map(
-                    fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
-                    $data['jobs']->toArray()
-                )
-            ),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'export.filter.activity.by_usersjob.Filter by users job';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php

@@ -1,88 +0,0 @@
-<?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\ActivityBundle\Export\Filter;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class UsersScopeFilter implements FilterInterface
-{
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act
-                JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND  activity_users_scope_filter_act = activity '
-                )
-            )
-            ->setParameter('activity_users_scope_filter_scopes', $data['scopes']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('scopes', EntityType::class, [
-            'class' => Scope::class,
-            'choices' => $this->scopeRepository->findAllActive(),
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [
-            '%scopes%' => implode(
-                ', ',
-                array_map(
-                    fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-                    $data['scopes']->toArray()
-                )
-            ),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'export.filter.activity.by_usersscope.Filter by users scope';
-    }
-}

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;

src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php

@@ -1,18 +1,17 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategoryType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -26,13 +25,13 @@ class ActivityReasonType extends AbstractType
         $builder
             ->add('name', TranslatableStringFormType::class)
             ->add('active', CheckboxType::class, ['required' => false])
-            ->add('category', TranslatableActivityReasonCategoryType::class);
+            ->add('category', TranslatableActivityReasonCategory::class);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => ActivityReason::class,
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
         ]);
     }
 

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -1,19 +1,19 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\ActivityBundle\Form\Type\PickActivityReasonType;
+use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
 use Chill\MainBundle\Entity\Center;
@@ -229,10 +229,19 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('reasons')) {
-            $builder->add('reasons', PickActivityReasonType::class, [
+            $builder->add('reasons', EntityType::class, [
                 'label' => $activityType->getLabel('reasons'),
                 'required' => $activityType->isRequired('reasons'),
+                'class' => ActivityReason::class,
                 'multiple' => true,
+                'choice_label' => function (ActivityReason $activityReason) {
+                    return $this->translatableStringHelper->localize($activityReason->getName());
+                },
+                'attr' => ['class' => 'select2 '],
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('a')
+                        ->where('a.active = true');
+                },
             ]);
         }
 

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;

src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php

@@ -1,14 +1,14 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php

@@ -1,20 +1,20 @@
 <?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.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -22,29 +22,31 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 /**
  * FormType to choose amongst activity reasons.
  */
-class PickActivityReasonType extends AbstractType
+class TranslatableActivityReason extends AbstractType
 {
-    private ActivityReasonRepository $activityReasonRepository;
+    /**
+     * @var ActivityReasonRender
+     */
+    protected $reasonRender;
 
-    private ActivityReasonRender $reasonRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
 
     public function __construct(
-        ActivityReasonRepository $activityReasonRepository,
-        ActivityReasonRender $reasonRender,
-        TranslatableStringHelperInterface $translatableStringHelper
+        TranslatableStringHelper $translatableStringHelper,
+        ActivityReasonRender $reasonRender
     ) {
-        $this->activityReasonRepository = $activityReasonRepository;
-        $this->reasonRender = $reasonRender;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->reasonRender = $reasonRender;
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'class' => ActivityReason::class,
+                'class' => 'ChillActivityBundle:ActivityReason',
                 'choice_label' => function (ActivityReason $choice) {
                     return $this->reasonRender->renderString($choice, []);
                 },
@@ -55,7 +57,10 @@ class PickActivityReasonType extends AbstractType
 
                     return null;
                 },
-                'choices' => $this->activityReasonRepository->findAll(),
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('r')
+                        ->where('r.active = true');
+                },
                 'attr' => ['class' => ' select2 '],
             ]
         );

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Form\Type;
+
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Description of TranslatableActivityReasonCategory.
+ */
+class TranslatableActivityReasonCategory extends AbstractType
+{
+    /**
+     * @var RequestStack
+     */
+    private $requestStack;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        $resolver->setDefaults(
+            [
+                'class' => 'ChillActivityBundle:ActivityReasonCategory',
+                'choice_label' => 'name[' . $locale . ']',
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true');
+                },
+            ]
+        );
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'translatable_activity_reason_category';
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+}