fix type for condition in ParticipationController

2025-09-21 14:14:58 +00:00 · 2022-04-27 08:44:49 +02:00
1081 changed files with 53711 additions and 25298 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,10 +18,3 @@ max_line_length = 80

 [COMMIT_EDITMSG]
 max_line_length = 0
-<<<<<<< Updated upstream
-=======
-
-[*.{js, vue, ts}]
-indent_size = 2
-indent_style = space
->>>>>>> Stashed changes
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .composer/*
-composer
 composer.phar
 composer.lock
 docs/build/
@@ -23,4 +22,3 @@ docs/build/

 /.php-cs-fixer.cache
 /.idea/
-/.psalm/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,67 +14,6 @@ and this project adheres to

 ## Test releases

-### 2.0.0-beta2
-
-* [workflow]: Fixed: the notification is sent when the user is added to the first step.
-* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
-* [person] Feature: on Evaluation, allow to configure an URL from the admin
-
-### 2022-06
-
-* [workflow]: added pagination to workflow list page
-* [homepage_widget]: null error on tasks widget fixed
-* [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)
-* [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)
-
-### 2022-05-30
-
-* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
-
-### 2022-05-27
-
-* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
-* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
-* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
-* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
-* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
-* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
-* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
-* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
-* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
-
-
-### 2022-05-06
-
-* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-
-### 2021-04-29
-
-* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
-* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
-* Load relationships without gender in french fixtures
-* Add command to remove old draft accompanying periods
-* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
-
-### 2021-04-28
-
-* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
-* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
-* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
-* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
-* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
-
 ### 2021-04-26

 * [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
@@ -93,13 +32,12 @@ and this project adheres to
 * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
 * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
 * [Notifications] delay the sending of notificaiton to kernel.terminate
-* [Notifications / Period user change] fix the sending of notification when user changes
+* [Notifications / Period user change] fix the sending of notification when user changes 
 * [Activity form] invert 'incoming' and 'receiving' in Activity form
 * [Activity form] keep the same order for 'attendee' field in new and edit form
 * [list with period] use "sameas" test operator to introduce requestor in list
 * [notification email on course designation] allow raw string in email content generation
 * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
-* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)


 ### 2021-04-13
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -2,14 +2,7 @@

 en cours de rédaction

-## Translations

-
-Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
-
-## Emplacement des fichiers
-
-Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
 ## Assets: nommage des entrypoints

 Trois types d'entrypoint:
@@ -153,20 +146,19 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai

 Les routes sont nommées de cette manière:

-`chill_(api|crud)_bundle_(api)_entite_action`
+`chill_bundle_entite_action`

 1. d'abord chill_ (pour tous les modules chill)
-2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
-3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
-4. ensuite, `api`, si la route est une route d'api.
-5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
-6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
+2. ensuite une string qui est identique, par bundle
+3. si le point est un point d'api (json), alors ajouter la string `api`
+4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
+5. ensuite une action (`list`, `view`, `edit`, `new`, ...)

-Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)

 Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.

-### Nommage des URL
+### URL

 Les URL respectent également une convention:

@@ -227,14 +219,6 @@ Les éléments suivants devraient se trouver dans la liste:

 Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.

-#### Pour les URL de l'espace Admin
-
-Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
-
-
-`/{_locale}/admin/bundle/entity/{id}/action`
-
-
 ## Règles UI chill

 ### Titre des pages
--- a/BIN
+++ b/BIN
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
    "require": {
        "php": "^7.4",
        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
-        "champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
-        "champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
+        "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
+        "champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
        "doctrine/doctrine-bundle": "^2.1",
        "doctrine/doctrine-migrations-bundle": "^3.0",
        "doctrine/orm": "^2.7",
@@ -45,7 +45,6 @@
        "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",
@@ -96,8 +95,7 @@
    "autoload-dev": {
        "psr-4": {
            "App\\": "tests/app/src/",
-            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
-            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
+            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
        }
    },
    "config": {
--- a/docs/source/development/exports.rst
+++ b/docs/source/development/exports.rst
@@ -10,17 +10,17 @@
 Exports
 *******

-Export is an important issue within the Chill software : users should be able to :
+Export is an important issue for the Chill software : users should be able to :

 - compute statistics about their activity ;
- list "things" which are a part of their activities.
+- list "things" which make part of their activities.

 The `main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.

 .. contents:: Table of content
   :local:

-.. seealso::
+.. seealso:: 

   `The issue where this framework was discussed <https://git.framasoft.org/Chill-project/Chill-Main/issues/9>`_
      Provides some information about the pursued features and architecture.
@@ -32,37 +32,37 @@ Concepts
 Some vocabulary: 3 "Export elements"
 ------------------------------------

-Four terms are used for this framework :
+Four terms are used for this framework : 

-Exports
-   provide some basic operation on the data. Two kinds of exports are available :
+exports
+   provides some basic operation on the date. Two kind of exports are available : 

   - computed data : it may be "the number of people", "the number of activities", "the duration of activities", ...
-   - list data : it may be "the list of people", "the list of activities", ...
+   - list data : it may be "the list of people", "the list of activity", ...

-Filters
-   The filters create a filter on the data: it removes some information the user doesn't want to introduce in the computation done by the export.
+filters
+   The filters make a filter on the date: it removes some information the user doesn't want to introduce in the computation done by export. In other word, filters make a filter...

-   Example of a filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
+   Example of filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...

-Aggregators
-   The aggregator aggregates the data into some group (some software use the term 'bucket').
+aggregators
+   The aggregator aggregates the data into some group (some software use the term 'bucket'). 

-   Example of an aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
+   Example of aggregator : "group people by gender", "group people by nationality", "group activity by type", ...

-Formatters
-   The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client.
+formatters
+   The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client. 

-   Example of a formatter: "format data as CSV", "format data as an ods spreadsheet", ...
+   Example of formatter: "format data as CSV", "format data as ods spreadsheet", ...

 Anatomy of an export
 ---------------------

-An export can be thought of as a sentence where each part of this sentence refers to one or multiple export elements. Examples :
+An export may be explained as a sentence, where each part of this sentence refers to one or multiple exports element. Examples : 

 **Example 1**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender, and format them in a CSV spreadsheet.

-Here :
+Here : 

 - *count the number of people* is the export part
 - *having at least one activity* is the filter part
@@ -72,10 +72,10 @@ Here :

 Note that :

- Aggregators, filters, exports and formatters are cross-bundle. Here the bundle *activity* provides a filter which is applied on an export provided by the person bundle ;
- Multiple aggregator or filter for one export may exist. Currently, only one export is allowed.
+- aggregators, filters, exports and aggregators are cross-bundle. Here the bundle *activity* provides a filter which apply on an export provided by the person bundle ;
+- there may exists multiple aggregator or filter for one export. Currently, only one export is allowed.

-The result might be :
+The result might be : 

 +-----------------------+----------------+---------------------------+
 | Nationality           | Gender         | Number of people          |
@@ -89,9 +89,9 @@ The result might be :
 | France                | Female         | 150                       |
 +-----------------------+----------------+---------------------------+

-**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in an OpenDocument spreadsheet.
+**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in a OpenDocument spreadsheet.

-Here :
+Here : 

 - *count the average duration of an activity* is the export part
 - *activity with type meeting* is a filter part
@@ -102,7 +102,7 @@ Here :
 The result might be :

 +-----------------------+----------------------+
-| Week                  | Number of activities |
+| Week                  | Number of activities | 
 +=======================+======================+
 | 2015-10               | 10                   |
 +-----------------------+----------------------+
@@ -116,77 +116,77 @@ The result might be :
 Authorization and exports
 -------------------------

-Exports, filters and aggregators should not show data the user is not allowed to see within the application.
+Exports, filters and aggregators should not make see data the user is not allowed to see.

 In other words, developers are required to take care of user authorization for each export.

-There should be a specific role that grants permission to users who are allowed to build exports. For more simplicity, this role should apply on a center, and should not require special circles.
+It should exists a special role that should be granted to users which are allowed to build exports. For more simplicity, this role should apply on center, and should not requires special circles.

-How does the magic work ?
+How does the magic works ?
 ===========================

 To build an export, we rely on the capacity of the database to execute queries with aggregate (i.e. GROUP BY) and filter (i.e. WHERE) instructions.

 An export is an SQL query which is initiated by an export, and modified by aggregators and filters.

-.. note::
+.. note:: 

   **Example**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender

-   1. The report initiates the query
+   1. The report initiate the query 

   .. code-block:: SQL

      SELECT count(people.*) FROM people

-   2. The filter adds a where and join clause :
+   2. The filter add a where and join clause : 

   .. code-block:: SQL

-      SELECT count(people.*) FROM people
-         RIGHT JOIN activity
+      SELECT count(people.*) FROM people 
+         RIGHT JOIN activity 
         WHERE activity.date IS BETWEEN now AND 6 month ago

-   3. The aggregator "nationality" adds a GROUP BY clause and a column in the SELECT statement:
+   3. The aggregator "nationality" add a GROUP BY clause and a column in the SELECT statement: 

   .. code-block:: sql

-      SELECT people.nationality, count(people.*) FROM people
-         RIGHT JOIN activity
-         WHERE activity.date IS BETWEEN now AND 6 month ago
+      SELECT people.nationality, count(people.*) FROM people 
+         RIGHT JOIN activity 
+         WHERE activity.date IS BETWEEN now AND 6 month ago 
         GROUP BY nationality

-   4. The aggregator "gender" does the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :
+   4. The aggregator "gender" do the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement : 

   .. code-block:: sql

-      SELECT people.nationality, people.gender, count(people.*)
-         FROM people RIGHT JOIN activity
-         WHERE activity.date IS BETWEEN now AND 6 month ago
+      SELECT people.nationality, people.gender, count(people.*) 
+         FROM people RIGHT JOIN activity 
+         WHERE activity.date IS BETWEEN now AND 6 month ago 
         GROUP BY nationality, gender

-Each filter, aggregator and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.
+Each filter, aggregator and filter may collect parameters from the user by providing a form. This form is appended to the export form. Here is an example.

 .. figure:: /_static/screenshots/development/export_form-fullpage.png

-   The screenshot shows the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which triggers a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other unchecked filter does not show the subform.
+   The screenshot show the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which allow to show a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other filter, which are unchecked, does not show the subform.

-   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
+   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also open a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.

 The Export Manager
 ------------------

-The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters and formatters.
+The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which register all exports, aggregators, filters and formatters.

-The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` for each export request.
+The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` to each export request.


 The export form step
 --------------------

-The form step allows you to build a form, combining different parts of the module.
+The form step allow to build a form, aggregating different parts of the module.

-The building of forms is split into different subforms, where each one is responsible for rendering their part of the form (aggregators, filters, and export).
+The building of forms is separated between different subform, which are responsible for rendering their part of the form (aggregators, filters, and export). 

 .. figure:: /_static/puml/exports/form_steps.png
   :scale: 40%
@@ -194,12 +194,12 @@ The building of forms is split into different subforms, where each one is respon
 The formatter form step
 -----------------------

-The formatter form is processed *after* the user filled the export form. It is built the same way, but receives the data entered by the user on the previous step as parameters (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
+The formatter form is processed *after* the user filled the export form. It is built the same way, but receive in parameters the data entered by the user on the previous step (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).

 Processing the export
 ---------------------

-The export process can be explained by this schema :
+The export process may be explained by this schema :

 .. figure:: /_static/puml/exports/processing_export.png
   :scale: 40%
@@ -219,20 +219,20 @@ This is an example of the ``CountPerson`` export :
   :language: php
   :linenos:

-* **Line 36**: the ``getType`` function returns a string. This string will be used to find the aggregtors and filters which will apply to this export.
-* **Line 41**: a simple description to help users understand what your export does.
+* **Line 36**: the ``getType`` function return a string. This string will be used to find the aggregtors and filters which will apply to this export.
+* **Line 41**: a simple description to help user to understand what your export does.
 * **Line 46**: The title of the export. A summary of what your export does.
-* **Line 51**: The list of roles required to execute this export.
+* **Line 51**: The list of roles requires to execute this export.
 * **Line 56**: We initiate the query here...
-* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` objects in one array
-* **Line 63**: We create the query with a query builder.
-* **Line 74**: We return the result, but make sure to hydrate the results as an array.
-* **Line 103**: return the list of formatter types which are allowed to be applied on this filter
+* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` object in one array
+* **Line 63**: We create the query, with a query builder.
+* **Line 74**: We simply returns the result, but take care of hydrating the results as an array.
+* **Line 103**: return the list of formatters types which are allowed to apply on this filter

 Filters
 -------

-This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
+This is an example of the *filter by birthdate*. This filter ask some information in a form (`buildForm` is not empty), and this form must be validated. To performs this validations, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:

 .. literalinclude:: /_static/code/exports/BirthdateFilter.php
   :language: php
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -65,17 +65,6 @@ This script will :
 4. build assets


-.. note::
-
-   In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
-
-    .. code-block:: bash
-
-       docker-compose images php
-       docker rmi -f chill_php:prod
-       docker-compose rm php
-
-
 4. Start the project
 ====================

@@ -104,29 +93,6 @@ The password is always ``password``.

 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
 **********

@@ -234,25 +200,6 @@ How to run webpack interactively

 Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.

-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.
-
-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:
-
-.. code-block:: json
-
-   {
-      "require": {
-          "chill-bundles": "dev-<my-branch>@dev"
-   }
-
-2. mount into the php container, and run `composer update`
-
 Build the documentation API
 ===========================

--- a/grumphp.yml
+++ b/grumphp.yml
@@ -24,7 +24,6 @@ parameters:
        - "/spec/"
        - "/var/"
        - "/vendor/"
-        - "/tests/app"

    # Psalm
    tasks.psalm.blocking: true
--- a/phpstan-critical.neon
+++ b/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\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
+            count: 3
+            path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
        -
            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
            count: 1
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -25,6 +25,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php

+		-
+			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,7 +3,6 @@ parameters:
    paths:
        - src/
    excludePaths:
-        - .php_cs*
        - docs/
        - src/Bundle/*/Tests/*
        - src/Bundle/*/tests/*
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -40,9 +40,6 @@
        <testsuite name="DocGeneratorBundle">
            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
        </testsuite>
-        <testsuite name="WopiBundle">
-            <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
-        </testsuite>
    </testsuites>

    <listeners>
--- a/psalm.xml
+++ b/psalm.xml
@@ -6,7 +6,6 @@
    xmlns="https://getpsalm.org/schema/config"
    xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
    errorBaseline="psalm-baseline.xml"
-    cacheDirectory="./.psalm"
 >
    <projectFiles>
        <directory name="src" />
@@ -14,15 +13,4 @@
            <directory name="./tests/" />
        </ignoreFiles>
    </projectFiles>
-
-    <!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
-    <!-- maybe to desactivate with php 8.1 ? -->
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
-            </errorLevel>
-        </UndefinedDocblockClass>
-    </issueHandlers>
-
 </psalm>
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -21,7 +21,6 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -57,8 +56,6 @@ final class ActivityController extends AbstractController

    private ActivityTypeRepository $activityTypeRepository;

-    private CenterResolverManagerInterface $centerResolver;
-
    private EntityManagerInterface $entityManager;

    private EventDispatcherInterface $eventDispatcher;
@@ -85,8 +82,7 @@ final class ActivityController extends AbstractController
        EntityManagerInterface $entityManager,
        EventDispatcherInterface $eventDispatcher,
        LoggerInterface $logger,
-        SerializerInterface $serializer,
-        CenterResolverManagerInterface $centerResolver
+        SerializerInterface $serializer
    ) {
        $this->activityACLAwareRepository = $activityACLAwareRepository;
        $this->activityTypeRepository = $activityTypeRepository;
@@ -100,7 +96,6 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher = $eventDispatcher;
        $this->logger = $logger;
        $this->serializer = $serializer;
-        $this->centerResolver = $centerResolver;
    }

    /**
@@ -203,7 +198,7 @@ final class ActivityController extends AbstractController
        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
+            'center' => $entity->getCenter(),
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
@@ -421,7 +416,7 @@ final class ActivityController extends AbstractController
        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
+            'center' => $entity->getCenter(),
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();

        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
            'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();

        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
            'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -61,6 +61,8 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                ActivityVoter::FULL => [
+                    ActivityVoter::CREATE_PERSON,
+                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                    ActivityVoter::DELETE,
                    ActivityVoter::UPDATE,
                ],
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -15,9 +15,8 @@ use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Chill\MainBundle\Entity\HasCentersInterface;
-use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -36,7 +35,6 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
-use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Class Activity.
@@ -55,7 +53,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 *     getUserFunction="getUser",
 * path="scope")
 */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
 {
    public const SENTRECEIVED_RECEIVED = 'received';

@@ -95,7 +93,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     * @Assert\Valid(traverse=true)
     */
    private Collection $documents;

@@ -135,11 +132,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     */
    private ?Collection $persons = null;

-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
    /**
     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
     * @Groups({"docgen:read"})
@@ -199,7 +191,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        $this->reasons = new ArrayCollection();
        $this->comment = new CommentEmbeddable();
-        $this->privateComment = new PrivateCommentEmbeddable();
        $this->persons = new ArrayCollection();
        $this->thirdParties = new ArrayCollection();
        $this->documents = new ArrayCollection();
@@ -306,17 +297,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    public function getCenters(): iterable
+    public function getCenter(): ?Center
    {
        if ($this->person instanceof Person) {
-            return [$this->person->getCenter()];
+            return $this->person->getCenter();
        }

-        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            return $this->getAccompanyingPeriod()->getCenters() ?? [];
-        }
-
-        return [];
+        return null;
    }

    public function getComment(): CommentEmbeddable
@@ -411,11 +398,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return [];
    }

-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
    public function getReasons(): Collection
    {
        return $this->reasons;
@@ -426,19 +408,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }

-    public function getScopes(): iterable
-    {
-        if (null !== $this->getAccompanyingPeriod()) {
-            return $this->getAccompanyingPeriod()->getScopes();
-        }
-
-        if (null !== $this->getPerson()) {
-            return [$this->scope];
-        }
-
-        return [];
-    }
-
    public function getSentReceived(): string
    {
        return $this->sentReceived;
@@ -615,13 +584,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this;
    }

-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
    public function setReasons(?ArrayCollection $reasons): self
    {
        $this->reasons = $reasons;
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -167,16 +167,6 @@ class ActivityType
     */
    private int $personVisible = self::FIELD_REQUIRED;

-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
-    private string $privateCommentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
-    private int $privateCommentVisible = self::FIELD_OPTIONAL;
-
    /**
     * @ORM\Column(type="string", nullable=false, options={"default": ""})
     */
@@ -426,16 +416,6 @@ class ActivityType
        return $this->personVisible;
    }

