calendar with custom nav buttons - still bugs

[Calendar] repairs the calendar for creation in Person file

See merge request Chill-Projet/chill-bundles!463

.php_cs.dist.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

CHANGELOG.md

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

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

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

docs/source/development/pagination/example.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

docs/source/installation/index.rst

@@ -265,7 +265,7 @@ Tests reside inside the installed bundles. You must `cd` into that directory, do
 
 **Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.
 
-Exemple, for running test inside `main` bundle:
+Exemple, for running unit test inside `main` bundle:
 
 .. code-block:: bash
 
@@ -280,6 +280,30 @@ Exemple, for running test inside `main` bundle:
    # run tests
    bin/phpunit src/Bundle/path/to/your/test
 
+Or for running tests to check code style and php conventions with csfixer and phpstan:
+
+.. code-block:: bash
+
+    # run code style fixer
+    bin/grumphp run --tasks=phpcsfixer
+    # run phpstan
+    bin/grumphp run --tasks=phpstan
+
+
+.. note::
+
+    To avoid phpstan block your commits:
+
+    .. code-block:: bash
+
+        git commit -n ...
+
+    To avoid phpstan block your commits permanently:
+
+    .. code-block:: bash
+
+        ./bin/grumphp git:deinit
+
 How to run webpack interactively
 ================================
 

exports_alias_conventions.md

@@ -17,12 +17,13 @@ These are alias conventions :
 |                                         | Scope::class                            | acp.scopes                                 | acpscope                          |
 |                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                    |
 |                                         | User::class                             | acp.user                                   | acpuser                           |
+|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                  |
 | AccompanyingPeriodWork::class           |                                         |                                            | acpw                              |
 |                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                          |
 |                                         | User::class                             | acpw.referrers                             | acpwuser                          |
 |                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                  |
 |                                         | Goal::class                             | acpw.goals                                 | goal                              |
-|                                         | Result::class                           | acpw.results                               | result                        |
+|                                         | Result::class                           | acpw.results                               | result                            |
 | AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                           |
 |                                         | Person::class                           | acppart.person                             | partperson                        |
 | AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                          |
@@ -47,7 +48,7 @@ These are alias conventions :
 |                                         | HouseholdComposition::class             | household.compositions                     | composition                       |
 | Activity::class                         |                                         |                                            | activity                          |
 |                                         | Person::class                           | activity.person                            | actperson                         |
-|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                            |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                               |
 |                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity  |
 |                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity |
 |                                         | ActivityType::class                     | activity.activityType                      | acttype                           |
@@ -59,6 +60,7 @@ These are alias conventions :
 |                                         | User::class                             | activity.users                             | actusers                          |
 |                                         | ActivityReason::class                   | activity.reasons                           | actreasons                        |
 |                                         | Center::class                           | actperson.center                           | actcenter                         |
+|                                         | Person::class                           | activity.createdBy                         | actcreator                        |
 | ActivityReason::class                   |                                         |                                            | actreasons                        |
 |                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                      |
 | Calendar::class                         |                                         |                                            | cal                               |

phpstan-deprecations.neon

@@ -23,150 +23,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityReasonAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityTypeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityUserAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\CountActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityReasonFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityTypeFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
-
 		-
 			message: """
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -359,31 +215,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
-		-
-			message: """
-				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportInterface.php
-
-
-		-
-			message: """
-				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ModifierInterface\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ModifierInterface.php
-
 		-
 			message: """
 				#^Class Chill\\\\MainBundle\\\\Form\\\\Event\\\\CustomizeFormEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
@@ -543,142 +374,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/Person.php
 
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AgeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\CountPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: """
-				#^Call to deprecated method execute\\(\\) of class Doctrine\\\\DBAL\\\\Statement\\:
-				Statement\\:\\:execute\\(\\) is deprecated, use Statement\\:\\:executeQuery\\(\\) or executeStatement\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodClosingFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodOpeningFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\BirthdateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\NationalityFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -740,29 +435,6 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
 
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Filter\\\\ReportDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
 
 		-
 			message: """
@@ -845,14 +517,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskAclAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:

phpstan-types.neon

@@ -245,11 +245,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -42,7 +42,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Serializer\SerializerInterface;
 use function array_key_exists;
 

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -13,6 +13,10 @@ namespace Chill\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
@@ -55,8 +59,12 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     getUserFunction="getUser",
  * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
     public const SENTRECEIVED_RECEIVED = 'received';
 
     public const SENTRECEIVED_SENT = 'sent';

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

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

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

@@ -19,7 +19,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
-class UserScopeAggregator implements AggregatorInterface
+class CreatorScopeAggregator implements AggregatorInterface
 {
     private ScopeRepository $scopeRepository;
 
@@ -40,12 +40,12 @@ class UserScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.user', 'actuser');
+        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.createdBy', 'actcreator');
         }
 
-        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
-        $qb->addGroupBy('userscope_aggregator');
+        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
+        $qb->addGroupBy('creatorscope_aggregator');
     }
 
     public function applyOn(): string
@@ -79,11 +79,11 @@ class UserScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['userscope_aggregator'];
+        return ['creatorscope_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by userscope';
+        return 'Group activity by creator scope';
     }
 }

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

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
+    {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('actusers.id AS activity_users_aggregator')
+            ->addGroupBy('activity_users_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add on the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Activity users';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_users_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by activity users';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserJobRepositoryInterface $userJobRepository;
+
+    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->userJobRepository = $userJobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
+            ->addGroupBy('activity_users_job_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s job';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $j = $this->userJobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_job_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users job';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
+            ->addGroupBy('activity_users_main_scope_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s scope';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_main_scope_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users scope';
+    }
+}

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

@@ -17,6 +17,8 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -67,9 +69,9 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_avg_activity_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -84,6 +86,10 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('activity');
 
         $qb
@@ -91,6 +97,17 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
             ->select('AVG(activity.durationTime) as export_avg_activity_duration')
             ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
 
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
         return $qb;
     }
 

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

@@ -17,6 +17,8 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -68,9 +70,9 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_activity_visit_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -85,6 +87,10 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('activity');
 
         $qb
@@ -92,6 +98,17 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
             ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
             ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
 
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
         return $qb;
     }
 

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

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

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

@@ -17,13 +17,14 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -69,9 +70,9 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_sum_activity_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -86,15 +87,28 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('activity');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
 
-        if (!in_array('acp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'acp');
-        }
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
 
         $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
             ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
 
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
         return $qb;
     }
 

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

@@ -17,13 +17,14 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -69,9 +70,9 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_sum_activity_visit_duration'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
@@ -86,15 +87,28 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('activity');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
 
-        if (!in_array('acp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'acp');
-        }
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
 
         $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
             ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
 
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
         return $qb;
     }
 

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

@@ -21,7 +21,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
@@ -66,9 +65,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle()
@@ -85,16 +84,24 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        $qb = $this->activityRepository->createQueryBuilder('activity');
-
-        if (!in_array('person', $qb->getAllAliases(), true)) {
-            $qb->join('activity.person', 'person');
-        }
+        $qb = $this->activityRepository
+            ->createQueryBuilder('activity')
+            ->join('activity.person', 'person')
+            ->join('person.centerHistory', 'centerHistory');
 
         $qb->select('COUNT(activity.id) as export_count_activity');
 
         $qb
-            ->where($qb->expr()->in('person.center', ':centers'))
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull('centerHistory.endDate'),
+                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
             ->setParameter('centers', $centers);
 
         return $qb;

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

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

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

@@ -1,12 +1,5 @@
 <?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);
 
 /*

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

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

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

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

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

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

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

@@ -74,15 +74,13 @@ class EmergencyFilter implements FilterInterface
 
     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),
-        ]];
+        return [
+            'Filtered by emergency: only %emergency%', [
+                '%emergency%' => $this->translator->trans(
+                    $data['accepted_emergency'] ? 'is emergency' : 'is not emergency'
+                ),
+            ],
+        ];
     }
 
     public function getTitle(): string

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

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

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

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

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

@@ -85,7 +85,7 @@ class UserScopeFilter implements FilterInterface
         }
 
         return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(', ou ', $scopes),
+            '%scopes%' => implode(', ', $scopes),
         ]];
     }
 

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

@@ -91,7 +91,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         );
 
         return ['Filtered by activity type: only %list%', [
-            '%list%' => implode(', ou ', $reasonsNames),
+            '%list%' => implode(', ', $reasonsNames),
         ]];
     }
 

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

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ActivityUsersFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $orX = $qb->expr()->orX();
+
+        foreach ($data['accepted_users'] as $key => $user) {
+            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
+            $qb->setParameter('activity_users_filter_u' . $key, $user);
+        }
+
+        $qb->andWhere($orX);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', PickUserDynamicType::class, [
+            'multiple' => true,
+            'label' => 'Users',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by users: only %users%', [
+            '%users%' => implode(', ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by users';
+    }
+}

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

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UsersJobFilter implements FilterInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
+                JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND  activity_users_job_filter_act = activity '
+            )
+            )
+            ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('jobs', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [
+            '%jobs%' => implode(
+                ', ',
+                array_map(
+                    fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
+                    $data['jobs']->toArray()
+                )
+            ),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.activity.by_usersjob.Filter by users job';
+    }
+}

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

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UsersScopeFilter implements FilterInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepositoryInterface $scopeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act
+                JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND  activity_users_scope_filter_act = activity '
+                )
+            )
+            ->setParameter('activity_users_scope_filter_scopes', $data['scopes']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('scopes', EntityType::class, [
+            'class' => Scope::class,
+            'choices' => $this->scopeRepository->findAllActive(),
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [
+            '%scopes%' => implode(
+                ', ',
+                array_map(
+                    fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+                    $data['scopes']->toArray()
+                )
+            ),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.activity.by_usersscope.Filter by users scope';
+    }
+}

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -29,7 +29,7 @@
 {% endmacro %}
 
 {% set blocks = [] %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.personsVisible %}
+{% if context == 'calendar_accompanyingCourse' or context == 'calendar_person' or entity.activityType.personsVisible %}
     {% if context == 'person' %}
         {% set blocks = blocks|merge([{
             'title': 'Others persons'|trans,
@@ -54,7 +54,7 @@
         }]) %}
     {% endif %}
 {% endif %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.thirdPartiesVisible %}
+{% if context == 'calendar_accompanyingCourse' or context == 'calendar_person' or entity.activityType.thirdPartiesVisible %}
     {% set blocks = blocks|merge([{
         'title': 'Third parties'|trans,
         'items': entity.thirdParties,
@@ -63,7 +63,7 @@
         'key'  : 'id',
     }]) %}
 {% endif %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.usersVisible %}
+{% if context == 'calendar_accompanyingCourse' or context == 'calendar_person' or entity.activityType.usersVisible %}
     {% set blocks = blocks|merge([{
         'title': 'Users concerned'|trans,
         'items': entity.users,
@@ -143,7 +143,7 @@
                             {% if bloc.type == 'user' %}
                                 <span class="badge-user">
                                     {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
-                                    {%- if context == 'calendar_accompanyingCourse' %}
+                                    {%- if context == 'calendar_accompanyingCourse' or context == 'calendar_person' %}
                                         {% set invite = entity.inviteForUser(item) %}
                                         {% if invite is not null %}
                                         {{ invite.invite_span(invite) }}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -19,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -29,7 +22,7 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class ByUserAggregatorTest extends AbstractAggregatorTest
 {
-    private ByUserAggregator $aggregator;
+    private ByCreatorAggregator $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -19,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -29,7 +22,7 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class UserScopeAggregatorTest extends AbstractAggregatorTest
 {
-    private UserScopeAggregator $aggregator;
+    private CreatorScopeAggregator $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator;
-
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-
-/**
- * Add tests for ActivityReasonAggregator.
- *
- * @internal
- * @coversNothing
- */
-final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
-{
-    private ActivityReasonAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $container = self::$kernel->getContainer();
-
-        $this->aggregator = $container->get('chill.activity.export.reason_aggregator');
-
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $container->get('request_stack')
-            ->push($request->reveal());
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData()
-    {
-        return [
-            ['level' => 'reasons'],
-            ['level' => 'categories'],
-        ];
-    }
-
-    public function getQueryBuilders()
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -11,8 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityTypeAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Add tests for ActivityTypeAggregator.
@@ -22,23 +24,22 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
+    use ProphecyTrait;
+
     private ActivityTypeAggregator $aggregator;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->aggregator = self::$container->get('chill.activity.export.type_aggregator');
 
-        $this->aggregator = $container->get('chill.activity.export.type_aggregator');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 
@@ -60,8 +61,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
             self::bootKernel();
         }
 
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
@@ -70,12 +70,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
+                ->join('activity.activityType', 'acttype'),
         ];
     }
 }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php

@@ -13,6 +13,8 @@ namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Add tests for ActivityUsernAggregator.
@@ -22,23 +24,22 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
+    use ProphecyTrait;
+
     private ActivityUserAggregator $aggregator;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->aggregator = self::$container->get('chill.activity.export.user_aggregator');
 
-        $this->aggregator = $container->get('chill.activity.export.user_aggregator');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 
@@ -47,35 +48,25 @@ final class ActivityUserAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): array
     {
         if (null === self::$kernel) {
             self::bootKernel();
         }
 
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
         ];
     }
 }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -18,10 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
@@ -29,6 +22,8 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
+    use ProphecyTrait;
+
     private ActivityReasonAggregator $aggregator;
 
     protected function setUp(): void
@@ -36,6 +31,14 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.activity.export.reason_aggregator');
+
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+
+        $request->getLocale()->willReturn('fr');
+
+        self::$container->get('request_stack')
+            ->push($request->reveal());
     }
 
     public function getAggregator()
@@ -46,12 +49,8 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            [
-                'level' => 'reasons',
-            ],
-            [
-                'level' => 'categories',
-            ],
+            ['level' => 'reasons'],
+            ['level' => 'categories'],
         ];
     }
 