-    public function getPrivateCommentLabel(): string
-    {
-        return $this->privateCommentLabel;
-    }
-
-    public function getPrivateCommentVisible(): int
-    {
-        return $this->privateCommentVisible;
-    }
-
    public function getReasonsLabel(): string
    {
        return $this->reasonsLabel;
@@ -708,20 +688,6 @@ class ActivityType
        return $this;
    }

-    public function setPrivateCommentLabel(string $privateCommentLabel): self
-    {
-        $this->privateCommentLabel = $privateCommentLabel;
-
-        return $this;
-    }
-
-    public function setPrivateCommentVisible(int $privateCommentVisible): self
-    {
-        $this->privateCommentVisible = $privateCommentVisible;
-
-        return $this;
-    }
-
    public function setReasonsLabel(string $reasonsLabel): self
    {
        $this->reasonsLabel = $reasonsLabel;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class BySocialActionAggregator implements AggregatorInterface
-{
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $actionRepository;
-
-    public function __construct(
-        SocialActionRender $actionRender,
-        SocialActionRepository $actionRepository
-    ) {
-        $this->actionRender = $actionRender;
-        $this->actionRepository = $actionRepository;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function($value) {
-            if ('_header' === $value) {
-                return 'Social action';
-            }
-
-            $sa = $this->actionRepository->find($value);
-
-            return $this->actionRender->renderString($sa, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['socialaction_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked socialaction';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if(!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $qb->addSelect('socialaction.id AS socialaction_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialaction_aggregator');
-        } else {
-            $qb->groupBy('socialaction_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class BySocialIssueAggregator implements AggregatorInterface
-{
-    private SocialIssueRepository $issueRepository;
-
-    private SocialIssueRender $issueRender;
-
-    public function __construct(
-        SocialIssueRepository $issueRepository,
-        SocialIssueRender $issueRender
-    ) {
-        $this->issueRepository = $issueRepository;
-        $this->issueRender = $issueRender;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-
-            if ($value === '_header') {
-                return 'Social issues';
-            }
-
-            $i = $this->issueRepository->find($value);
-
-            return $this->issueRender->renderString($i, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['socialissue_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked socialissue';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
-        }
-
-        $qb->addSelect('socialissue.id AS socialissue_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialissue_aggregator');
-        } else {
-            $qb->groupBy('socialissue_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByThirdpartyAggregator implements AggregatorInterface
-{
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private ThirdPartyRender $thirdPartyRender;
-
-    public function __construct(
-        ThirdPartyRepository $thirdPartyRepository,
-        ThirdPartyRender $thirdPartyRender
-    ) {
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->thirdPartyRender = $thirdPartyRender;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Accepted thirdparty';
-            }
-
-            $tp = $this->thirdPartyRepository->find($value);
-
-            return $this->thirdPartyRender->renderString($tp, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['thirdparty_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked thirdparties';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('thirdparty', $qb->getAllAliases())) {
-            $qb->join('activity.thirdParties', 'thirdparty');
-        }
-
-        $qb->addSelect('thirdparty.id AS thirdparty_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('thirdparty_aggregator');
-        } else {
-            $qb->groupBy('thirdparty_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByUserAggregator implements AggregatorInterface
-{
-    private UserRepository $userRepository;
-
-    private UserRender $userRender;
-
-    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Accepted users';
-            }
-
-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['users_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked users';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
-        }
-
-        $qb->addSelect('user.id AS users_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('users_aggregator');
-        } else {
-            $qb->groupBy('users_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@@ -1,129 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class DateAggregator implements AggregatorInterface
-{
-    private const CHOICES = [
-        'by month' => 'month',
-        'by week' => 'week',
-        'by year' => 'year',
-    ];
-
-    private CONST DEFAULT_CHOICE = 'year';
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value) use ($data): string {
-            if ($value === '_header') {
-                return 'by '. $data['frequency'];
-            }
-            switch ($data['frequency']) {
-                case 'month':
-                    $month = \DateTime::createFromFormat('!m', $value);
-                    return sprintf(
-                        "%02d (%s)",
-                        $value,
-                        $month->format('M')
-                    );
-
-                case 'week':
-                    //return $this->translator->trans('for week') .' '. $value ;
-
-                case 'year':
-                    //return $this->translator->trans('in year') .' '. $value ;
-
-                default:
-                    return $value;
-            }
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['date_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by date';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $order = null;
-
-        switch ($data['frequency']) {
-            case 'month':
-                $fmt = 'MM'; break;
-
-            case 'week':
-                $fmt = 'IW'; break;
-
-            case 'year':
-                $fmt = 'YYYY'; $order = 'DESC'; break;
-
-            default:
-                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
-
-        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('date_aggregator');
-        } else {
-            $qb->groupBy('date_aggregator');
-        }
-
-        $orderBy = $qb->getDQLPart('orderBy');
-
-        if (!empty($orderBy)) {
-            $qb->addOrderBy('date_aggregator', $order);
-        } else {
-            $qb->orderBy('date_aggregator', $order);
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\LocationTypeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class LocationTypeAggregator implements AggregatorInterface
-{
-    private LocationTypeRepository $locationTypeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        LocationTypeRepository $locationTypeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->locationTypeRepository = $locationTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Accepted locationtype';
-            }
-
-            $lt = $this->locationTypeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $lt->getTitle()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['locationtype_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by locationtype';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $qb->addSelect('IDENTITY(location.locationType) AS locationtype_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('locationtype_aggregator');
-        } else {
-            $qb->groupBy('locationtype_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class UserScopeAggregator implements AggregatorInterface
-{
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Scope';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['userscope_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by userscope';
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $qb->addSelect('IDENTITY(user.mainScope) AS userscope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('userscope_aggregator');
-        } else {
-            $qb->groupBy('userscope_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -9,9 +9,8 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;

-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
@@ -105,9 +104,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        }
    }

-    public function applyOn(): string
+    public function applyOn()
    {
-        return Declarations::ACTIVITY_PERSON;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Export\Aggregator;

-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -45,24 +44,16 @@ class ActivityTypeAggregator implements AggregatorInterface

    public function alterQuery(QueryBuilder $qb, $data)
    {
-        if (!in_array('type', $qb->getAllAliases())) {
-            $qb->join('activity.activityType', 'type');
-        }
+        // add select element
+        $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));

-        $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
-
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy(self::KEY);
-        } else {
-            $qb->groupBy(self::KEY);
-        }
+        // add the "group by" part
+        $qb->addGroupBy(self::KEY);
    }

-    public function applyOn(): string
+    public function applyOn()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -11,11 +11,9 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Export\Aggregator;

-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\Entity\UserRender;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -27,14 +25,10 @@ class ActivityUserAggregator implements AggregatorInterface

    private UserRepository $userRepository;

-    private UserRender $userRender;
-
    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
+        UserRepository $userRepository
    ) {
        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
    }

    public function addRole()
@@ -53,7 +47,7 @@ class ActivityUserAggregator implements AggregatorInterface

    public function applyOn(): string
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
@@ -68,12 +62,10 @@ class ActivityUserAggregator implements AggregatorInterface

        return function ($value) {
            if ('_header' === $value) {
-                return 'Activity user';
+                return 'activity user';
            }

-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
+            return $this->userRepository->find($value)->getUsername();
        };
    }

--- a/src/Bundle/ChillActivityBundle/Export/Declarations.php
+++ b/src/Bundle/ChillActivityBundle/Export/Declarations.php
@@ -1,24 +0,0 @@
-<?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\Export;
-
-/**
- * This class declare constants used for the export framework.
- */
-abstract class Declarations
-{
-    public const ACTIVITY = 'activity';
-
-    public const ACTIVITY_ACP = "activity_linked_to_acp";
-
-    public const ACTIVITY_PERSON = "activity_linked_to_person";
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -9,21 +9,18 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;

 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;

-class CountActivity implements ExportInterface, GroupedExportInterface
+class CountActivity implements ExportInterface
 {
    protected ActivityRepository $activityRepository;

@@ -44,7 +41,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface

    public function getDescription()
    {
-        return 'Count activities linked to a person by various parameters.';
+        return 'Count activities by various parameters.';
    }

    public function getLabels($key, array $values, $data)
@@ -53,7 +50,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
            throw new LogicException("the key {$key} is not used by this export");
        }

-        return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
+        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
    }

    public function getQueryKeys($data)
@@ -68,28 +65,27 @@ class CountActivity implements ExportInterface, GroupedExportInterface

    public function getTitle()
    {
-        return 'Count activities linked to a person';
+        return 'Count activities';
    }

-    public function getType(): string
+    public function getType()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);

-        $qb = $this->activityRepository->createQueryBuilder('activity')
-            ->join('activity.person', 'person')
-        ;
-
-        $qb->select('COUNT(activity.id) as export_count_activity');
+        $qb = $this
+            ->activityRepository
+            ->createQueryBuilder('activity')
+            ->select('COUNT(activity.id) as export_count_activity')
+            ->join('activity.person', 'person');

        $qb
            ->where($qb->expr()->in('person.center', ':centers'))
-            ->setParameter('centers', $centers)
-        ;
+            ->setParameter('centers', $centers);

        return $qb;
    }
@@ -101,15 +97,6 @@ class CountActivity implements ExportInterface, GroupedExportInterface

    public function supportsModifiers()
    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
+        return ['person', 'activity'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -1,103 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-class AvgActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period duration';
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Average activities linked to an accompanying period duration by various parameters.';
-    }
-
-    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");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_avg_activity_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
-
-        $qb->select('AVG(activity.durationTime) as export_avg_activity_duration');
-
-        return $qb;
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -1,103 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period visit duration';
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Average activities linked to an accompanying period visit duration by various parameters.';
-    }
-
-    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");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_avg_activity_visit_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
-
-        $qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');
-
-        return $qb;
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -1,110 +0,0 @@
-<?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\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-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;
-use Symfony\Component\Security\Core\Role\Role;
-
-class CountActivity implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-         EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Count activities linked to an accompanying period by various parameters.';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_count_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Count activities linked to an accompanying period';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
-
-        $qb->select('COUNT(activity.id) as export_count_activity');
-        
-        return $qb;
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -1,103 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-class SumActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period duration';
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Sum activities linked to an accompanying period duration by various parameters.';
-    }
-
-    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");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_activity_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
-
-        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration');
-
-        return $qb;
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -1,102 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
-
-class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period visit duration';
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Sum activities linked to an accompanying period visit duration by various parameters.';
-    }
-
-    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");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_activity_visit_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
-
-        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');
-
-        return $qb;
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -9,13 +9,12 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;

 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use DateTime;
@@ -28,14 +27,12 @@ use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;

 use function array_key_exists;
 use function count;
 use function in_array;

-class ListActivity implements ListInterface, GroupedExportInterface
+class ListActivity implements ListInterface
 {
    protected EntityManagerInterface $entityManager;

@@ -97,7 +94,7 @@ class ListActivity implements ListInterface, GroupedExportInterface

    public function getDescription()
    {
-        return 'List activities linked to a person description';
+        return 'List activities';
    }

    public function getLabels($key, array $values, $data)
@@ -183,12 +180,12 @@ class ListActivity implements ListInterface, GroupedExportInterface

    public function getTitle()
    {
-        return 'List activity linked to a person';
+        return 'List activities';
    }

-    public function getType(): string
+    public function getType()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@@ -277,15 +274,6 @@ class ListActivity implements ListInterface, GroupedExportInterface

    public function supportsModifiers()
    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
+        return ['activity', 'person'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -9,16 +9,12 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;

 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Chill\ActivityBundle\Export\Declarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,7 +25,7 @@ use Symfony\Component\Security\Core\Role\Role;
 *
 * The desired stat must be given in constructor.
 */
-class StatActivityDuration implements ExportInterface, GroupedExportInterface
+class StatActivityDuration implements ExportInterface
 {
    public const SUM = 'sum';

@@ -63,7 +59,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
    public function getDescription()
    {
        if (self::SUM === $this->action) {
-            return 'Sum activities linked to a person duration by various parameters.';
+            return 'Sum activities duration by various parameters.';
        }
    }

@@ -73,7 +69,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
            throw new LogicException(sprintf('The key %s is not used by this export', $key));
        }

-        $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
+        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;

        return static fn (string $value) => '_header' === $value ? $header : $value;
    }
@@ -91,19 +87,19 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
    public function getTitle()
    {
        if (self::SUM === $this->action) {
-            return 'Sum activity linked to a person duration';
+            return 'Sum activity duration';
        }
    }

-    public function getType(): string
+    public function getType()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(
-            static fn (array $el): Center => $el['center'],
+            static fn (array $el): string => $el['center'],
            $acl
        );

@@ -129,15 +125,6 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface

    public function supportsModifiers()
    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
+        return ['person', 'activity'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -1,85 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-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;
-
-class BySocialActionFilter implements FilterInterface
-{
-    private SocialActionRender $actionRender;
-
-    public function __construct(SocialActionRender $actionRender)
-    {
-        $this->actionRender = $actionRender;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialactions', EntityType::class, [
-            'class' => SocialAction::class,
-            'choice_label' => function (SocialAction $sa) {
-                return $this->actionRender->renderString($sa, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialaction';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $actions = [];
-
-        foreach ($data['accepted_socialactions'] as $sa) {
-            $actions[] = $this->actionRender->renderString($sa, []);
-        }
-
-        return ['Filtered activity by linked socialaction: only %actions%', [
-            '%actions%' => implode(", ou ", $actions)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $clause = $qb->expr()->in('socialaction.id', ':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
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -1,85 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-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;
-
-class BySocialIssueFilter implements FilterInterface
-{
-    private SocialIssueRender $issueRender;
-
-    public function __construct(SocialIssueRender $issueRender)
-    {
-        $this->issueRender = $issueRender;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialissues', EntityType::class, [
-            'class' => SocialIssue::class,
-            'choice_label' => function(SocialIssue $si) {
-                return $this->issueRender->renderString($si, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialissue';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $issues = [];
-
-        foreach ($data['accepted_socialissues'] as $si) {
-            $issues[] = $this->issueRender->renderString($si, []);
-        }
-
-        return ['Filtered activity by linked socialissue: only %issues%', [
-            '%issues%' => implode(", ou ", $issues)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
-        }
-
-        $clause = $qb->expr()->in('socialissue.id', ':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
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-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 ByUserFilter implements FilterInterface
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked users';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by linked users: only %users%', [
-            '%users%' => implode(", ou ", $users)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
-        }
-
-        $clause = $qb->expr()->in('user.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
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class EmergencyFilter implements FilterInterface
-{
-    private const CHOICES = [
-        'activity is emergency' => true,
-        'activity is not emergency' => false,
-    ];
-
-    private CONST DEFAULT_CHOICE = false;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_emergency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by emergency';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        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 addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->eq('activity.emergency', ':emergency');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('emergency', $data['accepted_emergency']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
@@ -1,85 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Entity\LocationType;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-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;
-
-class LocationTypeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_locationtype', EntityType::class, [
-            'class' => LocationType::class,
-            'choice_label' => function(LocationType $type) {
-                return $this->translatableStringHelper->localize($type->getTitle());
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by locationtype';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $types = [];
-
-        foreach ($data['accepted_locationtype'] as $type) {
-            $types[] = $this->translatableStringHelper->localize(
-                $type->getTitle()
-            );
-        }
-
-        return ['Filtered activity by locationtype: only %types%', [
-            '%types%' => implode(", ou ", $types)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('location.locationType', ':locationtype');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('locationtype', $data['accepted_locationtype']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class SentReceivedFilter implements FilterInterface
-{
-    private const CHOICES = [
-        'is sent' => Activity::SENTRECEIVED_SENT,
-        'is received' => Activity::SENTRECEIVED_RECEIVED,
-    ];
-
-    private CONST DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_sentreceived', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by sentreceived';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
-
-        return ['Filtered activity by sentreceived: only %sentreceived%', [
-            '%sentreceived%' => $this->translator->trans($sentreceived)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->eq('activity.sentReceived', ':sentreceived');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-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
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $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'
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by user';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by user: only %users%', [
-            '%users%' => implode(", ou ", $users)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('activity.user', ':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
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
@@ -1,89 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
-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;
-
-class UserScopeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_userscope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by userscope';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $scopes = [];
-
-        foreach ($data['accepted_userscope'] as $s) {
-            $scopes[] = $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        }
-
-        return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(", ou ", $scopes)
-        ]];
-    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('user.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -11,13 +11,12 @@ 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 DateTime;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -58,23 +57,36 @@ class ActivityDateFilter implements FilterInterface
        $qb->setParameter('date_to', $data['date_to']);
    }

-    public function applyOn(): string
+    public function applyOn()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
    {
-        $builder
-            ->add('date_from', ChillDateType::class, [
+        $builder->add(
+            'date_from',
+            DateType::class,
+            [
                'label' => 'Activities after this date',
                'data' => new DateTime(),
-            ])
-            ->add('date_to', ChillDateType::class, [
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );
+
+        $builder->add(
+            'date_to',
+            DateType::class,
+            [
                'label' => 'Activities before this date',
                'data' => new DateTime(),
-            ])
-        ;
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );

        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
            /** @var \Symfony\Component\Form\FormInterface $filterForm */
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -9,10 +9,9 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
+namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -80,9 +79,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        $qb->setParameter('selected_activity_reasons', $data['reasons']);
    }

-    public function applyOn(): string
+    public function applyOn()
    {
-        return Declarations::ACTIVITY_PERSON;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -50,7 +49,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
+        $clause = $qb->expr()->in('activity.type', ':selected_activity_types');

        if ($where instanceof Expr\Andx) {
            $where->add($clause);
@@ -62,33 +61,39 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
        $qb->setParameter('selected_activity_types', $data['types']);
    }

-    public function applyOn(): string
+    public function applyOn()
    {
-        return Declarations::ACTIVITY;
+        return 'activity';
    }

    public function buildForm(FormBuilderInterface $builder)
    {
-        $builder->add('types', EntityType::class, [
-            'class' => ActivityType::class,
-            'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
-            'group_by' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getCategory()->getName()),
-            'multiple' => true,
-            'expanded' => false,
-        ]);
+        $builder->add(
+            'types',
+            EntityType::class,
+            [
+                'class' => ActivityType::class,
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+                'multiple' => true,
+                'expanded' => false,
+            ]
+        );
    }

    public function describeAction($data, $format = 'string')
    {
        // collect all the reasons'name used in this filter in one array
        $reasonsNames = array_map(
-            fn (ActivityType $t): string => $this->translatableStringHelper->localize($t->getName()),
+            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
        );

-        return ['Filtered by activity type: only %list%', [
-            '%list%' => implode(', ou ', $reasonsNames),
-        ]];
+        return [
+            'Filtered by activity type: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
    }

    public function getTitle()
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
+namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
@@ -102,7 +102,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
        $qb->setParameter('person_having_activity_reasons', $data['reasons']);
    }

-    public function applyOn(): string
+    public function applyOn()
    {
        return Declarations::PERSON_IMPLIED_IN;
    }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -14,20 +14,16 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -53,7 +49,6 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

-use Symfony\Component\Security\Core\Role\Role;
 use function in_array;

 class ActivityType extends AbstractType
@@ -113,18 +108,19 @@ class ActivityType extends AbstractType
        $activityType = $options['activityType'];

        // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
+        if ($options['center']) {
            $builder->add('scope', ScopePickerType::class, [
                'center' => $options['center'],
-                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
-                'required' => true,
+                'role' => $options['role'],
+                // TODO make required again once scope and rights are fixed
+                'required' => false,
            ]);
        }

        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
        $accompanyingPeriod = null;

-        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
+        if ($options['accompanyingPeriod']) {
            $accompanyingPeriod = $options['accompanyingPeriod'];
        }

@@ -221,10 +217,12 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
-            $builder->add('user', PickUserDynamicType::class, [
+        if ($activityType->isVisible('user') && $options['center']) {
+            $builder->add('user', UserPickerType::class, [
                'label' => $activityType->getLabel('user'),
                'required' => $activityType->isRequired('user'),
+                'center' => $options['center'],
+                'role' => $options['role'],
            ]);
        }

@@ -253,13 +251,6 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('privateComment')) {
-            $builder->add('privateComment', PrivateCommentType::class, [
-                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
-                'required' => false,
-            ]);
-        }
-
        if ($activityType->isVisible('persons')) {
            $builder->add('persons', HiddenType::class);
            $builder->get('persons')
@@ -322,7 +313,6 @@ class ActivityType extends AbstractType
                'button_add_label' => 'activity.Insert a document',
                'button_remove_label' => 'activity.Remove a document',
                'empty_collection_explain' => 'No documents',
-                'entry_options' => ['has_title' => true],
            ]);
        }

@@ -443,8 +433,8 @@ class ActivityType extends AbstractType

        $resolver
            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', Center::class])
-            ->setAllowedTypes('role', [Role::class, 'string'])
+            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
+            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
        $fields = [
            'persons', 'user', 'date', 'location', 'persons',
            'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'sentReceived', 'documents',
            'emergency', 'socialIssues', 'socialActions', 'users',
        ];

@@ -69,9 +69,6 @@ class ActivityTypeType extends AbstractType
                    'empty_data' => '',
                ]);
        }
-
-        $builder
-            ->add('commentVisible', ActivityFieldPresence::class);
    }

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;

+use function in_array;
+
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
    private Security $security;
@@ -30,38 +32,27 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
            return;
        }

-        $menu->addChild('Activities', [
-            'route' => 'chill_activity_admin_index',
-        ])
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras([
-                'order' => 5000,
-                'icons' => ['exchange'],
-            ]);
-
-        $menu->addChild('Activity Reasons', [
-            'route' => 'chill_activity_activityreason',
-        ])->setExtras(['order' => 5010]);
-
-        $menu->addChild('Activity Reasons Category', [
-            'route' => 'chill_activity_activityreasoncategory',
-        ])->setExtras(['order' => 5020]);
-
-        $menu->addChild('Activity type', [
-            'route' => 'chill_activity_type_admin',
-        ])->setExtras(['order' => 5030]);
-
-        $menu->addChild('Activity Presences', [
-            'route' => 'chill_crud_activity_presence_index',
-        ])->setExtras(['order' => 5040]);
-
-        $menu->addChild('Activity Types Categories', [
-            'route' => 'chill_activity_type_category_admin',
-        ])->setExtras(['order' => 5050]);
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+            $menu->addChild('Activities', [
+                'route' => 'chill_admin_activity_index',
+            ])
+                ->setExtras([
+                    'order' => 2000,
+                    'explain' => 'Activity configuration',
+                ]);
+        } else {
+            $menu
+                ->addChild('Activities', [
+                    'route' => 'chill_admin_activity_index',
+                ])
+                ->setExtras([
+                    'order' => '60',
+                ]);
+        }
    }

    public static function getMenuIds(): array
    {
-        return ['admin_section', 'admin_activity'];
+        return ['admin_index', 'admin_section', 'admin_activity'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -0,0 +1,56 @@
+<?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);
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class AppKernel extends Kernel
+{
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/logs';
+    }
+
+    public function registerBundles()
+    {
+        return [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Chill\PersonBundle\ChillPersonBundle(),
+            new Chill\MainBundle\ChillMainBundle(),
+            new Chill\ActivityBundle\ChillActivityBundle(),
+            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            //add here all the required bundle (some bundle are not required)
+        ];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -0,0 +1,20 @@
+<?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);
+
+use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+/** @var ClassLoader $loader */
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
@@ -0,0 +1,438 @@
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "assets._default_package" (parent: assets.path_package).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.chain_provider" (parent: security.user.provider.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory" (parent: security.user.provider.in_memory).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory_admin" (parent: security.user.provider.in_memory.user).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.users" (parent: doctrine.orm.security.user.provider).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.dev" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.context_listener.0" (parent: security.context_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout_listener.default" (parent: security.logout_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout.success_handler.default" (parent: security.logout.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.dao.default" (parent: security.authentication.provider.dao).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.success_handler.default.form_login" (parent: security.authentication.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.failure_handler.default.form_login" (parent: security.authentication.failure_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form" (parent: security.authentication.listener.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form.default" (parent: security.authentication.listener.form).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.form_entry_point.default" (parent: security.authentication.form_entry_point).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.anonymous.default" (parent: security.authentication.listener.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.anonymous.default" (parent: security.authentication.provider.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.exception_listener.default" (parent: security.exception_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.default" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.eventdispatcher" (parent: swiftmailer.transport.eventdispatcher.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.authhandler" (parent: swiftmailer.transport.authhandler.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.buffer" (parent: swiftmailer.transport.buffer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.smtp" (parent: swiftmailer.transport.smtp.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default" (parent: swiftmailer.mailer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.plugin.messagelogger" (parent: swiftmailer.plugin.messagelogger.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.configuration" (parent: doctrine.dbal.connection.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.profiling.default" (parent: doctrine.dbal.logger.profiling).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.chain.default" (parent: doctrine.dbal.logger.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.event_manager" (parent: doctrine.dbal.connection.event_manager).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection" (parent: doctrine.dbal.connection).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_configuration" (parent: doctrine.orm.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_metadata_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_result_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_query_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_manager_configurator" (parent: doctrine.orm.manager_configurator.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_entity_manager" (parent: doctrine.orm.entity_manager.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.request" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.translation" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.security" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.templating" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.profiler" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.router" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.php" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.event" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.assetic" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.doctrine" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "validator.mapping.class_metadata_factory"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "assetic.value_supplier"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.dbal.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.metadata.annotation_reader"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.default_entity_manager.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "sensio_framework_extra.security.expression_language"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.logging.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.data_collector.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.path_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.url_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.static_version_strategy"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.firewall.context"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory.user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.handler.cookie_clearing"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.form_entry_point"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.simple_success_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_preauth"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.x509"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.remote_user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.basic"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.digest"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.dao"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.simple"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.pre_authenticated"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.exception_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.switchuser_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.persistent"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.simplehash"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "monolog.logger_prototype"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.mailer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.sendmail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.mail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.null.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.buffer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.authhandler.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.eventdispatcher.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.redirecting.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.antiflood.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.impersonate.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.messagelogger.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.smtp.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.spool.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.file.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.memory.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assetic.worker.ensure_filter"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.apc"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.array"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.file_system"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.php_file"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcached"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.redis"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.wincache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.xcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.zenddata"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.mongodb"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.riak"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.couchbase"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.profiling"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.event_manager"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.entity_manager.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.manager_configurator.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.security.user.provider"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session" previously pointing to "session.storage.mock_file" to "session.storage.filesystem".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.native" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.php_bridge" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "assetic.twig_directory_resource.kernel" previously pointing to "templating.loader.filesystem" to "templating.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.text" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.choice" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.title" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "translator_listener" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "validator.builder" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "data_collector.translation" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.trans" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.custom_fields_group_type" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "templating.helper.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router.cache_warmer" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.logout_url_generator" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.routing" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.profiler" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.controller.listener" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.routing.loader.annot_class" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.user_password_encoder.generic" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.validator.user_password" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.authentication.provider.dao.default" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig" previously pointing to "twig.loader.filesystem" to "twig.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.email_sender.listener" previously pointing to "monolog.logger" to "logger".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.mailer.default" previously pointing to "swiftmailer.mailer.default.transport.smtp" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.cache_warmer.template_paths" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.asset_manager_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translation.warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "router.cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.proxy_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.selector" to "translator.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.history" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.cookiejar" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.attribute_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.flash_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1" to "form.resolved_type_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.extension" to "form.registry".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.type_extension.form.request_handler" to "form.type_extension.form.http_foundation".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.server_params" to "form.type_extension.form.request_handler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_generator" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_storage" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets._default_package" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "validator.validator_factory" to "validator.builder".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "profiler.storage" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.config" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.ajax" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.exception" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.events" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.logger" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.time" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.memory" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.twig" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.security" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.data_collector" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.doctrine" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.xml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.yml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.php" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_dir" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_file" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.resolver" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.parent" to "debug.event_dispatcher".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "controller_resolver" to "debug.controller_resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.dao.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.anonymous.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.expression_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.role_hierarchy_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.authenticated_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.expression_language" to "security.access.expression_voter".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.firewall.map" to "security.firewall".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d" to "security.firewall.map".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.retry_entry_point" to "security.channel_listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user.provider.concrete.in_memory_admin" to "security.user.provider.concrete.in_memory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.success_handler.default" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.handler.session" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user_checker" to "security.authentication.provider.dao.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.session_strategy" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.success_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.failure_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.form_entry_point.default" to "security.exception_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.channel_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.context_listener.0" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.form.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.anonymous.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.exception_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.logout_url" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.security" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.profiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.trans" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.assets" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.actions" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.code" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.routing" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.yaml" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug.stopwatch" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.expression" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpkernel" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.form" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.twig.doctrine_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.dump" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.webprofiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.app_variable" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.configurator.environment" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.renderer" to "twig.extension.form".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.engine" to "twig.form.renderer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.transport.replacementfactory" to "swiftmailer.mailer.default.transport.buffer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillpersonbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillmainbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.kernel" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.parameter_bag" to "assetic.asset_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.value_supplier.default" to "assetic.twig_extension".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader.real" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.config_cache" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger.chain.default" to "doctrine.dbal.default_connection.configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger" to "doctrine.dbal.logger.chain.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.configuration" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.event_manager" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_metadata_driver" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.naming_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.quote_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_configuration" to "doctrine.orm.default_entity_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.security.expression_language.default" to "sensio_framework_extra.security.listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.doctrine_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.secret_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.logging" to "translator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.buffer" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.authhandler" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.eventdispatcher" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "controller_resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.logging"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.selector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translation.warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.flash_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.attribute_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.handler.write_check"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.type_extension.form.request_handler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.server_params"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_generator"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets._default_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.engine.delegating"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.cache_warmer.template_paths"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.mapping.cache.apc"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.validator_factory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "profiler.storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.config"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.ajax"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.exception"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.events"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.time"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.xml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.yml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "router.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.cached_reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "debug.event_dispatcher.parent"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.session_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user_checker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.expression_language"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.authenticated_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.role_hierarchy_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.expression_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.firewall.map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.retry_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.basic_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.digest_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.channel_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.handler.session"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.rememberme.token.provider.in_memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.logout_url"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user.provider.concrete.in_memory_admin"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener.0"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.success_handler.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.dao.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.success_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.failure_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.form.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.form_entry_point.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.exception_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.app_variable"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.native_filesystem"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.profiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.twig"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.trans"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.assets"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.actions"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.code"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.routing"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.yaml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug.stopwatch"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.expression"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpkernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.form"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.engine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.renderer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.configurator.environment"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.chrome_php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.gelf_message"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.html"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.json"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.line"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.loggly"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.normalizer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.scalar"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.wildfire"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.failover"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.mailinvoker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.replacementfactory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.data_collector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.eventdispatcher"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.authhandler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.buffer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.config_cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.asset_manager_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.worker.cache_busting"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.parameter_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.value_supplier.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader.real"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.doctrine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.twig.doctrine_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger.chain.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.event_manager"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.proxy_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.listeners.resolve_target_entity"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.underscore"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.ansi"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_yml_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_dir"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_file"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.security.expression_language.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.dump"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.webprofiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.doctrine_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.secret_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillpersonbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillmainbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.kernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.finder" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets.empty_version_strategy" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "annotations.reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_version_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.finder"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.http_utils"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpfoundation"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_class"; reason: unused
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
@@ -0,0 +1,88 @@
+<?php return array (
+  0 => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
+  1 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
+  2 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
+  3 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
+  4 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
+  5 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
+  6 => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
+  7 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
+  8 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
+  9 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
+  10 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
+  11 => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+  12 => 'Symfony\\Component\\Routing\\RequestContext',
+  13 => 'Symfony\\Component\\Routing\\Router',
+  14 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
+  15 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
+  16 => 'Symfony\\Component\\Config\\FileLocator',
+  17 => 'Symfony\\Component\\Debug\\ErrorHandler',
+  18 => 'Symfony\\Component\\EventDispatcher\\Event',
+  19 => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
+  20 => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
+  21 => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
+  22 => 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
+  23 => 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent',
+  24 => 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent',
+  25 => 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent',
+  26 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
+  27 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
+  28 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
+  29 => 'Symfony\\Component\\HttpKernel\\KernelEvents',
+  30 => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
+  31 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
+  32 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
+  33 => 'Symfony\\Component\\Security\\Http\\Firewall',
+  34 => 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface',
+  35 => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
+  36 => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage',
+  37 => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
+  38 => 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker',
+  39 => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
+  40 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
+  41 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
+  42 => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
+  43 => 'Twig_Environment',
+  44 => 'Twig_Extension',
+  45 => 'Twig_Extension_Core',
+  46 => 'Twig_Extension_Escaper',
+  47 => 'Twig_Extension_Optimizer',
+  48 => 'Twig_LoaderInterface',
+  49 => 'Twig_Markup',
+  50 => 'Twig_Template',
+  51 => 'Monolog\\Formatter\\FormatterInterface',
+  52 => 'Monolog\\Formatter\\LineFormatter',
+  53 => 'Monolog\\Handler\\HandlerInterface',
+  54 => 'Monolog\\Handler\\AbstractHandler',
+  55 => 'Monolog\\Handler\\AbstractProcessingHandler',
+  56 => 'Monolog\\Handler\\StreamHandler',
+  57 => 'Monolog\\Handler\\FingersCrossedHandler',
+  58 => 'Monolog\\Handler\\FilterHandler',
+  59 => 'Monolog\\Handler\\TestHandler',
+  60 => 'Monolog\\Logger',
+  61 => 'Symfony\\Bridge\\Monolog\\Logger',
+  62 => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
+  63 => 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
+  64 => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
+  65 => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
+  66 => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
+  67 => 'Doctrine\\Common\\Annotations\\DocLexer',
+  68 => 'Doctrine\\Common\\Annotations\\FileCacheReader',
+  69 => 'Doctrine\\Common\\Annotations\\PhpParser',
+  70 => 'Doctrine\\Common\\Annotations\\Reader',
+  71 => 'Doctrine\\Common\\Lexer',
+  72 => 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
+  73 => 'Doctrine\\Common\\Persistence\\Proxy',
+  74 => 'Doctrine\\Common\\Util\\ClassUtils',
+  75 => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
+  76 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
+  77 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
+  78 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
+  79 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
+  80 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
+  81 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
+  82 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
+  83 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
+  84 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
+  85 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
+);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
@@ -0,0 +1,77 @@
+imports:
+    - { resource: parameters.yml }
+
+framework:
+    secret:          Not very secret
+    router:          { resource: "%kernel.root_dir%/config/routing.yml" }
+    form:            true
+    csrf_protection: true
+    session:         ~
+    default_locale:  fr
+    translator:      { fallback: fr }
+    profiler:        { only_exceptions: false }
+    templating:
+        engines: ['twig']
+ 
+doctrine:
+    dbal:
+        driver:   pdo_pgsql
+        host:     "%database_host%"
+        port:     "%database_port%"
+        dbname:   "%database_name%"
+        user:     "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        mapping_types:
+            jsonb: json_array
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        auto_mapping: true
+        
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        
+    
+security:
+    providers:
+        chain_provider:
+            chain :
+                providers: [in_memory, users]
+        in_memory:
+            memory:
+                users:
+                    admin: { password: olala, roles: 'ROLE_ADMIN' }
+        users:
+            entity:
+                class: Chill\MainBundle\Entity\User
+                property: username
+
+    encoders: 
+        Chill\MainBundle\Entity\User: 
+            algorithm: bcrypt
+        Symfony\Component\Security\Core\User\User: plaintext
+
+    firewalls:
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        default:
+            anonymous: ~
+            form_login:
+                csrf_parameter: _csrf_token
+                csrf_token_id: authenticate
+                csrf_provider: form.csrf_provider
+            logout: ~
+            http_basic: 
+    access_control:
+        #disable authentication for tests
+        #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        #- { path: ^/admin, roles: ROLE_ADMIN }
+        #- { path: ^/, roles: ROLE_USER }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
@@ -0,0 +1,8 @@
+# config/config_test.yml
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
@@ -0,0 +1,9 @@
+
+#required by ConfigCustomizablesEntitiesTest::testNotEmptyConfig
+
+imports:
+    - { resource: config_test.yml } 
+
+chill_custom_fields:
+    customizables_entities:
+        - { class: Test\With\A\Dummy\Entity, name: test }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: chill__database
+    database_port: 5432
+    database_name: postgres
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5432
+    database_name: test0
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5434
+    database_name: symfony
+    database_user: symfony
+    database_password: symfony
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
@@ -0,0 +1,10 @@
+cl_custom_fields:
+    resource: .
+    type: chill_routes
+    
+chill_main:
+    resource: "@ChillMainBundle/Resources/config/routing.yml"
+
+test_custom_field_form_render:
+    path: /customfieldsgroup/test/render/{id}
+    defaults: { _controller: ChillCustomFieldsBundle:CustomFieldsGroup:renderForm }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
+//umask(0000);
+
+set_time_limit(0);
+
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require __DIR__.'/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -0,0 +1,41 @@
+<?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);
+
+use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+// If you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+//umask(0000);
+
+// This check prevents access to debug front controllers that are deployed by accident to production servers.
+// Feel free to remove this, extend it, or make something more sophisticated.
+if (
+    isset($_SERVER['HTTP_CLIENT_IP'])
+    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
+) {
+    header('HTTP/1.0 403 Forbidden');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
+}
+
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
+Debug::enable();
+
+require_once __DIR__ . '/../app/AppKernel.php';
+
+$kernel = new AppKernel('dev', true);
+$kernel->loadClassCache();
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -83,10 +83,6 @@
    {{ form_row(edit_form.comment) }}
 {% endif %}

-{%- if edit_form.privateComment is defined -%}
-    {{ form_row(edit_form.privateComment) }}
-{% endif %}
-
 {%- if edit_form.attendee is defined -%}
    {{ form_row(edit_form.attendee) }}
 {% endif %}
@@ -120,11 +116,3 @@

 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -2,30 +2,12 @@
    {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
        {% if no_action is not defined or no_action == false %}
            <li>
-                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
-                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-                    {% if showGroup %}
-                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{ 'notification.Notify'|trans }}
-                        </button>
-                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
-                                    {{ 'notification.Notify referrer'|trans }}
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                                    {{ 'notification.Notify any'|trans }}
-                                </a>
-                            </li>
-                        </ul>
-                    {% else %}
-                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                            {{ 'notification.Notify'|trans }}
-                        </a>
-                    {% endif %}
-                </div>
+                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
+                    'entityId': activity.id
+                }) }}">
+                    <i class="fa fa-paper-plane fa-fw"></i>
+                    {{ 'notification.Notify'|trans }}</a>
            </li>
        {% endif %}
        {% if context == 'person' and activity.accompanyingPeriod is not empty %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@

    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}

-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -81,13 +81,10 @@
 {% endif %}

 {%- if form.comment is defined -%}
+    {# TODO .. public and private #}
    {{ form_row(form.comment) }}
 {% endif %}

-{%- if form.privateComment is defined -%}
-    {{ form_row(form.privateComment) }}
-{% endif %}
-
 {%- if form.attendee is defined -%}
    {{ form_row(form.attendee) }}
 {% endif %}
@@ -119,11 +116,3 @@
  </li>
 </ul>
 {{ form_end(form) }}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,5 +1,4 @@
 {%- set t = entity.type -%}
-{% set userId = app.user.id %}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}

 <h1>{{ "Activity"|trans }}</h1>
@@ -147,28 +146,13 @@
                </dd>
            {% endif %}

-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'Private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    <section class="chill-entity entity-comment-embeddable">
-                        <blockquote class="chill-user-quote private-quote">
-                            {{ entity.privateComment.comments[userId] }}
-                        </blockquote>
-                    </section>
-                </dd>
-            {% endif %}
-
            {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                <dt class="inline">{{ 'Documents'|trans }}</dt>
                <dd>
                    {% if entity.documents|length > 0 %}
                        <ul>
                            {% for d in entity.documents %}
-                                <li>{{ d.title }}{{ m.download_button(d) }}</li>
+                                <li>{{ m.download_button(d) }}</li>
                            {% endfor %}
                        </ul>
                    {% else %}
@@ -217,30 +201,9 @@
        </a>
    </li>
    <li>
-        {% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user)  %}
-        <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-            {% if showGroup %}
-                <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    {{ 'notification.Notify'|trans }}
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.user.id]}) }}">
-                            {{ 'notification.Notify referrer'|trans }}
-                        </a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                            {{ 'notification.Notify any'|trans }}
-                        </a>
-                    </li>
-                </ul>
-            {% else %}
-                <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                    {{ 'notification.Notify'|trans }}
-                </a>
-            {% endif %}
-        </div>
+        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+            {{ 'notification.Notify'|trans }}
+        </a>
    </li>
    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
        <li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
    {% block content_form_actions_view %}{% endblock %}
    {% block content_form_actions_save_and_show %}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityPresence list'|trans }}</h1>
@@ -34,7 +34,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
                {{ 'Create a new activity presence'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
@@ -1,11 +1,11 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason edit'|trans }}</h1>
@@ -8,7 +24,7 @@
    {{ form_row(edit_form.active) }}
    {{ form_row(edit_form.category) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason list'|trans }}</h1>
@@ -29,11 +45,7 @@
        </tbody>
    </table>

-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-        </li>
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
                {{ 'Create a new activity reason'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason creation'|trans }}</h1>
@@ -8,7 +24,7 @@
    {{ form_row(form.active) }}
    {{ form_row(form.category) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason'|trans }}</h1>
@@ -22,7 +38,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory edit'|trans }}</h1>
@@ -7,7 +23,7 @@
    {{ form_row(edit_form.name) }}
    {{ form_row(edit_form.active) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
@@ -30,7 +46,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
                {{ 'Create a new activity category reason'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory creation'|trans }}</h1>
@@ -7,7 +23,7 @@
    {{ form_row(form.name) }}
    {{ form_row(form.active) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory'|trans }}</h1>
@@ -21,7 +37,7 @@
            </tr>
        </tbody>
    </table>
-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
        {% block content_form_actions_view %}{% endblock %}
        {% block content_form_actions_save_and_show %}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityType list'|trans }}</h1>
@@ -34,7 +50,7 @@
        </tbody>
    </table>

-        <ul class="record_actions sticky-form-buttons">
+        <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
                {{ 'Create a new activity type'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
        {% block content_form_actions_save_and_show %}{% endblock %}
    {% endembed %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_view %}{% endblock %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+    {% block content_form_actions_view %}{% endblock %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
@@ -34,7 +34,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
                {{ 'Create a new activity type category'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
@@ -1,11 +1,11 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
 <info@champs-libres.coop> / <http://www.champs-libres.coop>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@

 {% block vertical_menu_content %}
    {{ chill_menu('admin_activity', {
-        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+        'layout': '@ChillActivity/Admin/menu_activity.html.twig',
    }) }}
 {% endblock %}

--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
@@ -0,0 +1,20 @@
+{#
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ <info@champs-libres.coop> / <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Activity configuration menu'|trans }}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -133,7 +133,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

                // change attribute CREATE
                if (self::CREATE === $attribute) {
-                    return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject->getPerson(), $token);
+                    $attribute = self::CREATE_PERSON;
                }
            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
@@ -144,8 +144,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                    if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
                        return false;
                    }
-
-                    return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
+                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
                }
            } else {
                throw new RuntimeException('Could not determine context of activity.');
@@ -159,12 +158,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

            // transform the attribute
            if (self::CREATE === $attribute) {
-                return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject, $token);
+                $attribute = self::CREATE_ACCOMPANYING_COURSE;
            }
        } elseif ($subject instanceof Person) {
            // transform the attribute
            if (self::CREATE === $attribute) {
-                return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject, $token);
+                $attribute = self::CREATE_PERSON;
            }
        }

--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -130,10 +130,8 @@ class ActivityContext implements
                        return $this->personRender->renderString($p, []);
                    },
                    'multiple' => false,
-                    'required' => false,
                    'expanded' => true,
                    'label' => $options[$key . 'Label'],
-                    'placeholder' => $this->translator->trans('Any person selected'),
                ]);
            }
        }
@@ -211,7 +209,6 @@ class ActivityContext implements
     */
    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
    {
-        $storedObject->setTitle($this->translatableStringHelper->localize($template->getName()));
        $entity->addDocument($storedObject);

        $this->em->persist($storedObject);
--- a/Show More
+++ b/Show More