@@ -66,9 +65,15 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.person', 'actperson')
-                ->innerJoin('activity.reasons', 'actreasons')
+                ->from('ChillActivityBundle:Activity', 'activity'),
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from('ChillActivityBundle:Activity', 'activity')
+                ->join('activity.reasons', 'actreasons'),
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from('ChillActivityBundle:Activity', 'activity')
+                ->join('activity.reasons', 'actreasons')
                 ->join('actreasons.category', 'actreasoncat'),
         ];
     }

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityDuration;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AvgActivityDurationTest extends AbstractExportTest
+{
+    private AvgActivityDuration $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.activity.export.avg_activity_duration_linked_to_acp');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getModifiersCombination(): array
+    {
+        return [
+            ['activity'],
+            ['activity', 'accompanying_period'],
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityVisitDuration;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AvgActivityVisitDurationTest extends AbstractExportTest
+{
+    private AvgActivityVisitDuration $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.activity.export.avg_activity_visit_duration_linked_to_acp');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getModifiersCombination(): array
+    {
+        return [
+            ['activity'],
+            ['activity', 'accompanying_period'],
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Export\Export\LinkedToACP\CountActivity;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CountActivityTest extends AbstractExportTest
+{
+    private CountActivity $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.activity.export.count_activity_linked_to_acp');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getModifiersCombination(): array
+    {
+        return [
+            ['activity'],
+            ['activity', 'accompanying_period'],
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityDuration;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SumActivityDurationTest extends AbstractExportTest
+{
+    private SumActivityDuration $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.activity.export.sum_activity_duration_linked_to_acp');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getModifiersCombination(): array
+    {
+        return [
+            ['activity'],
+            ['activity', 'accompanying_period'],
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityVisitDuration;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SumActivityVisitDurationTest extends AbstractExportTest
+{
+    private SumActivityVisitDuration $export;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.activity.export.sum_activity_visit_duration_linked_to_acp');
+    }
+
+    public function getExport()
+    {
+        return $this->export;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getModifiersCombination(): array
+    {
+        return [
+            ['activity'],
+            ['activity', 'accompanying_period'],
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php

@@ -9,8 +9,9 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Export;
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
@@ -19,19 +20,13 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  */
 final class CountActivityTest extends AbstractExportTest
 {
-    /**
-     * @var
-     */
-    private $export;
+    private CountActivity $export;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
-        $container = self::$kernel->getContainer();
-
-        $this->export = $container->get('chill.activity.export.count_activity');
+        $this->export = self::$container->get('chill.activity.export.count_activity_linked_to_person');
     }
 
     public function getExport()
@@ -39,14 +34,14 @@ final class CountActivityTest extends AbstractExportTest
         return $this->export;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination()
+    public function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php

@@ -9,9 +9,11 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Export;
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
@@ -19,27 +21,22 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  */
 final class ListActivityTest extends AbstractExportTest
 {
-    /**
-     * @var \Chill\ActivityBundle\Export\Export\ListActivity
-     */
-    private $export;
+    use ProphecyTrait;
+
+    private ListActivity $export;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
-        $container = self::$kernel->getContainer();
+        $this->export = self::$container->get('chill.activity.export.list_activity_linked_to_person');
 
-        $this->export = $container->get('chill.activity.export.list_activity');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php

@@ -9,8 +9,9 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Export;
+namespace Chill\ActivityBundle\Tests\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
@@ -19,21 +20,15 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * @internal
  * @coversNothing
  */
-final class StatActivityDurationSumTest extends AbstractExportTest
+final class StatActivityDurationTest extends AbstractExportTest
 {
-    /**
-     * @var \Chill\ActivityBundle\Export\Export\StatActivityDuration
-     */
-    private $export;
+    private StatActivityDuration $export;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
-        $container = self::$kernel->getContainer();
-
-        $this->export = $container->get('chill.activity.export.sum_activity_duration');
+        $this->export = self::$container->get('chill.activity.export.sum_activity_duration_linked_to_person');
     }
 
     public function getExport()
@@ -41,14 +36,14 @@ final class StatActivityDurationSumTest extends AbstractExportTest
         return $this->export;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination()
+    public function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -38,12 +31,6 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.filter_activitytype');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class BySocialActionFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.bysocialaction_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.bysocialissue_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -19,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -30,18 +23,12 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class ByUserFilterTest extends AbstractFilterTest
 {
-    private ByUserFilter $filter;
+    private ByCreatorFilter $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.byuser_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -35,12 +28,6 @@ final class EmergencyFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.emergency_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class LocationTypeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.locationtype_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -35,12 +28,6 @@ final class SentReceivedFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.sentreceived_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class UserFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.user_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class UserScopeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.userscope_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class ActivityDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.date_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Tests\Export\Filter;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
@@ -21,23 +22,22 @@ use Doctrine\Common\Collections\ArrayCollection;
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
 {
+    use ProphecyTrait;
+
     private ActivityReasonFilter $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->filter = self::$container->get('chill.activity.export.reason_filter');
 
-        $this->filter = $container->get('chill.activity.export.reason_filter');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php

@@ -29,12 +29,6 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.type_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -36,12 +29,6 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.reason_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php

@@ -1,12 +1,5 @@
 <?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);
 
 /*
@@ -37,12 +30,6 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
         $this->filter = self::$container->get('chill.activity.export.person_having_an_activity_between_date_filter');
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php

@@ -28,18 +28,14 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->filter = self::$container->get('chill.activity.export.person_having_an_activity_between_date_filter');
 
-        $this->filter = $container->get('chill.activity.export.'
-            . 'person_having_an_activity_between_date_filter');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -4,18 +4,15 @@ services:
         autoconfigure: true
 
     ## Indicators
-    chill.activity.export.count_activity_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity
+    Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity:
         tags:
             - { name: chill.export, alias: 'count_activity_linked_to_person' }
 
-    chill.activity.export.sum_activity_duration_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration
+    Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration:
         tags:
             - { name: chill.export, alias: 'sum_activity_duration_linked_to_person' }
 
-    chill.activity.export.list_activity_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity
+    Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity:
         tags:
             - { name: chill.export, alias: 'list_activity_linked_to_person' }
 
@@ -55,6 +52,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
+    Chill\ActivityBundle\Export\Filter\ActivityUsersFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'activity_users_filter' }
+
     chill.activity.export.reason_filter:
         class: Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter
         tags:
@@ -77,10 +78,9 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_locationtype_filter' }
 
-    chill.activity.export.byuser_filter:  # TMS (M2M)
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter
+    Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter:
         tags:
-            - { name: chill.export_filter, alias: 'activity_byuser_filter' }
+            - { name: chill.export_filter, alias: 'activity_bycreator_filter' }
 
     chill.activity.export.emergency_filter:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
@@ -112,9 +112,16 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_userscope_filter' }
 
+    Chill\ActivityBundle\Export\Filter\UsersJobFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'activity_usersjob_filter' }
+
+    Chill\ActivityBundle\Export\Filter\UsersScopeFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'activity_usersscope_filter' }
+
     ## Aggregators
-    chill.activity.export.reason_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator
+    Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_reason_aggregator }
 
@@ -138,10 +145,9 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_date_aggregator }
 
-    chill.activity.export.byuser_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator
+    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator:
         tags:
-            - { name: chill.export_aggregator, alias: activity_byuser_aggregator }
+            - { name: chill.export_aggregator, alias: activity_by_creator_aggregator }
 
     chill.activity.export.bythirdparty_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
@@ -158,7 +164,18 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
 
-    chill.activity.export.userscope_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator
+    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator:
         tags:
-            - { name: chill.export_aggregator, alias: activity_userscope_aggregator }
+            - { name: chill.export_aggregator, alias: activity_creator_scope_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersScopeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_scope_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersJobAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_job_aggregator }

src/Bundle/ChillActivityBundle/migrations/Version20221014130554.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20221014130554 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP updatedAt');
+        $this->addSql('ALTER TABLE activity DROP createdAt');
+        $this->addSql('ALTER TABLE activity DROP updatedBy_id');
+        $this->addSql('ALTER TABLE activity DROP createdBy_id');
+
+        // rename some indexes on activity
+        $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
+        $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
+        $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
+        $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Track update and create on activity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN activity.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN activity.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095A65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095A3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_AC74095A65FF1AEC ON activity (updatedBy_id)');
+        $this->addSql('CREATE INDEX IDX_AC74095A3174800F ON activity (createdBy_id)');
+
+        // rename some indexes on activity
+        $this->addSql('ALTER INDEX idx_55026b0cc54c8c93 RENAME TO IDX_AC74095AC54C8C93');
+        $this->addSql('ALTER INDEX idx_55026b0c217bbb47 RENAME TO IDX_AC74095A217BBB47');
+        $this->addSql('ALTER INDEX idx_55026b0c682b5931 RENAME TO IDX_AC74095A682B5931');
+        $this->addSql('ALTER INDEX idx_55026b0ca76ed395 RENAME TO IDX_AC74095AA76ED395');
+
+        $this->addSql('UPDATE activity SET updatedBy_id=user_id, createdBy_id=user_id, createdAt="date", updatedAt="date"');
+    }
+}

src/Bundle/ChillActivityBundle/translations/messages.fr.yml

@@ -119,15 +119,15 @@ Activity Presences: Presences aux activités
 
 # Crud
 crud:
-  activity_type:
-    title_new: Nouveau type d'activité
-    title_edit: Edition d'un type d'activité
-  activity_type_category:
-    title_new: Nouvelle catégorie de type d'activité
-    title_edit: Edition d'une catégorie de type d'activité
-  activity_presence:
-    title_new: Nouvelle Présence aux activités
-    title_edit: Edition d'une Présence aux activités
+    activity_type:
+        title_new: Nouveau type d'activité
+        title_edit: Edition d'un type d'activité
+    activity_type_category:
+        title_new: Nouvelle catégorie de type d'activité
+        title_edit: Edition d'une catégorie de type d'activité
+    activity_presence:
+        title_new: Nouvelle Présence aux activités
+        title_edit: Edition d'une Présence aux activités
 
 # activity reason admin
 ActivityReason list: Liste des sujets
@@ -252,8 +252,6 @@ Filter by activity type: Filtrer les activités par type
 Filter activity by locationtype: Filtrer les activités par type de localisation
 'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
 Accepted locationtype: Types de localisation
-Filter activity by linked users: Filtrer les activités par TMS
-'Filtered activity by linked users: only %users%': "Filtré par TMS: uniquement %users%"
 Accepted users: TMS(s)
 Filter activity by emergency: Filtrer les activités par urgence
 'Filtered activity by emergency: only %emergency%': "Filtré par urgence: uniquement si %emergency%"
@@ -269,7 +267,11 @@ Filter activity by linked socialaction: Filtrer les activités par action liée
 Filter activity by linked socialissue: Filtrer les activités par problématique liée
 'Filtered activity by linked socialissue: only %issues%': "Filtré par problématique liée: uniquement %issues%"
 Filter activity by user: Filtrer les activités par créateur
-'Filtered activity by user: only %users%': "Filtré par créateur: uniquement %users%"
+Filter activity by users: Filtrer les activités par utilisateur participant
+Filter activity by creator: Filtrer les activités par créateur de l'échange
+'Filtered activity by user: only %users%': "Filtré par référent: uniquement %users%"
+'Filtered activity by users: only %users%': "Filtré par utilisateurs participants: uniquement %users%"
+'Filtered activity by creator: only %users%': "Filtré par créateur: uniquement %users%"
 Creators: Créateurs
 Filter activity by userscope: Filtrer les activités par service du créateur
 'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
@@ -282,9 +284,14 @@ By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper les activités par utilisateur
+Aggregate by activity user: Grouper les activités par référent
+Aggregate by activity users: Grouper les activités par utilisateurs participants
 Aggregate by activity type: Grouper les activités par type
 Aggregate by activity reason: Grouper les activités par sujet
+Aggregate by users scope: Grouper les activités par service principal de l'utilisateur
+Users 's scope: Service principal des utilisateurs participants à l'activité
+Aggregate by users job: Grouper les activités par métier des utilisateurs participants
+Users 's job: Métier des utilisateurs participants à l'activité
 
 Group activity by locationtype: Grouper les activités par type de localisation
 Group activity by date: Grouper les activités par date
@@ -294,7 +301,8 @@ by week: Par semaine
 for week: Semaine
 by year: Par année
 in year: En
-Group activity by linked users: Grouper les activités par TMS impliqué
+Group activity by creator: Grouper les activités par créateur de l'échange
+Group activity by creator scope: Grouper les activités par service du créateur de l'échange
 Group activity by linked thirdparties: Grouper les activités par tiers impliqué
 Accepted thirdparty: Tiers impliqué
 Group activity by linked socialaction: Grouper les activités par action liée
@@ -311,6 +319,16 @@ This is the minimal activity data: Activité n°
 
 docgen:
     Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
-    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des activités
-    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les activités pour un parcours. Les activités ne sont pas filtrés.
+    A basic context for activity: Contexte pour les échanges
+    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des échanges
+    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les échanges pour un parcours. Les échanges ne sont pas filtrés.
+
+export:
+    filter:
+        activity:
+            by_usersjob:
+                Filter by users job: Filtrer les activités par métier d'au moins un utilisateur participant
+                'Filtered activity by users job: only %jobs%': 'Filtré par métier d''au moins un utilisateur participant: seulement %jobs%'
+            by_usersscope:
+                Filter by users scope: Filtrer les activités par services d'au moins un utilisateur participant
+                'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%'

src/Bundle/ChillActivityBundle/translations/messages.nl.yaml

@@ -231,4 +231,4 @@ This is the minimal activity data: Activité n°
 
 docgen:
     Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
+    A basic context for activity: Contexte pour les échanges

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -15,18 +15,23 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
-use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTimeImmutable;
 use Exception;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
@@ -40,9 +45,11 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class CalendarController extends AbstractController
 {
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+
     private CalendarACLAwareRepositoryInterface $calendarACLAwareRepository;
 
-    private CalendarRepository $calendarRepository;
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
 
     private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
 
@@ -50,29 +57,35 @@ class CalendarController extends AbstractController
 
     private PaginatorFactory $paginator;
 
+    private PersonRepository $personRepository;
+
     private RemoteCalendarConnectorInterface $remoteCalendarConnector;
 
     private SerializerInterface $serializer;
 
-    private UserRepository $userRepository;
+    private UserRepositoryInterface $userRepository;
 
     public function __construct(
-        CalendarRepository $calendarRepository,
         CalendarACLAwareRepositoryInterface $calendarACLAwareRepository,
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         LoggerInterface $logger,
         PaginatorFactory $paginator,
         RemoteCalendarConnectorInterface $remoteCalendarConnector,
         SerializerInterface $serializer,
-        UserRepository $userRepository
+        PersonRepository $personRepository,
+        AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        UserRepositoryInterface $userRepository
     ) {
-        $this->calendarRepository = $calendarRepository;
         $this->calendarACLAwareRepository = $calendarACLAwareRepository;
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->filterOrderHelperFactory = $filterOrderHelperFactory;
         $this->logger = $logger;
         $this->paginator = $paginator;
         $this->remoteCalendarConnector = $remoteCalendarConnector;
         $this->serializer = $serializer;
+        $this->personRepository = $personRepository;
+        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
         $this->userRepository = $userRepository;
     }
 
@@ -83,19 +96,21 @@ class CalendarController extends AbstractController
      */
     public function deleteAction(Request $request, Calendar $entity)
     {
-        $view = null;
         $em = $this->getDoctrine()->getManager();
 
-        $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        $user = null; // TODO legacy code ? remove it ?
+        [$person, $accompanyingPeriod] = [$entity->getPerson(), $entity->getAccompanyingPeriod()];
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = '@ChillCalendar/Calendar/confirm_deleteByAccompanyingCourse.html.twig';
-        } elseif ($user instanceof User) {
-            $view = '@ChillCalendar/Calendar/confirm_deleteByUser.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person instanceof Person) {
+            $view = '@ChillCalendar/Calendar/confirm_deleteByPerson.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+        } else {
+            throw new RuntimeException('nor person or accompanying period');
         }
 
-        $form = $this->createDeleteForm($entity->getId(), $user, $accompanyingPeriod);
+        $form = $this->createDeleteForm($entity);
 
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
@@ -112,20 +127,15 @@ class CalendarController extends AbstractController
                 $this->addFlash('success', $this->get('translator')
                     ->trans('The calendar item has been successfully removed.'));
 
-                $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-
-                return $this->redirectToRoute('chill_calendar_calendar_list_by_period', $params);
+                return new RedirectResponse($redirectRoute);
             }
         }
 
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
         return $this->render($view, [
             'calendar' => $entity,
             'delete_form' => $form->createView(),
             'accompanyingCourse' => $accompanyingPeriod,
+            'person' => $person,
         ]);
     }
 
@@ -140,19 +150,27 @@ class CalendarController extends AbstractController
             return $this->remoteCalendarConnector->getMakeReadyResponse($request->getUri());
         }
 
-        $view = null;
         $em = $this->getDoctrine()->getManager();
 
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
+        [$person, $accompanyingPeriod] = [$entity->getPerson(), $entity->getAccompanyingPeriod()];
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = '@ChillCalendar/Calendar/editByAccompanyingCourse.html.twig';
-        } elseif ($user instanceof User) {
-            throw new Exception('to analyze');
-            $view = '@ChillCalendar/Calendar/editByUser.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person instanceof Person) {
+            $view = '@ChillCalendar/Calendar/editByPerson.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+        } else {
+            throw new RuntimeException('no person nor accompanying period');
+        }
+
+        $form = $this->createForm(CalendarType::class, $entity)
+            ->add('save', SubmitType::class);
+
+        if (0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class)) {
+            $form->add('save_and_create_doc', SubmitType::class);
         }
 
-        $form = $this->createForm(CalendarType::class, $entity);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -160,29 +178,24 @@ class CalendarController extends AbstractController
 
             $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
 
-            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+            if ($form->get('save_and_create_doc')->isClicked()) {
+                return $this->redirectToRoute('chill_calendar_calendardoc_pick_template', ['id' => $entity->getId()]);
+            }
 
-            return $this->redirectToRoute('chill_calendar_calendar_list_by_period', $params);
+            return new RedirectResponse($redirectRoute);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
             $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
         }
 
-        $deleteForm = $this->createDeleteForm($entity->getId(), $user, $accompanyingPeriod);
-
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
         $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
         return $this->render($view, [
             'entity' => $entity,
             'form' => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'accompanyingCourse' => $accompanyingPeriod,
-            //            'user' => $user,
+            'accompanyingCourse' => $entity->getAccompanyingPeriod(),
+            'person' => $entity->getPerson(),
             'entity_json' => $entity_array,
         ]);
     }
@@ -214,6 +227,38 @@ class CalendarController extends AbstractController
             'accompanyingCourse' => $accompanyingPeriod,
             'paginator' => $paginator,
             'filterOrder' => $filterOrder,
+            'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
+        ]);
+    }
+
+    /**
+     * Lists all Calendar entities on a person.
+     *
+     * @Route("/{_locale}/calendar/calendar/by-person/{id}", name="chill_calendar_calendar_list_by_person")
+     */
+    public function listActionByPerson(Person $person): Response
+    {
+        $filterOrder = $this->buildListFilterOrder();
+        ['from' => $from, 'to' => $to] = $filterOrder->getDateRangeData('startDate');
+
+        $total = $this->calendarACLAwareRepository
+            ->countByPerson($person, $from, $to);
+        $paginator = $this->paginator->create($total);
+        $calendarItems = $this->calendarACLAwareRepository->findByPerson(
+            $person,
+            $from,
+            $to,
+            ['startDate' => 'DESC'],
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        return $this->render('@ChillCalendar/Calendar/listByPerson.html.twig', [
+            'calendarItems' => $calendarItems,
+            'person' => $person,
+            'paginator' => $paginator,
+            'filterOrder' => $filterOrder,
+            'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
         ]);
     }
 
@@ -253,30 +298,31 @@ class CalendarController extends AbstractController
         $view = null;
         $em = $this->getDoctrine()->getManager();
 
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        $entity = new Calendar();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = '@ChillCalendar/Calendar/newByAccompanyingCourse.html.twig';
+            $entity->setAccompanyingPeriod($accompanyingPeriod);
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person) {
+            $view = '@ChillCalendar/Calendar/newByPerson.html.twig';
+            $entity->setPerson($person)->addPerson($person);
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
         }
-        // elseif ($user instanceof User) {
-        //     $view = '@ChillCalendar/Calendar/newUser.html.twig';
-        // }
-
-        $entity = new Calendar();
 
         if ($request->query->has('mainUser')) {
             $entity->setMainUser($this->userRepository->find($request->query->getInt('mainUser')));
         }
 
-        // if ($user instanceof User) {
-        //     $entity->setPerson($user);
-        // }
+        $form = $this->createForm(CalendarType::class, $entity)
+            ->add('save', SubmitType::class);
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $entity->setAccompanyingPeriod($accompanyingPeriod);
+        if (0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class)) {
+            $form->add('save_and_create_doc', SubmitType::class);
         }
 
-        $form = $this->createForm(CalendarType::class, $entity);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -285,9 +331,11 @@ class CalendarController extends AbstractController
 
             $this->addFlash('success', $this->get('translator')->trans('Success : calendar item created!'));
 
-            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+            if ($form->get('save_and_create_doc')->isClicked()) {
+                return $this->redirectToRoute('chill_calendar_calendardoc_pick_template', ['id' => $entity->getId()]);
+            }
 
-            return $this->redirectToRoute('chill_calendar_calendar_list_by_period', $params);
+            return new RedirectResponse($redirectRoute);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
@@ -301,7 +349,8 @@ class CalendarController extends AbstractController
         $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
         return $this->render($view, [
-            'user' => $user,
+            'context' => $entity->getContext(),
+            'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
             'form' => $form->createView(),
@@ -316,6 +365,7 @@ class CalendarController extends AbstractController
      */
     public function showAction(Request $request, int $id): Response
     {
+        throw new Exception('not implemented');
         $view = null;
         $em = $this->getDoctrine()->getManager();
 
@@ -450,49 +500,45 @@ class CalendarController extends AbstractController
     /**
      * Creates a form to delete a Calendar entity by id.
      */
-    private function createDeleteForm(int $id, ?User $user, ?AccompanyingPeriod $accompanyingPeriod): FormInterface
+    private function createDeleteForm(Calendar $calendar): FormInterface
     {
-        $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-        $params['id'] = $id;
-
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params))
+            ->setAction($this->generateUrl('chill_calendar_calendar_delete', ['id' => $calendar->getId()]))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }
 
+    /**
+     * @return array{0: ?Person, 1: ?AccompanyingPeriod}
+     */
     private function getEntity(Request $request): array
     {
         $em = $this->getDoctrine()->getManager();
-        $user = $accompanyingPeriod = null;
+        $person = $accompanyingPeriod = null;
 
-        if ($request->query->has('user_id')) {
-            $user_id = $request->get('user_id');
-            $user = $em->getRepository(User::class)->find($user_id);
+        if ($request->query->has('person_id')) {
+            $person = $this->personRepository->find($request->query->getInt('person_id'));
 
-            if (null === $user) {
-                throw $this->createNotFoundException('User not found');
+            if (null === $person) {
+                throw $this->createNotFoundException('Person not found');
             }
 
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user);
+            $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
         } elseif ($request->query->has('accompanying_period_id')) {
-            $accompanying_period_id = $request->get('accompanying_period_id');
-            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
+            $accompanyingPeriod = $this->accompanyingPeriodRepository->find($request->query->getInt('accompanying_period_id'));
 
             if (null === $accompanyingPeriod) {
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingPeriod);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
 
         return [
-            $user, $accompanyingPeriod,
+            $person, $accompanyingPeriod,
         ];
     }
 }

src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use RuntimeException;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Templating\EngineInterface;
+
+class CalendarDocController
+{
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private EngineInterface $engine;
+
+    private Security $security;
+
+    private SerializerInterface $serializer;
+
+    private UrlGeneratorInterface $urlGenerator;
+
+    public function __construct(Security $security, DocGeneratorTemplateRepository $docGeneratorTemplateRepository, UrlGeneratorInterface $urlGenerator, EngineInterface $engine)
+    {
+        $this->security = $security;
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->urlGenerator = $urlGenerator;
+        $this->engine = $engine;
+    }
+
+    /**
+     * @Route("/{_locale}/calendar/docgen/pick/{id}", name="chill_calendar_calendardoc_pick_template")
+     */
+    public function pickTemplate(Calendar $calendar): Response
+    {
+        if (!$this->security->isGranted(CalendarVoter::SEE, $calendar)) {
+            throw new AccessDeniedException('Not authorized to see this calendar');
+        }
+
+        if (0 === $number = $this->docGeneratorTemplateRepository->countByEntity(Calendar::class)) {
+            throw new RuntimeException('should not be redirected to this page if no template');
+        }
+
+        if (1 === $number) {
+            $templates = $this->docGeneratorTemplateRepository->findByEntity(Calendar::class);
+
+            return new RedirectResponse(
+                $this->urlGenerator->generate(
+                    'chill_docgenerator_generate_from_template',
+                    [
+                        'template' => $templates[0]->getId(),
+                        'entityClassName' => Calendar::class,
+                        'entityId' => $calendar->getId(),
+                    ]
+                )
+            );
+        }
+
+        return new Response(
+            $this->engine->render('@ChillCalendar/CalendarDoc/pick_template.html.twig', [
+                'calendar' => $calendar,
+                'accompanyingCourse' => $calendar->getAccompanyingPeriod(),
+            ])
+        );
+    }
+}

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -44,6 +44,9 @@ use function in_array;
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
  * @ORM\Entity
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "chill_calendar_calendar": Calendar::class
+ * })
  */
 class Calendar implements TrackCreationInterface, TrackUpdateInterface
 {
@@ -89,7 +92,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod", inversedBy="calendars")
      */
-    private AccompanyingPeriod $accompanyingPeriod;
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
@@ -109,13 +112,24 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
-     * @Serializer\Groups({"calendar:read", "read"})
+     * @Serializer\Groups({"calendar:read", "read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
 
+    /**
+     * @ORM\Column(type="integer", nullable=false, options={"default": 0})
+     */
+    private int $dateTimeVersion = 0;
+
+    /**
+     * @var Collection<CalendarDoc::class>
+     * @ORM\OneToMany(targetEntity=CalendarDoc::class, mappedBy="calendar", orphanRemoval=true)
+     */
+    private Collection $documents;
+
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      * @Assert\NotNull(message="calendar.An end date is required")
      */
     private ?DateTimeImmutable $endDate = null;
@@ -124,7 +138,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      */
     private ?int $id = null;
 
@@ -136,29 +150,35 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
      *     cascade={"persist", "remove", "merge", "detach"}
      * )
      * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private Collection $invites;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\NotNull(message="calendar.A location is required")
      */
     private ?Location $location = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      * @Assert\NotNull(message="calendar.A main user is mandatory")
      */
     private ?User $mainUser = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Person $person = null;
+
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person", inversedBy="calendars")
      * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      * @Assert\Count(min=1, minMessage="calendar.At least {{ limit }} person is required.")
      */
@@ -173,13 +193,14 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
      * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      */
     private Collection $professionals;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"docgen:read"})
      */
     private ?bool $sendSMS = false;
 
@@ -190,7 +211,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
-     * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      * @Assert\NotNull(message="calendar.A start date is required")
      */
@@ -203,15 +224,34 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
      */
     private string $status = self::STATUS_VALID;
 
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"docgen:read"})
+     */
+    private ?bool $urgent = false;
+
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
+        $this->documents = new ArrayCollection();
         $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
     }
 
+    /**
+     * @internal use @{CalendarDoc::__construct} instead
+     */
+    public function addDocument(CalendarDoc $calendarDoc): self
+    {
+        if ($this->documents->contains($calendarDoc)) {
+            $this->documents[] = $calendarDoc;
+        }
+
+        return $this;
+    }
+
     /**
      * @internal Use {@link (Calendar::addUser)} instead
      */
@@ -277,6 +317,38 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
         return $this->comment;
     }
 
+    /**
+     * @return 'person'|'accompanying_period'|null
+     */
+    public function getContext(): ?string
+    {
+        if ($this->getAccompanyingPeriod() !== null) {
+            return 'accompanying_period';
+        }
+
+        if ($this->getPerson() !== null) {
+            return 'person';
+        }
+
+        return null;
+    }
+
+    /**
+     * Each time the date and time is update, this version is incremented.
+     */
+    public function getDateTimeVersion(): int
+    {
+        return $this->dateTimeVersion;
+    }
+
+    public function getDocuments(): Collection
+    {
+        return $this->documents;
+    }
+
+    /**
+     * @Serializer\Groups({"docgen:read"})
+     */
     public function getDuration(): ?DateInterval
     {
         if ($this->getStartDate() === null || $this->getEndDate() === null) {
@@ -329,6 +401,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
         return $this->mainUser;
     }
 
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
     /**
      * @return Collection|Person[]
      */
@@ -409,6 +486,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
         return $this->getProfessionals();
     }
 
+    public function getUrgent(): ?bool
+    {
+        return $this->urgent;
+    }
+
     /**
      * @return Collection|User[]
      * @Serializer\Groups({"calendar:read", "read"})
@@ -454,6 +536,18 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
         ]));
     }
 
+    /**
+     * @internal use @{CalendarDoc::setCalendar} with null instead
+     */
+    public function removeDocument(CalendarDoc $calendarDoc): self
+    {
+        if ($calendarDoc->getCalendar() !== $this) {
+            throw new LogicException('cannot remove document of another calendar');
+        }
+
+        return $this;
+    }
+
     /**
      * @internal Use {@link (Calendar::removeUser)} instead
      */
@@ -544,6 +638,10 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
 
     public function setEndDate(DateTimeImmutable $endDate): self
     {
+        if (null === $this->endDate || $this->endDate->getTimestamp() !== $endDate->getTimestamp()) {
+            $this->increaseaDatetimeVersion();
+        }
+
         $this->endDate = $endDate;
 
         return $this;
@@ -568,6 +666,13 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    public function setPerson(?Person $person): Calendar
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
     public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
@@ -591,6 +696,10 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
 
     public function setStartDate(DateTimeImmutable $startDate): self
     {
+        if (null === $this->startDate || $this->startDate->getTimestamp() !== $startDate->getTimestamp()) {
+            $this->increaseaDatetimeVersion();
+        }
+
         $this->startDate = $startDate;
 
         return $this;
@@ -606,4 +715,16 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
+
+    public function setUrgent(bool $urgent): self
+    {
+        $this->urgent = $urgent;
+
+        return $this;
+    }
+
+    private function increaseaDatetimeVersion(): void
+    {
+        ++$this->dateTimeVersion;
+    }
 }

src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php

@@ -0,0 +1,135 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Entity;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(
+ *     name="chill_calendar.calendar_doc",
+ * )
+ */
+class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Calendar::class, inversedBy="documents")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private Calendar $calendar;
+
+    /**
+     * @ORM\Column(type="integer", nullable=false, options={"default": 0})
+     */
+    private int $datetimeVersion = 0;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=StoredObject::class, cascade={"persist"})
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private StoredObject $storedObject;
+
+    /**
+     * @ORM\Column(type="boolean", nullable=false, options={"default": false})
+     */
+    private bool $trackDateTimeVersion = false;
+
+    public function __construct(Calendar $calendar, StoredObject $storedObject)
+    {
+        $this->setCalendar($calendar);
+
+        $this->storedObject = $storedObject;
+        $this->datetimeVersion = $calendar->getDateTimeVersion();
+    }
+
+    public function getCalendar(): Calendar
+    {
+        return $this->calendar;
+    }
+
+    public function getDatetimeVersion(): int
+    {
+        return $this->datetimeVersion;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStoredObject(): StoredObject
+    {
+        return $this->storedObject;
+    }
+
+    public function isTrackDateTimeVersion(): bool
+    {
+        return $this->trackDateTimeVersion;
+    }
+
+    /**
+     * @internal use @see{Calendar::removeDocument} instead
+     *
+     * @param Calendar $calendar
+     */
+    public function setCalendar(?Calendar $calendar): CalendarDoc
+    {
+        if (null === $calendar) {
+            $this->calendar->removeDocument($this);
+        } else {
+            $calendar->addDocument($this);
+        }
+
+        $this->calendar = $calendar;
+
+        $this->datetimeVersion = $calendar->getDateTimeVersion();
+
+        return $this;
+    }
+
+    public function setDatetimeVersion(int $datetimeVersion): CalendarDoc
+    {
+        $this->datetimeVersion = $datetimeVersion;
+
+        return $this;
+    }
+
+    public function setStoredObject(StoredObject $storedObject): CalendarDoc
+    {
+        $this->storedObject = $storedObject;
+
+        return $this;
+    }
+
+    public function setTrackDateTimeVersion(bool $trackDateTimeVersion): CalendarDoc
+    {
+        $this->trackDateTimeVersion = $trackDateTimeVersion;
+
+        return $this;
+    }
+}

src/Bundle/ChillCalendarBundle/Entity/Invite.php

@@ -73,14 +73,14 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": "pending"})
-     * @Serializer\Groups(groups={"calendar:read", "read"})
+     * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private string $status = self::PENDING;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @ORM\JoinColumn(nullable=false)
-     * @Serializer\Groups(groups={"calendar:read", "read"})
+     * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private ?User $user = null;
 

src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php

@@ -42,18 +42,11 @@ final class AgentAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.user', 'caluser');
+            $qb->join('cal.mainUser', 'caluser');
         }
 
         $qb->addSelect('caluser.id AS agent_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('agent_aggregator');
-        } else {
-            $qb->groupBy('agent_aggregator');
-        }
+        $qb->addGroupBy('agent_aggregator');
     }
 
     public function applyOn(): string
@@ -86,6 +79,6 @@ final class AgentAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by agent';
+        return 'Group calendars by agent';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php

@@ -41,20 +41,13 @@ class CancelReasonAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        // TODO: still needs to take into account appointments without a cancel reason somehow
+        // TODO: still needs to take into account calendars without a cancel reason somehow
         if (!in_array('calcancel', $qb->getAllAliases(), true)) {
             $qb->join('cal.cancelReason', 'calcancel');
         }
 
         $qb->addSelect('IDENTITY(cal.cancelReason) as cancel_reason_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('cancel_reason_aggregator');
-        } else {
-            $qb->groupBy('cancel_reason_aggregator');
-        }
+        $qb->addGroupBy('cancel_reason_aggregator');
     }
 
     public function applyOn(): string
@@ -89,6 +82,6 @@ class CancelReasonAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by cancel reason';
+        return 'Group calendars by cancel reason';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -42,18 +42,11 @@ final class JobAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.user', 'caluser');
+            $qb->join('cal.mainUser', 'caluser');
         }
 
         $qb->addSelect('IDENTITY(caluser.userJob) as job_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
+        $qb->addGroupBy('job_aggregator');
     }
 
     public function applyOn(): string
@@ -88,6 +81,6 @@ final class JobAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by agent job';
+        return 'Group calendars by agent job';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php

@@ -40,14 +40,7 @@ final class LocationAggregator implements AggregatorInterface
             $qb->join('cal.location', 'calloc');
         }
         $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_aggregator');
-        } else {
-            $qb->groupBy('location_aggregator');
-        }
+        $qb->addGroupBy('location_aggregator');
     }
 
     public function applyOn(): string
@@ -80,6 +73,6 @@ final class LocationAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by location';
+        return 'Group calendars by location';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php

@@ -46,14 +46,7 @@ final class LocationTypeAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('IDENTITY(calloc.locationType) as location_type_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_type_aggregator');
-        } else {
-            $qb->groupBy('location_type_aggregator');
-        }
+        $qb->addGroupBy('location_type_aggregator');
     }
 
     public function applyOn(): string
@@ -88,6 +81,6 @@ final class LocationTypeAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by location type';
+        return 'Group calendars by location type';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php

@@ -28,13 +28,7 @@ class MonthYearAggregator implements AggregatorInterface
     {
         $qb->addSelect("to_char(cal.startDate, 'MM-YYYY') AS month_year_aggregator");
         // $qb->addSelect("extract(month from age(cal.startDate, cal.endDate)) AS month_aggregator");
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('month_year_aggregator');
-        } else {
-            $qb->groupBy('month_year_aggregator');
-        }
+        $qb->addGroupBy('month_year_aggregator');
     }
 
     public function applyOn(): string
@@ -54,10 +48,7 @@ class MonthYearAggregator implements AggregatorInterface
                 return 'by month and year';
             }
 
-            $month = substr($value, 0, 2);
-            $year = substr($value, 3, 4);
-
-            return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
+            return $value;
         };
     }
 
@@ -68,6 +59,6 @@ class MonthYearAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by month and year';
+        return 'Group calendars by month and year';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -42,18 +42,11 @@ final class ScopeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.user', 'caluser');
+            $qb->join('cal.mainUser', 'caluser');
         }
 
         $qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
+        $qb->addGroupBy('scope_aggregator');
     }
 
     public function applyOn(): string
@@ -88,6 +81,6 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group appointments by agent scope';
+        return 'Group calendars by agent scope';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php

@@ -0,0 +1,96 @@
+<?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);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class UrgencyAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect('cal.urgent AS urgency_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('urgency_aggregator');
+        } else {
+            $qb->groupBy('urgency_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Urgency';
+            }
+
+            switch ($value) {
+                case true:
+                    return $this->translator->trans('is urgent');
+
+                case false:
+                    return $this->translator->trans('is not urgent');
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['urgency_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group calendars by urgency';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php

@@ -21,10 +21,9 @@ use Closure;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Process\Exception\LogicException;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Exception\LogicException;
 
-class CountAppointments implements ExportInterface, GroupedExportInterface
+class CountCalendars implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
@@ -45,7 +44,7 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
 
     public function getDescription(): string
     {
-        return 'Count appointments by various parameters.';
+        return 'Count calendars by various parameters.';
     }
 
     public function getGroup(): string
@@ -72,14 +71,14 @@ class CountAppointments implements ExportInterface, GroupedExportInterface
         return ['export_result'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
     {
-        return 'Count appointments';
+        return 'Count calendars';
     }
 
     public function getType(): string

src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php

@@ -22,7 +22,7 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterface
+class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
@@ -44,7 +44,7 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
 
     public function getDescription(): string
     {
-        return 'Get the average of appointment duration according to various filters';
+        return 'Get the average of calendar duration according to various filters';
     }
 
     public function getGroup(): string
@@ -71,14 +71,14 @@ class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterf
         return ['export_result'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
     {
-        return 'Average appointment duration';
+        return 'Average calendar duration';
     }
 
     public function getType(): string

src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php

@@ -22,7 +22,7 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterface
+class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
@@ -44,7 +44,7 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
 
     public function getDescription(): string
     {
-        return 'Get the sum of appointment durations according to various filters';
+        return 'Get the sum of calendar durations according to various filters';
     }
 
     public function getGroup(): string
@@ -71,14 +71,14 @@ class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterf
         return ['export_result'];
     }
 
-    public function getResult($qb, $data)
+    public function getResult($query, $data)
     {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
     public function getTitle(): string
     {
-        return 'Sum of appointment durations';
+        return 'Sum of calendar durations';
     }
 
     public function getType(): string

src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php

@@ -37,7 +37,7 @@ class AgentFilter implements FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('cal.user', ':agents');
+        $clause = $qb->expr()->in('cal.mainUser', ':agents');
 
         if ($where instanceof Andx) {
             $where->add($clause);
@@ -76,12 +76,12 @@ class AgentFilter implements FilterInterface
 
         return [
             'Filtered by agent: only %agents%', [
-                '%agents' => implode(', ou ', $users),
+                '%agents' => implode(', ', $users),
             ], ];
     }
 
     public function getTitle(): string
     {
-        return 'Filter appointments by agent';
+        return 'Filter calendars by agent';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php

@@ -66,7 +66,7 @@ class BetweenDatesFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string'): array
     {
-        return ['Filtered by appointments between %dateFrom% and %dateTo%', [
+        return ['Filtered by calendars between %dateFrom% and %dateTo%', [
             '%dateFrom%' => $data['date_from']->format('d-m-Y'),
             '%dateTo%' => $data['date_to']->format('d-m-Y'),
         ]];
@@ -74,6 +74,6 @@ class BetweenDatesFilter implements FilterInterface
 
     public function getTitle(): string
     {
-        return 'Filter appointments between certain dates';
+        return 'Filter calendars between certain dates';
     }
 }

src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php

@@ -0,0 +1,109 @@
+<?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);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Export\Filter;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+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 CalendarRangeFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'Not made within a calendar range' => true,
+        'Made within a calendar range' => false,
+    ];
+
+    private const DEFAULT_CHOICE = false;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        dump($data);
+
+        if ($data['hasCalendarRange']) {
+            $clause = $qb->expr()->isNotNull('cal.calendarRange');
+        } else {
+            $clause = $qb->expr()->isNull('cal.calendarRange');
+        }
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('hasCalendarRange', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'label' => 'has calendar range',
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['hasCalendarRange']) {
+                $choice = $k;
+            } else {
+                $choice = 'Not made within a calendar range';
+            }
+        }
+
+        return [
+            'Filtered by calendar range: only %calendarRange%', [
+                '%calendarRange%' => $this->translator->trans($choice),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by calendar range';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -44,7 +44,7 @@ class JobFilter implements FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.user', 'caluser');
+            $qb->join('cal.mainUser', 'caluser');
         }
 
         $where = $qb->getDQLPart('where');
@@ -90,12 +90,12 @@ class JobFilter implements FilterInterface
         }
 
         return ['Filtered by agent job: only %jobs%', [
-            '%jobs%' => implode(', ou ', $userJobs),
+            '%jobs%' => implode(', ', $userJobs),
         ]];
     }
 
     public function getTitle(): string
     {
-        return 'Filter appointments by agent job';
+        return 'Filter calendars by agent job';
     }
 }