master merged into branch

for docgen rendering

.editorconfig

@@ -18,3 +18,10 @@ max_line_length = 80
 
 [COMMIT_EDITMSG]
 max_line_length = 0
+<<<<<<< Updated upstream
+=======
+
+[*.{js, vue, ts}]
+indent_size = 2
+indent_style = space
+>>>>>>> Stashed changes

.gitignore

@@ -22,3 +22,4 @@ docs/build/
 
 /.php-cs-fixer.cache
 /.idea/
+/.psalm/

CHANGELOG.md

@@ -11,9 +11,122 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [workflow]: added pagination to workflow list page
+* [homepage_widget]: null error on tasks widget fixed
+* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
+* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
+* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
+* [filiation]: Allow the deletion of a relationship in filiations (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/608)
+* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
+
+## Test releases
+
+### 2022-05-30
+
+* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
+
+### 2022-05-27
+
+* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
+* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
+* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
+* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
+* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
+* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
+* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
+* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+
+
+### 2022-05-06
+
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
+### 2021-04-29
+
+* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
+* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
+* Load relationships without gender in french fixtures
+* Add command to remove old draft accompanying periods
+* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
+
+### 2021-04-28
+
+* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
+* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
+* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
+* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
+* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
+
+### 2021-04-26
+
+* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
+* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
+
+### 2021-04-24
+
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
+* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
+* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
+* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
+* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
+* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
+* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
+* [Notifications] delay the sending of notificaiton to kernel.terminate
+* [Notifications / Period user change] fix the sending of notification when user changes
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
+
+
+### 2021-04-13
+
+* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
+* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
+* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
+* [docgen] add a new context with a list of activities in course
+* [docgen] add a comment in budget lines
+* [notifications] allow to send a notification to an email address. The address receive an access link
+* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
+* [accompanying work editor] add a label on document title input
+
+### 2021-04-07
+
+* notification list: move action buttons outside of the toggle
+* fix detecting of non-read notification
+* filter users which are disabled in search user api
+* order query for location and add pagination in list
+* allow every person which has part for a workflow  to see the workflow page
+* able to see the workflow if the evaluation document has been deleted
+* hardcode the list of supported mime types for edition with collabora
+* list of accompanying course: allow to see the pinned comment in list_item
+
+### 2021-04-06
+
+* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
+* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
+* [activity] espace entre les boutons pour supprimer les documents
+
+
+### continuous release in February and March
+
+* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
 * [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
-
 * [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
 * [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
 * [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
@@ -52,6 +165,7 @@ and this project adheres to
 * [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
+* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 * [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
@@ -79,6 +193,7 @@ and this project adheres to
 * [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
 * [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
 
+* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
 ## Test releases
 
 ### test release 2022-02-21
@@ -107,8 +222,6 @@ and this project adheres to
 * [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
 
 
-## Test releases
-* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
 
 ### test release 2022-02-14
 
@@ -135,6 +248,7 @@ and this project adheres to
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
 * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
 * [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
 
 ### test release 2021-02-01
@@ -157,18 +271,9 @@ and this project adheres to
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
 * [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-
-
-## Test releases
-=======
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
->>>>>>> issue422_and_others_on_AddPersons
 
-=======
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
->>>>>>> b0d50d315c8e00959a967badac9cf5057ab2b4bc
 ### test release 2021-01-31
 
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)

CONVENTIONS.md

@@ -2,7 +2,14 @@
 
 en cours de rédaction
 
+## Translations
 
+
+Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
+
+## Emplacement des fichiers
+
+Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
 ## Assets: nommage des entrypoints
 
 Trois types d'entrypoint:
@@ -146,19 +153,20 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai
 
 Les routes sont nommées de cette manière:
 
-`chill_bundle_entite_action`
+`chill_(api|crud)_bundle_(api)_entite_action`
 
 1. d'abord chill_ (pour tous les modules chill)
-2. ensuite une string qui est identique, par bundle
-3. si le point est un point d'api (json), alors ajouter la string `api`
-4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
-5. ensuite une action (`list`, `view`, `edit`, `new`, ...)
+2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
+3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
+4. ensuite, `api`, si la route est une route d'api.
+5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
+6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
 
-Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
 
 Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.
 
-### URL
+### Nommage des URL
 
 Les URL respectent également une convention:
 
@@ -219,6 +227,14 @@ Les éléments suivants devraient se trouver dans la liste:
 
 Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.
 
+#### Pour les URL de l'espace Admin
+
+Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
+
+
+`/{_locale}/admin/bundle/entity/{id}/action`
+
+
 ## Règles UI chill
 
 ### Titre des pages

composer.json

@@ -10,8 +10,8 @@
     "require": {
         "php": "^7.4",
         "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
-        "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
-        "champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
+        "champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
+        "champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
         "doctrine/doctrine-bundle": "^2.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.7",
@@ -21,7 +21,7 @@
         "knplabs/knp-time-bundle": "^1.12",
         "league/csv": "^9.7.1",
         "nyholm/psr7": "^1.4",
-        "ocramius/package-versions": "^1.10",
+        "ocramius/package-versions": "^1.10 || ^2",
         "odolbeau/phone-number-bundle": "^3.6",
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
@@ -33,6 +33,7 @@
         "symfony/expression-language": "^4.4",
         "symfony/form": "^4.4",
         "symfony/framework-bundle": "^4.4",
+        "symfony/http-foundation": "^4.4",
         "symfony/intl": "^4.4",
         "symfony/mailer": "^5.4",
         "symfony/mime": "^5.4",
@@ -44,6 +45,7 @@
         "symfony/translation": "^4.4",
         "symfony/twig-bundle": "^4.4",
         "symfony/validator": "^4.4",
+        "symfony/web-link": "*",
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^4.4",
         "symfony/yaml": "^4.4",
@@ -94,7 +96,8 @@
     "autoload-dev": {
         "psr-4": {
             "App\\": "tests/app/src/",
-            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
+            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
+            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
         }
     },
     "config": {
@@ -103,7 +106,8 @@
             "ergebnis/composer-normalize": true,
             "ocramius/package-versions": true,
             "phpro/grumphp": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "roave/you-are-using-it-wrong": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,

docs/source/installation/index.rst

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

grumphp.yml

@@ -24,6 +24,7 @@ parameters:
         - "/spec/"
         - "/var/"
         - "/vendor/"
+        - "/tests/app"
 
     # Psalm
     tasks.psalm.blocking: true

phpstan-critical.neon

@@ -5,11 +5,6 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
-        -
-            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
-            count: 3
-            path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
         -
             message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
             count: 1

phpstan-types.neon

@@ -25,16 +25,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 
-		-
-			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -450,11 +440,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
-
 		-
 			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1

phpstan.neon.dist

@@ -3,6 +3,7 @@ parameters:
     paths:
         - src/
     excludePaths:
+        - .php_cs*
         - docs/
         - src/Bundle/*/Tests/*
         - src/Bundle/*/tests/*

phpunit.xml.dist

@@ -40,6 +40,9 @@
         <testsuite name="DocGeneratorBundle">
             <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
         </testsuite>
+        <testsuite name="WopiBundle">
+            <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
+        </testsuite>
     </testsuites>
 
     <listeners>

psalm.xml

@@ -6,6 +6,7 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    cacheDirectory="./.psalm"
 >
     <projectFiles>
         <directory name="src" />
@@ -13,4 +14,15 @@
             <directory name="./tests/" />
         </ignoreFiles>
     </projectFiles>
+
+    <!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
+    <!-- maybe to desactivate with php 8.1 ? -->
+    <issueHandlers>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <referencedClass name="UnitEnum" />
+            </errorLevel>
+        </UndefinedDocblockClass>
+    </issueHandlers>
+
 </psalm>

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -21,6 +21,7 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -56,6 +57,8 @@ final class ActivityController extends AbstractController
 
     private ActivityTypeRepository $activityTypeRepository;
 
+    private CenterResolverManagerInterface $centerResolver;
+
     private EntityManagerInterface $entityManager;
 
     private EventDispatcherInterface $eventDispatcher;
@@ -82,7 +85,8 @@ final class ActivityController extends AbstractController
         EntityManagerInterface $entityManager,
         EventDispatcherInterface $eventDispatcher,
         LoggerInterface $logger,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        CenterResolverManagerInterface $centerResolver
     ) {
         $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->activityTypeRepository = $activityTypeRepository;
@@ -96,6 +100,7 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
         $this->serializer = $serializer;
+        $this->centerResolver = $centerResolver;
     }
 
     /**
@@ -198,7 +203,7 @@ final class ActivityController extends AbstractController
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
             'role' => new Role('CHILL_ACTIVITY_UPDATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
@@ -416,7 +421,7 @@ final class ActivityController extends AbstractController
         $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
             'role' => new Role('CHILL_ACTIVITY_CREATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
+        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
 
         return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
             'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
 
         return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
             'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                 ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                 ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                 ActivityVoter::FULL => [
-                    ActivityVoter::CREATE_PERSON,
-                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                     ActivityVoter::DELETE,
                     ActivityVoter::UPDATE,
                 ],

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -15,8 +15,9 @@ use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -35,6 +36,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class Activity.
@@ -53,7 +55,7 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
  *     getUserFunction="getUser",
  * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
 {
     public const SENTRECEIVED_RECEIVED = 'received';
 
@@ -93,6 +95,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     * @Assert\Valid(traverse=true)
      */
     private Collection $documents;
 
@@ -132,6 +135,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private ?Collection $persons = null;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      * @Groups({"docgen:read"})
@@ -191,6 +199,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->documents = new ArrayCollection();
@@ -231,11 +240,22 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;
+            $this->ensureSocialActionConsistency();
         }
 
         return $this;
     }
 
+    /**
+     * Add a social issue.
+     *
+     * Note: the social issue consistency (the fact that only yougest social issues
+     * are kept) is processed by an entity listener:
+     *
+     * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
+     *
+     * @return $this
+     */
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
@@ -286,13 +306,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * get the center
      * center is extracted from person.
      */
-    public function getCenter(): ?Center
+    public function getCenters(): iterable
     {
         if ($this->person instanceof Person) {
-            return $this->person->getCenter();
+            return [$this->person->getCenter()];
         }
 
-        return null;
+        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            return $this->getAccompanyingPeriod()->getCenters() ?? [];
+        }
+
+        return [];
     }
 
     public function getComment(): CommentEmbeddable
@@ -387,6 +411,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getReasons(): Collection
     {
         return $this->reasons;
@@ -397,6 +426,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->scope;
     }
 
+    public function getScopes(): iterable
+    {
+        if (null !== $this->getAccompanyingPeriod()) {
+            return $this->getAccompanyingPeriod()->getScopes();
+        }
+
+        if (null !== $this->getPerson()) {
+            return [$this->scope];
+        }
+
+        return [];
+    }
+
     public function getSentReceived(): string
     {
         return $this->sentReceived;
@@ -573,6 +615,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setReasons(?ArrayCollection $reasons): self
     {
         $this->reasons = $reasons;
@@ -631,4 +680,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
         return $this;
     }
+
+    private function ensureSocialActionConsistency(): void
+    {
+        $ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
+
+        foreach ($ancestors as $ancestor) {
+            $this->removeSocialAction($ancestor);
+        }
+    }
 }

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -167,6 +167,16 @@ class ActivityType
      */
     private int $personVisible = self::FIELD_REQUIRED;
 
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -416,6 +426,16 @@ class ActivityType
         return $this->personVisible;
     }
 
+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
     public function getReasonsLabel(): string
     {
         return $this->reasonsLabel;
@@ -688,6 +708,20 @@ class ActivityType
         return $this;
     }
 
+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
     public function setReasonsLabel(string $reasonsLabel): self
     {
         $this->reasonsLabel = $reasonsLabel;

src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php

@@ -66,9 +66,6 @@ class ActivityEntityListener
                     $newAction->addPerson($person);
                 }
 
-                foreach ($associatedThirdparties as $thirdparty) {
-                    $newAction->setHandlingThierparty($thirdparty);
-                }
                 $this->em->persist($newAction);
                 $this->em->flush();
             }

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -14,16 +14,20 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -49,6 +53,7 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
+use Symfony\Component\Security\Core\Role\Role;
 use function in_array;
 
 class ActivityType extends AbstractType
@@ -108,19 +113,18 @@ class ActivityType extends AbstractType
         $activityType = $options['activityType'];
 
         // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center']) {
+        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
-                'role' => $options['role'],
-                // TODO make required again once scope and rights are fixed
-                'required' => false,
+                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
+                'required' => true,
             ]);
         }
 
         /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
         $accompanyingPeriod = null;
 
-        if ($options['accompanyingPeriod']) {
+        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
 
@@ -217,12 +221,10 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        if ($activityType->isVisible('user') && $options['center']) {
-            $builder->add('user', UserPickerType::class, [
+        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
+            $builder->add('user', PickUserDynamicType::class, [
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
-                'center' => $options['center'],
-                'role' => $options['role'],
             ]);
         }
 
@@ -251,6 +253,13 @@ class ActivityType extends AbstractType
             ]);
         }
 
+        if ($activityType->isVisible('privateComment')) {
+            $builder->add('privateComment', PrivateCommentType::class, [
+                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
+                'required' => false,
+            ]);
+        }
+
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
             $builder->get('persons')
@@ -313,6 +322,7 @@ class ActivityType extends AbstractType
                 'button_add_label' => 'activity.Insert a document',
                 'button_remove_label' => 'activity.Remove a document',
                 'empty_collection_explain' => 'No documents',
+                'entry_options' => ['has_title' => true],
             ]);
         }
 
@@ -373,8 +383,8 @@ class ActivityType extends AbstractType
                 'label' => $activityType->getLabel('sentReceived'),
                 'required' => $activityType->isRequired('sentReceived'),
                 'choices' => [
-                    'Sent' => Activity::SENTRECEIVED_SENT,
                     'Received' => Activity::SENTRECEIVED_RECEIVED,
+                    'Sent' => Activity::SENTRECEIVED_SENT,
                 ],
             ]);
         }
@@ -433,8 +443,8 @@ class ActivityType extends AbstractType
 
         $resolver
             ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+            ->setAllowedTypes('center', ['null', Center::class])
+            ->setAllowedTypes('role', [Role::class, 'string'])
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
             ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
         $fields = [
             'persons', 'user', 'date', 'location', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
             'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
@@ -69,6 +69,9 @@ class ActivityTypeType extends AbstractType
                     'empty_data' => '',
                 ]);
         }
+
+        $builder
+            ->add('commentVisible', ActivityFieldPresence::class);
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -15,8 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
     private Security $security;
@@ -32,27 +30,38 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-            $menu->addChild('Activities', [
-                'route' => 'chill_admin_activity_index',
-            ])
-                ->setExtras([
-                    'order' => 2000,
-                    'explain' => 'Activity configuration',
-                ]);
-        } else {
-            $menu
-                ->addChild('Activities', [
-                    'route' => 'chill_admin_activity_index',
-                ])
-                ->setExtras([
-                    'order' => '60',
-                ]);
-        }
+        $menu->addChild('Activities', [
+            'route' => 'chill_activity_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 5000,
+                'icons' => ['exchange'],
+            ]);
+
+        $menu->addChild('Activity Reasons', [
+            'route' => 'chill_activity_activityreason',
+        ])->setExtras(['order' => 5010]);
+
+        $menu->addChild('Activity Reasons Category', [
+            'route' => 'chill_activity_activityreasoncategory',
+        ])->setExtras(['order' => 5020]);
+
+        $menu->addChild('Activity type', [
+            'route' => 'chill_activity_type_admin',
+        ])->setExtras(['order' => 5030]);
+
+        $menu->addChild('Activity Presences', [
+            'route' => 'chill_crud_activity_presence_index',
+        ])->setExtras(['order' => 5040]);
+
+        $menu->addChild('Activity Types Categories', [
+            'route' => 'chill_activity_type_category_admin',
+        ])->setExtras(['order' => 5050]);
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'admin_activity'];
+        return ['admin_section', 'admin_activity'];
     }
 }

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -12,13 +12,20 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
@@ -72,6 +79,86 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
+    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
+    {
+        $rsm = new ResultSetMappingBuilder($this->em);
+
+        $sql = '
+        SELECT
+            a.id AS activity_id,
+            date,
+            CASE WHEN durationtime IS NOT NULL THEN (EXTRACT(EPOCH from durationtime) / 60)::int ELSE 0 END AS durationtimeminute,
+            attendee_id,
+            comment_comment,
+            emergency,
+            sentreceived,
+            CASE WHEN traveltime IS NOT NULL THEN (EXTRACT(EPOCH from traveltime) / 60)::int ELSE 0 END AS traveltimeminute,
+            t.id AS type_id, t.name as type_name,
+            p.id AS presence_id, p.name AS presence_name,
+            location.id AS location_id, location.address_id, location.name AS location_name, location.phonenumber1, location.phonenumber2, location.email,
+            location.locationtype_id, locationtype.title AS locationtype_title,
+            users.userids AS userids,
+            thirdparties.thirdpartyids,
+            persons.personids,
+            actions.socialactionids,
+            issues.socialissueids
+
+        FROM activity a
+        LEFT JOIN chill_main_location location ON a.location_id = location.id
+        LEFT JOIN chill_main_location_type locationtype ON location.locationtype_id = locationtype.id
+        LEFT JOIN activitytpresence p ON a.attendee_id = p.id
+        LEFT JOIN activitytype t ON a.type_id = t.id
+        LEFT JOIN LATERAL (SELECT jsonb_agg(user_id) userids, activity_id FROM activity_user AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS users ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(thirdparty_id) thirdpartyids, activity_id FROM activity_thirdparty AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS thirdparties ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(person_id) personids, activity_id FROM activity_person AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS persons ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(socialaction_id) socialactionids, activity_id FROM chill_activity_activity_chill_person_socialaction AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS actions ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(socialissue_id) socialissueids, activity_id FROM chill_activity_activity_chill_person_socialissue AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS issues ON TRUE
+
+        WHERE accompanyingperiod_id = ?
+        ORDER BY a.date DESC, a.id DESC
+        LIMIT ?
+        ';
+
+        $rsm
+            ->addEntityResult(Activity::class, 'a')
+            ->addFieldResult('a', 'activity_id', 'id')
+            ->addFieldResult('a', 'date', 'date')
+            ->addFieldResult('a', 'comment', 'comment')
+            ->addFieldResult('a', 'sentreceived', 'sentReceived')
+            ->addFieldResult('a', 'emergency', 'emergency')
+            ->addJoinedEntityResult(Location::class, 'location', 'a', 'location')
+            ->addFieldResult('location', 'location_id', 'id')
+            ->addFieldResult('location', 'location_name', 'name')
+            ->addFieldResult('location', 'phonenumber1', 'phonenumber1')
+            ->addFieldResult('location', 'phonenumber2', 'phonenumber2')
+            ->addFieldResult('location', 'email', 'email')
+            ->addJoinedEntityResult(LocationType::class, 'locationType', 'location', 'locationType')
+            ->addFieldResult('locationType', 'locationtype_id', 'id')
+            ->addFieldResult('locationType', 'locationtype_title', 'title')
+            ->addJoinedEntityResult(ActivityType::class, 'activityType', 'a', 'activityType')
+            ->addFieldResult('activityType', 'type_id', 'id')
+            ->addFieldResult('activityType', 'type_name', 'name')
+            ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
+            ->addFieldResult('activityPresence', 'presence_id', 'id')
+            ->addFieldResult('activityPresence', 'presence_name', 'name')
+
+            // results which cannot be mapped into entity
+            ->addScalarResult('comment_comment', 'comment', Types::TEXT)
+            ->addScalarResult('userids', 'userIds', Types::JSON)
+            ->addScalarResult('thirdpartyids', 'thirdPartyIds', Types::JSON)
+            ->addScalarResult('personids', 'personIds', Types::JSON)
+            ->addScalarResult('socialactionids', 'socialActionIds', Types::JSON)
+            ->addScalarResult('socialissueids', 'socialIssueIds', Types::JSON)
+            ->addScalarResult('durationtimeminute', 'durationTimeMinute', Types::INTEGER)
+            ->addScalarResult('traveltimeminute', 'travelTimeMinute', Types::INTEGER);
+
+        $nq = $this->em->createNativeQuery($sql, $rsm);
+
+        $nq->setParameter(0, $period->getId())->setParameter(1, $limit);
+
+        return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
+    }
+
     /**
      * @param array $orderBy
      *

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -21,6 +21,15 @@ interface ActivityACLAwareRepositoryInterface
      */
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
 
+    /**
+     * Return a list of activities, simplified as array (not object).
+     *
+     * The aim of this method is to get a long list of activities and keep performance.
+     *
+     * @return array an array of array, each item representing an activity
+     */
+    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
+
     /**
      * @return Activity[]|array
      */

src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss

@@ -4,6 +4,13 @@ div.chill-dropzone__below-zone {
     }
 }
 
+ul[data-collection-name="documents"] {
+    button.remove-entry {
+        margin: 0.5rem 0!important;
+    }
+}
+
+
 // do it in js does not work
 // document.addEventListener('DOMContentLoaded', e => {
 //     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -54,19 +54,19 @@
                {{ $t('activity.select_first_a_social_issue') }}
             </span>
 
-             <template v-else-if="socialActionsList.length > 0">
-                 <check-social-action
-                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
-                     v-for="action in socialActionsList"
-                     :key="action.id"
-                     :action="action"
-                     :selection="socialActionsSelected"
-                     @updateSelected="updateActionsSelected">
-                 </check-social-action>
-             </template>
+            <template v-else-if="socialActionsList.length > 0">
+               <check-social-action
+                  v-if="socialIssuesSelected.length || socialActionsSelected.length"
+                  v-for="action in socialActionsList"
+                  :key="action.id"
+                  :action="action"
+                  :selection="socialActionsSelected"
+                  @updateSelected="updateActionsSelected">
+               </check-social-action>
+            </template>
 
             <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
-                {{ $t('activity.social_action_list_empty') }}
+               {{ $t('activity.social_action_list_empty') }}
             </span>
 
 
@@ -111,7 +111,7 @@ export default {
          return this.$store.state.socialIssuesOther;
       },
       socialActionsList() {
-         return this.$store.state.socialActionsList;
+         return this.$store.getters.socialActionsListSorted;
       },
       socialActionsSelected() {
          return this.$store.state.activity.socialActions;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -101,6 +101,9 @@ const store = createStore({
                             state.activity.activityType.thirdPartiesVisible !== 0)
                 );
         },
+        socialActionsListSorted(state) {
+            return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
+        },
     },
     mutations: {
         // SocialIssueAcc
@@ -131,7 +134,6 @@ const store = createStore({
             state.socialActionsList = [];
         },
         addActionInList(state, action) {
-            //console.log('add action list', action.id);
             state.socialActionsList.push(action);
         },
         updateActionsSelected(state, actions) {

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php

@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\HttpKernel\Kernel;
-
-class AppKernel extends Kernel
-{
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/logs';
-    }
-
-    public function registerBundles()
-    {
-        return [
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
-            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Chill\PersonBundle\ChillPersonBundle(),
-            new Chill\MainBundle\ChillMainBundle(),
-            new Chill\ActivityBundle\ChillActivityBundle(),
-            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
-            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new Symfony\Bundle\MonologBundle\MonologBundle(),
-            //add here all the required bundle (some bundle are not required)
-        ];
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
-    }
-}

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-use Composer\Autoload\ClassLoader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
-
-/** @var ClassLoader $loader */
-$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
-
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
-
-return $loader;

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log

@@ -1,438 +0,0 @@
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "assets._default_package" (parent: assets.path_package).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.chain_provider" (parent: security.user.provider.chain).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory" (parent: security.user.provider.in_memory).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory_admin" (parent: security.user.provider.in_memory.user).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.users" (parent: doctrine.orm.security.user.provider).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.dev" (parent: security.firewall.context).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.context_listener.0" (parent: security.context_listener).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout_listener.default" (parent: security.logout_listener).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout.success_handler.default" (parent: security.logout.success_handler).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.dao.default" (parent: security.authentication.provider.dao).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.success_handler.default.form_login" (parent: security.authentication.success_handler).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.failure_handler.default.form_login" (parent: security.authentication.failure_handler).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form" (parent: security.authentication.listener.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form.default" (parent: security.authentication.listener.form).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.form_entry_point.default" (parent: security.authentication.form_entry_point).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.anonymous.default" (parent: security.authentication.listener.anonymous).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.anonymous.default" (parent: security.authentication.provider.anonymous).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.exception_listener.default" (parent: security.exception_listener).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.default" (parent: security.firewall.context).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.eventdispatcher" (parent: swiftmailer.transport.eventdispatcher.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.authhandler" (parent: swiftmailer.transport.authhandler.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.buffer" (parent: swiftmailer.transport.buffer.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.smtp" (parent: swiftmailer.transport.smtp.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default" (parent: swiftmailer.mailer.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.plugin.messagelogger" (parent: swiftmailer.plugin.messagelogger.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.configuration" (parent: doctrine.dbal.connection.configuration).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.profiling.default" (parent: doctrine.dbal.logger.profiling).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.chain.default" (parent: doctrine.dbal.logger.chain).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.event_manager" (parent: doctrine.dbal.connection.event_manager).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection" (parent: doctrine.dbal.connection).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_configuration" (parent: doctrine.orm.configuration).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_metadata_cache" (parent: doctrine_cache.abstract.array).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_result_cache" (parent: doctrine_cache.abstract.array).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_query_cache" (parent: doctrine_cache.abstract.array).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_manager_configurator" (parent: doctrine.orm.manager_configurator.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_entity_manager" (parent: doctrine.orm.entity_manager.abstract).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.request" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.translation" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.security" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.templating" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.profiler" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.router" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.php" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.event" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.assetic" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.doctrine" (parent: monolog.logger_prototype).
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "validator.mapping.class_metadata_factory"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "assetic.value_supplier"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.dbal.event_manager"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.metadata.annotation_reader"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.default_entity_manager.event_manager"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "sensio_framework_extra.security.expression_language"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.logging.inner"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.data_collector.inner"; reason: private alias
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.path_package"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.url_package"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.static_version_strategy"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.firewall.context"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory.user"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.chain"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout_listener"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.handler.cookie_clearing"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.success_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.form_entry_point"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_success_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.success_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_failure_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.failure_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.form"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_form"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.simple_success_failure_handler"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_preauth"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.x509"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.remote_user"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.basic"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.digest"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.dao"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.simple"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.pre_authenticated"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.exception_listener"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.switchuser_listener"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.rememberme"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.rememberme"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.persistent"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.simplehash"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "monolog.logger_prototype"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.mailer.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.sendmail.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.mail.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.null.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.buffer.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.authhandler.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.eventdispatcher.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.redirecting.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.antiflood.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.impersonate.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.messagelogger.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.smtp.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.spool.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.file.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.memory.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assetic.worker.ensure_filter"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.apc"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.array"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.file_system"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.php_file"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcache"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcached"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.redis"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.wincache"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.xcache"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.zenddata"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.mongodb"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.riak"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.couchbase"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.chain"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.profiling"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.event_manager"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.configuration"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.configuration"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.entity_manager.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.manager_configurator.abstract"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.security.user.provider"; reason: abstract
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session" previously pointing to "session.storage.mock_file" to "session.storage.filesystem".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.native" previously pointing to "session.handler.native_file" to "session.handler".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.php_bridge" previously pointing to "session.handler.native_file" to "session.handler".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "assetic.twig_directory_resource.kernel" previously pointing to "templating.loader.filesystem" to "templating.loader".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.text" previously pointing to "templating.engine.twig" to "templating".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.choice" previously pointing to "templating.engine.twig" to "templating".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.title" previously pointing to "templating.engine.twig" to "templating".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "translator_listener" previously pointing to "translator.data_collector" to "translator".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "validator.builder" previously pointing to "translator.data_collector" to "translator".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "data_collector.translation" previously pointing to "translator.data_collector" to "translator".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.trans" previously pointing to "translator.data_collector" to "translator".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.custom_fields_group_type" previously pointing to "translator.data_collector" to "translator".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "templating.helper.router" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router.cache_warmer" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router_listener" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.logout_url_generator" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.routing" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.profiler" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.router" previously pointing to "router.default" to "router".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.controller.listener" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.routing.loader.annot_class" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.user_password_encoder.generic" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.validator.user_password" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.authentication.provider.dao.default" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig" previously pointing to "twig.loader.filesystem" to "twig.loader".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.email_sender.listener" previously pointing to "monolog.logger" to "logger".
-Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.mailer.default" previously pointing to "swiftmailer.mailer.default.transport.smtp" to "swiftmailer.mailer.default.transport".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.cache_warmer.template_paths" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.asset_manager_cache_warmer" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translation.warmer" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "router.cache_warmer" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.proxy_cache_warmer" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.selector" to "translator.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.history" to "test.client".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.cookiejar" to "test.client".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.attribute_bag" to "session".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.flash_bag" to "session".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1" to "form.resolved_type_factory".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.extension" to "form.registry".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.type_extension.form.request_handler" to "form.type_extension.form.http_foundation".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.server_params" to "form.type_extension.form.request_handler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_generator" to "security.csrf.token_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_storage" to "security.csrf.token_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets._default_package" to "assets.packages".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "validator.validator_factory" to "validator.builder".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "profiler.storage" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.config" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.ajax" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.exception" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.events" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.logger" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.time" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.memory" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.twig" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.security" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.data_collector" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.doctrine" to "profiler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.xml" to "routing.resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.yml" to "routing.resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.php" to "routing.resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_dir" to "routing.resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_file" to "routing.resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.resolver" to "routing.loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.parent" to "debug.event_dispatcher".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "controller_resolver" to "debug.controller_resolver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.dao.default" to "security.authentication.manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.anonymous.default" to "security.authentication.manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.expression_voter" to "security.access.decision_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.role_hierarchy_voter" to "security.access.decision_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.authenticated_voter" to "security.access.decision_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.expression_language" to "security.access.expression_voter".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.firewall.map" to "security.firewall".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d" to "security.firewall.map".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.retry_entry_point" to "security.channel_listener".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user.provider.concrete.in_memory_admin" to "security.user.provider.concrete.in_memory".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.success_handler.default" to "security.logout_listener.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.handler.session" to "security.logout_listener.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user_checker" to "security.authentication.provider.dao.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.session_strategy" to "security.authentication.listener.form.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.success_handler.default.form_login" to "security.authentication.listener.form.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.failure_handler.default.form_login" to "security.authentication.listener.form.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.form_entry_point.default" to "security.exception_listener.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.channel_listener" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.context_listener.0" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout_listener.default" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.form.default" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.anonymous.default" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_listener" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.exception_listener.default" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.logout_url" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.security" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.profiler" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.trans" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.assets" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.actions" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.code" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.routing" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.yaml" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug.stopwatch" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.expression" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpkernel" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.form" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_extension" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.twig.doctrine_extension" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.dump" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.webprofiler" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.app_variable" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.configurator.environment" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.renderer" to "twig.extension.form".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.engine" to "twig.form.renderer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1" to "swiftmailer.mailer.default.transport.authhandler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2" to "swiftmailer.mailer.default.transport.authhandler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3" to "swiftmailer.mailer.default.transport.authhandler".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.transport.replacementfactory" to "swiftmailer.mailer.default.transport.buffer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader" to "assetic.asset_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillpersonbundle" to "assetic.asset_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillmainbundle" to "assetic.asset_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.kernel" to "assetic.asset_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.parameter_bag" to "assetic.asset_factory".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.value_supplier.default" to "assetic.twig_extension".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader.real" to "assetic.twig_formula_loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.config_cache" to "assetic.twig_formula_loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger.chain.default" to "doctrine.dbal.default_connection.configuration".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger" to "doctrine.dbal.logger.chain.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.configuration" to "doctrine.dbal.default_connection".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.event_manager" to "doctrine.dbal.default_connection".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_metadata_driver" to "doctrine.orm.default_configuration".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.naming_strategy.default" to "doctrine.orm.default_configuration".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.quote_strategy.default" to "doctrine.orm.default_configuration".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_configuration" to "doctrine.orm.default_entity_manager".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.security.expression_language.default" to "sensio_framework_extra.security.listener".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.doctrine_step" to "sensio_distribution.webconfigurator".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.secret_step" to "sensio_distribution.webconfigurator".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.logging" to "translator".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.buffer" to "swiftmailer.mailer.default.transport".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.authhandler" to "swiftmailer.mailer.default.transport".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.eventdispatcher" to "swiftmailer.mailer.default.transport".
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "controller_resolver"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.logging"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.selector"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translation.warmer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.flash_bag"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.attribute_bag"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.handler.write_check"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.extension"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.type_extension.form.request_handler"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.server_params"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_generator"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_storage"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_package"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets._default_package"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.engine.delegating"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.cache_warmer.template_paths"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.cache"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.chain"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.mapping.cache.apc"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.validator_factory"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "profiler.storage"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.config"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.ajax"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.exception"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.events"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.logger"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.time"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.memory"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.resolver"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.xml"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.yml"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.php"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "router.cache_warmer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.cached_reader"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "debug.event_dispatcher.parent"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.session_strategy"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user_checker"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.expression_language"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.authenticated_voter"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.role_hierarchy_voter"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.expression_voter"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.firewall.map"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.retry_entry_point"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.basic_entry_point"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.digest_entry_point"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.channel_listener"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.handler.session"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_listener"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.rememberme.token.provider.in_memory"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.logout_url"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.security"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.security"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user.provider.concrete.in_memory_admin"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener.0"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout_listener.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.success_handler.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.dao.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.success_handler.default.form_login"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.failure_handler.default.form_login"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.form.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.form_entry_point.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.exception_listener.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.app_variable"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.cache_warmer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.native_filesystem"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.chain"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.profiler"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.twig"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.trans"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.assets"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.actions"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.code"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.routing"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.yaml"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug.stopwatch"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.expression"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpkernel"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.form"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.engine"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.renderer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.configurator.environment"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.chrome_php"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.gelf_message"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.html"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.json"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.line"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.loggly"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.normalizer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.scalar"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.wildfire"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.failover"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.mailinvoker"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.replacementfactory"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.data_collector"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.eventdispatcher"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.authhandler"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.buffer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.config_cache"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.asset_manager_cache_warmer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.worker.cache_busting"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.parameter_bag"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.value_supplier.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_extension"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader.real"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.doctrine"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.twig.doctrine_extension"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.configuration"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger.chain.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.event_manager"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.proxy_cache_warmer"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.listeners.resolve_target_entity"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.underscore"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.ansi"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_configuration"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_yml_metadata_driver"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_metadata_driver"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_dir"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_file"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.security.expression_language.default"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.dump"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.webprofiler"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.doctrine_step"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.secret_step"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillpersonbundle"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillmainbundle"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.kernel"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.finder" to "cache_warmer".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets.empty_version_strategy" to "assets.packages".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
-Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "annotations.reader" to "annotation_reader".
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_version_strategy"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.finder"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.reader"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.http_utils"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_map"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpfoundation"; reason: unused
-Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_class"; reason: unused

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map

@@ -1,88 +0,0 @@
-<?php return array (
-  0 => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
-  1 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
-  2 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
-  3 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
-  4 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
-  5 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
-  6 => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
-  7 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
-  8 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
-  9 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
-  10 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
-  11 => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-  12 => 'Symfony\\Component\\Routing\\RequestContext',
-  13 => 'Symfony\\Component\\Routing\\Router',
-  14 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
-  15 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
-  16 => 'Symfony\\Component\\Config\\FileLocator',
-  17 => 'Symfony\\Component\\Debug\\ErrorHandler',
-  18 => 'Symfony\\Component\\EventDispatcher\\Event',
-  19 => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
-  20 => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
-  21 => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
-  22 => 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
-  23 => 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent',
-  24 => 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent',
-  25 => 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent',
-  26 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
-  27 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
-  28 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
-  29 => 'Symfony\\Component\\HttpKernel\\KernelEvents',
-  30 => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
-  31 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
-  32 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
-  33 => 'Symfony\\Component\\Security\\Http\\Firewall',
-  34 => 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface',
-  35 => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
-  36 => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage',
-  37 => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
-  38 => 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker',
-  39 => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
-  40 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
-  41 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
-  42 => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
-  43 => 'Twig_Environment',
-  44 => 'Twig_Extension',
-  45 => 'Twig_Extension_Core',
-  46 => 'Twig_Extension_Escaper',
-  47 => 'Twig_Extension_Optimizer',
-  48 => 'Twig_LoaderInterface',
-  49 => 'Twig_Markup',
-  50 => 'Twig_Template',
-  51 => 'Monolog\\Formatter\\FormatterInterface',
-  52 => 'Monolog\\Formatter\\LineFormatter',
-  53 => 'Monolog\\Handler\\HandlerInterface',
-  54 => 'Monolog\\Handler\\AbstractHandler',
-  55 => 'Monolog\\Handler\\AbstractProcessingHandler',
-  56 => 'Monolog\\Handler\\StreamHandler',
-  57 => 'Monolog\\Handler\\FingersCrossedHandler',
-  58 => 'Monolog\\Handler\\FilterHandler',
-  59 => 'Monolog\\Handler\\TestHandler',
-  60 => 'Monolog\\Logger',
-  61 => 'Symfony\\Bridge\\Monolog\\Logger',
-  62 => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
-  63 => 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
-  64 => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
-  65 => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
-  66 => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
-  67 => 'Doctrine\\Common\\Annotations\\DocLexer',
-  68 => 'Doctrine\\Common\\Annotations\\FileCacheReader',
-  69 => 'Doctrine\\Common\\Annotations\\PhpParser',
-  70 => 'Doctrine\\Common\\Annotations\\Reader',
-  71 => 'Doctrine\\Common\\Lexer',
-  72 => 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
-  73 => 'Doctrine\\Common\\Persistence\\Proxy',
-  74 => 'Doctrine\\Common\\Util\\ClassUtils',
-  75 => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
-  76 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
-  77 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
-  78 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
-  79 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
-  80 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
-  81 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
-  82 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
-  83 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
-  84 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
-  85 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
-);

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml

@@ -1,77 +0,0 @@
-imports:
-    - { resource: parameters.yml }
-
-framework:
-    secret:          Not very secret
-    router:          { resource: "%kernel.root_dir%/config/routing.yml" }
-    form:            true
-    csrf_protection: true
-    session:         ~
-    default_locale:  fr
-    translator:      { fallback: fr }
-    profiler:        { only_exceptions: false }
-    templating:
-        engines: ['twig']
- 
-doctrine:
-    dbal:
-        driver:   pdo_pgsql
-        host:     "%database_host%"
-        port:     "%database_port%"
-        dbname:   "%database_name%"
-        user:     "%database_user%"
-        password: "%database_password%"
-        charset:  UTF8
-        mapping_types:
-            jsonb: json_array
-    orm:
-        auto_generate_proxy_classes: "%kernel.debug%"
-        auto_mapping: true
-        
-# Assetic Configuration
-assetic:
-    debug:          "%kernel.debug%"
-    use_controller: false
-    bundles:        [ ]
-    #java: /usr/bin/java
-    filters:
-        cssrewrite: ~
-        
-    
-security:
-    providers:
-        chain_provider:
-            chain :
-                providers: [in_memory, users]
-        in_memory:
-            memory:
-                users:
-                    admin: { password: olala, roles: 'ROLE_ADMIN' }
-        users:
-            entity:
-                class: Chill\MainBundle\Entity\User
-                property: username
-
-    encoders: 
-        Chill\MainBundle\Entity\User: 
-            algorithm: bcrypt
-        Symfony\Component\Security\Core\User\User: plaintext
-
-    firewalls:
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-
-        default:
-            anonymous: ~
-            form_login:
-                csrf_parameter: _csrf_token
-                csrf_token_id: authenticate
-                csrf_provider: form.csrf_provider
-            logout: ~
-            http_basic: 
-    access_control:
-        #disable authentication for tests
-        #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
-        #- { path: ^/admin, roles: ROLE_ADMIN }
-        #- { path: ^/, roles: ROLE_USER }

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml

@@ -1,7 +0,0 @@
-imports:
-    - { resource: config.yml } #here we import a config.yml file, this is not required
-
-framework:
-    test: ~
-    session:
-        storage_id: session.storage.filesystem

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml

@@ -1,8 +0,0 @@
-# config/config_test.yml
-imports:
-    - { resource: config.yml } #here we import a config.yml file, this is not required
-
-framework:
-    test: ~
-    session:
-        storage_id: session.storage.filesystem

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml

@@ -1,9 +0,0 @@
-
-#required by ConfigCustomizablesEntitiesTest::testNotEmptyConfig
-
-imports:
-    - { resource: config_test.yml } 
-
-chill_custom_fields:
-    customizables_entities:
-        - { class: Test\With\A\Dummy\Entity, name: test }

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml

@@ -1,7 +0,0 @@
-parameters:
-    database_host: chill__database
-    database_port: 5432
-    database_name: postgres
-    database_user: postgres
-    database_password: postgres
-    locale: fr

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml

@@ -1,7 +0,0 @@
-parameters:
-    database_host: 127.0.0.1
-    database_port: 5432
-    database_name: test0
-    database_user: postgres
-    database_password: postgres
-    locale: fr

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist

@@ -1,7 +0,0 @@
-parameters:
-    database_host: 127.0.0.1
-    database_port: 5434
-    database_name: symfony
-    database_user: symfony
-    database_password: symfony
-    locale: fr

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml

@@ -1,10 +0,0 @@
-cl_custom_fields:
-    resource: .
-    type: chill_routes
-    
-chill_main:
-    resource: "@ChillMainBundle/Resources/config/routing.yml"
-
-test_custom_field_form_render:
-    path: /customfieldsgroup/test/render/{id}
-    defaults: { _controller: ChillCustomFieldsBundle:CustomFieldsGroup:renderForm }

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console

@@ -1,28 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
-
-// if you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
-// for more information
-//umask(0000);
-
-set_time_limit(0);
-
-/** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/autoload.php';
-
-$input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
-
-if ($debug) {
-    Debug::enable();
-}
-
-$kernel = new AppKernel($env, $debug);
-$application = new Application($kernel);
-$application->run($input);

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php

@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-use Symfony\Component\Debug\Debug;
-use Symfony\Component\HttpFoundation\Request;
-
-// If you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
-//umask(0000);
-
-// This check prevents access to debug front controllers that are deployed by accident to production servers.
-// Feel free to remove this, extend it, or make something more sophisticated.
-if (
-    isset($_SERVER['HTTP_CLIENT_IP'])
-    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
-) {
-    header('HTTP/1.0 403 Forbidden');
-
-    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
-}
-
-$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
-Debug::enable();
-
-require_once __DIR__ . '/../app/AppKernel.php';
-
-$kernel = new AppKernel('dev', true);
-$kernel->loadClassCache();
-$request = Request::createFromGlobals();
-$response = $kernel->handle($request);
-$response->send();
-$kernel->terminate($request, $response);

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

@@ -83,6 +83,10 @@
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
+{%- if edit_form.privateComment is defined -%}
+    {{ form_row(edit_form.privateComment) }}
+{% endif %}
+
 {%- if edit_form.attendee is defined -%}
     {{ form_row(edit_form.attendee) }}
 {% endif %}
@@ -116,3 +120,11 @@
 
 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}

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

@@ -2,12 +2,30 @@
     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
         {% if no_action is not defined or no_action == false %}
             <li>
-                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
-                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
-                    'entityId': activity.id
-                }) }}">
-                    <i class="fa fa-paper-plane fa-fw"></i>
-                    {{ 'notification.Notify'|trans }}</a>
+                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
+                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
+                    {% if showGroup %}
+                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{ 'notification.Notify'|trans }}
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
+                                    {{ 'notification.Notify referrer'|trans }}
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
+                                    {{ 'notification.Notify any'|trans }}
+                                </a>
+                            </li>
+                        </ul>
+                    {% else %}
+                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
+                            {{ 'notification.Notify'|trans }}
+                        </a>
+                    {% endif %}
+                </div>
             </li>
         {% endif %}
         {% if context == 'person' and activity.accompanyingPeriod is not empty %}

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

@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

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

@@ -81,19 +81,22 @@
 {% endif %}
 
 {%- if form.comment is defined -%}
-    {# TODO .. public and private #}
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
+{% endif %}
+
 {%- if form.documents is defined -%}
     {{ form_row(form.documents) }}
     <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 {% endif %}
 
-{%- if form.attendee is defined -%}
-    {{ form_row(form.attendee) }}
-{% endif %}
-
 {# TODO .. status #}
 
 <ul class="record_actions sticky-form-buttons">
@@ -116,3 +119,11 @@
   </li>
 </ul>
 {{ form_end(form) }}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}

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

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig

@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
     {% block content_form_actions_view %}{% endblock %}
     {% block content_form_actions_save_and_show %}{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityPresence list'|trans }}</h1>
@@ -34,7 +34,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
                 {{ 'Create a new activity presence'|trans }}

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig

@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig

@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig

@@ -1,12 +1,12 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_view %}{% endblock %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
@@ -34,7 +34,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
                 {{ 'Create a new activity type category'|trans }}

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig

@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_activity', {
-        'layout': '@ChillActivity/Admin/menu_activity.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 

src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig

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

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

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

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

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

src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php

@@ -0,0 +1,286 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Service\DocGenerator;
+
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
+use libphonenumber\PhoneNumber;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class ListActivitiesByAccompanyingPeriodContext implements
+    DocGeneratorContextWithAdminFormInterface,
+    DocGeneratorContextWithPublicFormInterface
+{
+    private AccompanyingPeriodContext $accompanyingPeriodContext;
+
+    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
+    private NormalizerInterface $normalizer;
+
+    private PersonRepository $personRepository;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private SocialIssueRepository $socialIssueRepository;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        AccompanyingPeriodContext $accompanyingPeriodContext,
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
+        NormalizerInterface $normalizer,
+        PersonRepository $personRepository,
+        SocialActionRepository $socialActionRepository,
+        SocialIssueRepository $socialIssueRepository,
+        ThirdPartyRepository $thirdPartyRepository,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        UserRepository $userRepository
+    ) {
+        $this->accompanyingPeriodContext = $accompanyingPeriodContext;
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
+        $this->normalizer = $normalizer;
+        $this->personRepository = $personRepository;
+        $this->socialActionRepository = $socialActionRepository;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->userRepository = $userRepository;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        return $this->accompanyingPeriodContext->adminFormReverseTransform($data);
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        return $this->accompanyingPeriodContext->adminFormTransform($data);
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $this->accompanyingPeriodContext->buildAdminForm($builder);
+    }
+
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
+    {
+        $this->accompanyingPeriodContext->buildPublicForm($builder, $template, $entity);
+    }
+
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        $data = $this->accompanyingPeriodContext->getData($template, $entity, $contextGenerationData);
+
+        $data['activities'] = $this->getActivitiesSimplified($entity);
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.Accompanying period with a list of activities description';
+    }
+
+    public function getEntityClass(): string
+    {
+        return AccompanyingPeriod::class;
+    }
+
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return $this->accompanyingPeriodContext->getFormData($template, $entity);
+    }
+
+    public static function getKey(): string
+    {
+        return self::class;
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Accompanying period with a list of activities';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return $this->accompanyingPeriodContext->hasAdminForm();
+    }
+
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
+    {
+        return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
+    }
+
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
+    }
+
+    private function getActivitiesSimplified(AccompanyingPeriod $period)
+    {
+        $activities =
+            $this->activityACLAwareRepository->findByAccompanyingPeriodSimplified($period);
+        $results = [];
+
+        foreach ($activities as $row) {
+            $activity = $row[0];
+
+            $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
+                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => DateTime::class,
+            ]);
+
+            if (null === $activity['location']) {
+                $activity['location'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Location::class,
+                ]);
+                $activity['location']['type'] = 'location';
+            } else {
+                $activity['location']['isNull'] = false;
+                $activity['location']['type'] = 'location';
+
+                foreach (['1', '2'] as $key) {
+                    $activity['location']['phonenumber' . $key] = $this->normalizer->normalize(
+                        $activity['location']['phonenumber' . $key],
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => PhoneNumber::class]
+                    );
+                }
+            }
+
+            if (is_numeric($activity['location']['locationType']['id'])) {
+                $activity['location']['locationType']['title'] = $this->translatableStringHelper->localize(
+                    $activity['location']['locationType']['title']
+                );
+                $activity['location']['locationType']['isNull'] = false;
+                $activity['location']['locationType']['type'] = 'locationType';
+            }
+
+            if (null !== $activity['activityType']) {
+                $activity['activityType']['name'] = $this->translatableStringHelper->localize(
+                    $activity['activityType']['name']
+                );
+                $activity['activityType']['isNull'] = false;
+                $activity['activityType']['type'] = 'activityType';
+            } else {
+                $activity['activityType'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityType::class,
+                ]);
+            }
+
+            if (null !== $activity['attendee']) {
+                $activity['attendee']['name'] = $this->translatableStringHelper->localize(
+                    $activity['attendee']['name']
+                );
+                $activity['attendee']['isNull'] = false;
+                $activity['attendee']['type'] = 'activityPresence';
+            } else {
+                $activity['attendee'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityPresence::class,
+                ]);
+            }
+
+            $activity['comment'] = (string) $row['comment'];
+            $activity['travelTimeMinute'] = $row['travelTimeMinute'];
+            $activity['durationTimeMinute'] = $row['durationTimeMinute'];
+
+            if (null !== $row['userIds']) {
+                foreach ($row['userIds'] as $id) {
+                    $activity['users'][] = $this->normalizer->normalize(
+                        $this->userRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]
+                    );
+                }
+            } else {
+                $activity['users'] = [];
+            }
+
+            if (null !== $row['personIds']) {
+                foreach ($row['personIds'] as $id) {
+                    $activity['persons'][] = $this->normalizer->normalize(
+                        $this->personRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Person::class]
+                    );
+                }
+            } else {
+                $activity['persons'] = [];
+            }
+
+            if (null !== $row['thirdPartyIds']) {
+                foreach ($row['thirdPartyIds'] as $id) {
+                    $activity['thirdParties'][] = $this->normalizer->normalize(
+                        $this->thirdPartyRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ThirdParty::class]
+                    );
+                }
+            } else {
+                $activity['thirdParties'] = [];
+            }
+
+            if (null !== $row['socialActionIds']) {
+                foreach ($row['socialActionIds'] as $id) {
+                    $activity['socialActions'][] = $this->normalizer->normalize(
+                        $this->socialActionRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialAction::class]
+                    );
+                }
+            } else {
+                $activity['socialActions'] = [];
+            }
+
+            if (null !== $row['socialIssueIds']) {
+                foreach ($row['socialIssueIds'] as $id) {
+                    $activity['socialIssues'][] = $this->normalizer->normalize(
+                        $this->socialIssueRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialIssue::class]
+                    );
+                }
+            } else {
+                $activity['socialIssues'] = [];
+            }
+
+            $results[] = $activity;
+        }
+
+        return $results;
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Controller;
 
+use Chill\ActivityBundle\Entity\ActivityType;
 use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
@@ -209,7 +210,7 @@ final class ActivityControllerTest extends WebTestCase
 
         //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
         $socialPermissionGroup = $em
-            ->getRepository('ChillMainBundle:PermissionsGroup')
+            ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)
             ->findOneByName('social');
         $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
             ->setName('social without activity');
@@ -221,7 +222,7 @@ final class ActivityControllerTest extends WebTestCase
         }
         //create groupCenter
         $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
-        $groupCenter->setCenter($em->getRepository('ChillMainBundle:Center')
+        $groupCenter->setCenter($em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']))
             ->setPermissionsGroup($withoutActivityPermissionGroup);
         $em->persist($withoutActivityPermissionGroup);
@@ -249,7 +250,7 @@ final class ActivityControllerTest extends WebTestCase
         $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
-        $activities = $em->getRepository('ChillActivityBundle:Activity')
+        $activities = $em->getRepository(\Chill\ActivityBundle\Entity\Activity::class)
             ->findBy(['person' => $person]);
 
         if (count($activities) === 0) {
@@ -281,7 +282,7 @@ final class ActivityControllerTest extends WebTestCase
         $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
-        $person = $em->getRepository('ChillPersonBundle:Person')
+        $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->findOneBy([
                 'firstName' => 'Depardieu',
                 'lastName' => 'Gérard',
@@ -304,7 +305,7 @@ final class ActivityControllerTest extends WebTestCase
     {
         $reasons = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityReason')
+            ->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)
             ->findAll();
 
         $reason = $reasons[array_rand($reasons)];
@@ -323,7 +324,7 @@ final class ActivityControllerTest extends WebTestCase
     {
         $types = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityType')
+            ->getRepository(ActivityType::class)
             ->findAll();
 
         return $types[array_rand($types)];
@@ -339,7 +340,7 @@ final class ActivityControllerTest extends WebTestCase
     {
         $user = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:User')
+            ->getRepository(\Chill\MainBundle\Entity\User::class)
             ->findOneByUsername($username);
 
         if (null === $user) {
@@ -349,7 +350,7 @@ final class ActivityControllerTest extends WebTestCase
 
         $center = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:Center')
+            ->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneByName($centerName);
 
         // get scope reachable by both role UPDATE and DELETE

src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php

@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Entity;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testHierarchySocialActions(): void
+    {
+        $parent = new SocialAction();
+        $child = new SocialAction();
+
+        $parent->addChild($child);
+        $grandChild = new SocialAction();
+        $child->addChild($grandChild);
+
+        $activity = new Activity();
+
+        $activity->addSocialAction($parent);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($parent, $activity->getSocialActions());
+
+        $activity->addSocialAction($grandChild);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+
+        $activity->addSocialAction($child);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+        $this->assertNotContains($child, $activity->getSocialActions());
+
+        $activity->addSocialAction($another = new SocialAction());
+
+        $this->assertCount(2, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertContains($another, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+        $this->assertNotContains($child, $activity->getSocialActions());
+    }
+
+    public function testHierarchySocialIssues(): void
+    {
+        $listener = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
+        $event = $this->prophesize(LifecycleEventArgs::class)->reveal();
+
+        $parent = new SocialIssue();
+        $child = new SocialIssue();
+
+        $parent->addChild($child);
+        $grandChild = new SocialIssue();
+        $child->addChild($grandChild);
+
+        $activity = new Activity();
+        $activity->setAccompanyingPeriod(new AccompanyingPeriod());
+
+        $activity->addSocialIssue($parent);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($parent, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($grandChild);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($child);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+        $this->assertNotContains($child, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($another = new SocialIssue());
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(2, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertContains($another, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+        $this->assertNotContains($child, $activity->getSocialIssues());
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php

@@ -68,10 +68,10 @@ final class ActivityTypeTest extends KernelTestCase
             ->push($request);
 
         $this->user = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:User')
+            ->getRepository(\Chill\MainBundle\Entity\User::class)
             ->findOneBy(['username' => 'center a_social']);
         $this->center = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:Center')
+            ->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']);
         $token = $prophet->prophesize();
         $token->willExtend(AbstractToken::class);

src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Form\Type;
 
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -95,7 +96,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
     protected function getRandomType($active = true)
     {
         $types = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillActivityBundle:ActivityType')
+            ->getRepository(ActivityType::class)
             ->findBy(['active' => $active]);
 
         return $types[array_rand($types)];

src/Bundle/ChillActivityBundle/config/routes.yaml

@@ -10,48 +10,22 @@ chill_activity_activityreasoncategory:
     resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
     prefix:   /
 
-chill_admin_activity_index:
+chill_activity_admin_index:
     path:     /{_locale}/admin/activity
     controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
-    options:
-        menus:
-            admin_section:
-                label: Activities
-                order: 2000
-                icons: [tag]
 
 chill_admin_activity_redirect_to_admin_index:
     path:     /{_locale}/admin/activity_redirect_to_main
     controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
-    options:
-        menus:
-            admin_activity:
-                order: 0
-                label: Main admin menu
 
 chill_activity_type_admin:
     path:     /{_locale}/admin/activity/type
     controller: cscrud_activity_type_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2020
-                label: 'Activity Types'
 
 chill_activity_type_category_admin:
     path:     /{_locale}/admin/activity/type_category
     controller: cscrud_activity_type_category_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2999
-                label: 'Activity Types Categories'
 
 chill_activity_presence_admin:
     path:     /{_locale}/admin/activity/presence
     controller: cscrud_activity_presence_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2021
-                label: 'Activity Presences'

src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml

@@ -1,11 +1,6 @@
 chill_activity_activityreason:
     path:     /{_locale}/admin/activityreason/
     controller: Chill\ActivityBundle\Controller\ActivityReasonController::indexAction
-    options:
-        menus:
-            admin_activity: 
-                order: 2000
-                label: "Activity Reasons"
 
 chill_activity_activityreason_show:
     path:     /{_locale}/admin/activityreason/{id}/show

src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml

@@ -1,11 +1,6 @@
 chill_activity_activityreasoncategory:
     path:     /{_locale}/admin/activityreasoncategory/
     controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::indexAction
-    options:
-        menus:
-            admin_activity: 
-                order: 2010
-                label: "Activity Reasons Category"
 
 chill_activity_activityreasoncategory_show:
     path:     /{_locale}/admin/activityreasoncategory/{id}/show

src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220425133027 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
+    }
+
+    public function getDescription(): string
+    {
+        return 'add private comment option to activity types';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
+    }
+}

src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124438 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+    }
+
+    public function getDescription(): string
+    {
+        return 'add private comment to activity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+}

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

@@ -44,6 +44,7 @@ Received: Recevoir
 by: 'Par '
 location: Lieu
 Reasons: Sujets
+Private comment: Commentaire privé
 
 
 #forms
@@ -66,6 +67,14 @@ Choose a type: Choisir un type
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
+2 hours 15: 2 heures 15
+2 hours 30: 2 heures 30
+2 hours 45: 2 heures 45
+3 hours: 3 heures
+3 hours 30: 3 heures 30
+4 hours: 4 heures
+4 hours 30: 4 heures 30
+5 hours: 5 heures
 Concerned groups: Parties concernées
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
@@ -105,7 +114,7 @@ Activity type configuration: Configuration des categories d'activités
 Activity Reasons: Sujets d'une activité
 Activity Reasons Category: Catégories de sujet d'activités
 Activity Types Categories: Catégories des types d'activité
-Activity Presences: Presences des activités
+Activity Presences: Presences aux activités
 
 
 # Crud
@@ -116,6 +125,9 @@ crud:
   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
@@ -137,6 +149,10 @@ ActivityReasonCategory: Catégorie de sujet d'activité
 ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
 ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
 
+#activity presence admin
+ActivityPresence list: Liste des Présences aux activités
+Create a new activity presence: Créer une nouvelle "Présence aux activités"
+
 # activity type type admin
 ActivityType list: Types d'activités
 Create a new activity type: Créer un nouveau type d'activité
@@ -160,6 +176,8 @@ Reasons visible: Visibilité du champ Sujet
 Reasons label: Libellé du champ Sujet
 Comment visible: Visibilité du champ Commentaire
 Comment label: Libellé du champ Commentaire
+Private comment visible: Visibilité du champ Commentaire Privé
+Private comment label: Libellé du champ Commentaire Privé
 Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
 Accompanying period visible: Visibilité du champ Période d'accompagnement
@@ -232,3 +250,5 @@ This is the minimal activity data: Activité n°
 docgen:
     Activity basic: Echange
     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.

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

@@ -0,0 +1,234 @@
+#general
+Show the activity: Toon activiteit
+Edit the activity: Wijzig activiteit
+Activity: Activiteit
+Duration time: Duur
+Duration Time: Duur
+durationTime:  duur
+Travel time: Duur van verplaatsing
+Attendee: Aanwezigheden
+attendee: aanwezigheden
+list_reasons: Onderwerpen
+user_username: gebruikersnaam
+circle_name: naam kring
+Remark: Opmerking
+No comments: Geen opmerkingen
+Add a new activity: Voeg een nieuwe activiteit toe
+Activity list: Lijst van activiteiten
+present: aanwezig
+not present: afwezig
+Delete: Verwijderen
+Update: Bijwerken
+Update activity: Activieit bijwerken
+Scope: Werkingsgebied
+Activity data: Gegevens activiteit
+Activity location: Locatie activiteit
+No reason associated: Geen onderwerp
+No social issues associated: Geen sociaal vraagstuk
+No social actions associated: Geen maatschappelijke actie
+There isn't any activities.: Er zijn geen activiteiten
+type_name: Soort activiteit
+person_firstname: voornaam
+person_lastname: familienaam
+person_id: Identificatienummer persoon
+Type: Soort
+Invisible: Onzichtbaar
+Optional: Optioneel
+Required: Verplicht
+Persons: Personen
+Users: Gebruikers
+Emergency: Dringend
+Sent received: Inkomend / Uitgaand
+Sent: Verzenden
+Received: Ontvangen
+by: 'Door '
+location: Plaats
+Reasons: Onderwerpen
+
+
+#forms
+Activity creation: Nouvelle activité
+Create: Créer
+Back to the list: Retour à la liste
+Save activity: Sauver l'activité
+Reset form: Remise à zéro du formulaire
+Choose the duration: Choisir la durée
+Choose a type: Choisir un type
+5 minutes: 5 minutes
+10 minutes: 10 minutes
+15 minutes: 15 minutes
+20 minutes: 20 minutes
+25 minutes: 25 minutes
+30 minutes: 30 minutes
+45 minutes: 45 minutes
+1 hour: 1 heure
+1 hour 15: 1 heure 15
+1 hour 30: 1 heure 30
+1 hour 45: 1 heure 45
+2 hours: 2 heures
+Concerned groups: Parties concernées
+Persons in accompanying course: Usagers du parcours
+Third persons: Tiers non-pro.
+Others persons: Usagers
+Third parties: Tiers professionnels
+Users concerned: T(M)S
+activity:
+    Insert a document: Insérer un document
+    Remove a document: Supprimer le document
+    comment: Commentaire
+No documents: Aucun document
+
+#timeline
+'%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
+
+#controller
+'Success : activity created!': L'activité a été créée.
+'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
+'Success : activity updated!': L'activité a été mise à jour.
+'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.
+
+# ROLES
+CHILL_ACTIVITY_CREATE: Créer une activité
+CHILL_ACTIVITY_UPDATE: Modifier une activité
+CHILL_ACTIVITY_SEE: Voir une activité
+CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des activités
+CHILL_ACTIVITY_DELETE: Supprimer une activité
+CHILL_ACTIVITY_STATS: Statistique des activités
+CHILL_ACTIVITY_LIST: Liste des activités
+
+# admin
+Activities: Activités
+Activity configuration: Configuration des activités
+Activity configuration menu: Configuration des activités
+Activity types: Types d'activité
+Activity type configuration: Configuration des categories d'activités
+Activity Reasons: Sujets d'une activité
+Activity Reasons Category: Catégories de sujet d'activités
+Activity Types Categories: Catégories des types d'activité
+Activity Presences: Presences des 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 reason admin
+ActivityReason list: Liste des sujets
+Create a new activity reason: Créer un nouveau sujet
+Active: Actif
+Category: Catégorie
+ActivityReason creation: Nouveau sujet
+ActivityReason edit: Modification d'un sujet
+ActivityReason: Sujet d'activité
+The entity is inactive and won't be proposed: Le sujet est inactif et ne sera pas proposé
+The entity is active and will be proposed: Le sujet est actif et sera proposé
+
+#activity reason category admin
+ActivityReasonCategory list: Catégories de sujets
+Create a new activity category reason: Créer une nouvelle catégorie
+ActivityReasonCategory creation: Nouvelle catégorie de sujet
+ActivityReasonCategory edit: Modification d'une catégorie de sujet
+ActivityReasonCategory: Catégorie de sujet d'activité
+ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
+ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
+
+# activity type type admin
+ActivityType list: Types d'activités
+Create a new activity type: Créer un nouveau type d'activité
+Persons visible: Visibilité du champ Personnes
+Persons label: Libellé du champ Personnes
+User visible: Visibilité du champ Utilisateur
+User label: Libellé du champ Utilisateur
+Date visible: Visibilité du champ Date
+Date label: Libellé du champ Date
+Location visible: Visibilité du champ Lieu
+Location label: Libellé du champ Lieu
+Third parties visible: Visibilité du champ Tiers
+Third parties label: Libellé du champ Tiers
+Duration time visible: Visibilité du champ Durée
+Duration time label: Libellé du champ Durée
+Travel time visible: Visibilité du champ Durée de déplacement
+Travel time label: Libellé du champ Durée de déplacement
+Attendee visible: Visibilité du champ Présence de l'usager
+Attendee label: Libellé du champ Présence de l'usager
+Reasons visible: Visibilité du champ Sujet
+Reasons label: Libellé du champ Sujet
+Comment visible: Visibilité du champ Commentaire
+Comment label: Libellé du champ Commentaire
+Emergency visible: Visibilité du champ Urgent
+Emergency label: Libellé du champ Urgent
+Accompanying period visible: Visibilité du champ Période d'accompagnement
+Accompanying period label: Libellé du champ Période d'accompagnement
+Social issues visible: Visibilité du champ Problématiques sociales
+Social issues label: Libellé du champ Problématiques sociales
+Social actions visible: Visibilité du champ Action sociale
+Social actions label: Libellé du champ Action sociale
+Users visible: Visibilité du champ Utilisateurs
+Users label: Libellé du champ Utilisateurs
+Sent received visible: Visibilité du champ Entrant / Sortant
+Sent received label: Libellé du champ Entrant / Sortant
+Documents visible: Visibilité du champ Documents
+Documents label: Libellé du champ Documents
+
+# activity type category admin
+ActivityTypeCategory list: Liste des catégories des types d'activité
+Create a new activity type category: Créer une nouvelle catégorie de type d'activité
+
+# activity delete
+Remove activity: Supprimer une activité
+Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité qui concerne "%name%" ?
+The activity has been successfully removed.: L'activité a été supprimée.
+
+# exports
+Count activities: Nombre d'activités
+Count activities by various parameters.: Compte le nombre d'activités enregistrées en fonction de différents paramètres.
+Sum activity duration: Total de la durée des activités
+Sum activities duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
+List activities: Liste les activités
+Number of activities: Nombre d'activités
+
+#filters
+Filter by reason: Filtrer par sujet d'activité
+'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
+'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%"
+Filtered by date activity: Filtrer par date d'activité
+Activities after this date: Activités après cette date
+Activities before this date: Activités avant cette date
+"Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'activité: uniquement entre %date_from% et %date_to%"
+This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités après cette date"
+
+Filtered by person having an activity in a period: Uniquement les personnes ayant eu une activité dans la période donnée
+Implied in an activity after this date: Impliqué dans une activité après cette date
+Implied in an activity before this date: Impliqué dans une activité avant cette date
+Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à une activité entre %date_from% et %date_to% avec les sujets %reasons_name%
+Activity reasons for those activities: Sujets de ces activités
+
+Filter by activity type: Filtrer par type d'activité
+
+#aggregators
+Activity type: Type d'activité
+Activity user: Utilisateur lié à l'activity
+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: Aggréger par utilisateur lié à l'activité
+Aggregate by activity type: Aggréger par type d'activité
+Aggregate by activity reason: Aggréger par sujet de l'activité
+
+Last activities: Les dernières activités
+
+See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
+
+You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide.
+you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès.
+This is the minimal activity data: Activité n°
+
+docgen:
+    Activity basic: Echange
+    A basic context for activity: Contexte pour les échanges

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

@@ -0,0 +1,23 @@
+The reasons's level should not be empty: Het onderwerp niveau mag niet leeg zijn.
+At least one reason must be choosen: Kies minstens één onderwerp
+For this type of activity, you must add at least one person: Voor dit soort activiteit dient u minstens één persoon toe te voegen.
+For this type of activity, you must add at least one user: Voor dit soort activiteit dient u minstens één gebruiker toe te voegen.
+For this type of activity, you must add at least one third party: Voor dit soort activiteit dient u minstens één externe partner toe te voegen.
+For this type of activity, user is required: Voor dit soort activiteit, dient u een gebruiker in te vullen.
+For this type of activity, date is required: Voor dit soort activiteit, dient u een datum in te vullen.
+For this type of activity, location is required: Voor dit soort activiteit, dient u een locatie in te vullen.
+For this type of activity, attendee is required: Voor dit soort activiteit, dient u minstend één 'aanwezige persoon' in te vullen.
+For this type of activity, duration time is required: Voor dit soort activiteit, dient u een duur in te vullen.
+For this type of activity, travel time is required: Voor dit soort activiteit, dient u een verplaatsingsduur in te vullen.
+For this type of activity, reasons is required: Voor dit soort activiteit, dient u een onderwerp in te vullen.
+For this type of activity, comment is required: Voor dit soort activiteit, dient u een opmerking in te vullen.
+For this type of activity, sent/received is required: Voor dit soort activiteit, dient u het veld 'inkomend/uitgaand' in te vullen.
+For this type of activity, document is required: Voor dit soort activiteit, dient u een document toe te voegen.
+For this type of activity, emergency is required: Voor dit soort activiteit, is het veld 'dringend' verplicht.
+For this type of activity, accompanying period is required: Voor dit soort activiteit, dient u een begeleidingstraject in te vullen.
+For this type of activity, you must add at least one social issue: Voor dit soort activiteit, dient u een sociaal vraagstuk aan te duiden.
+For this type of activity, you must add at least one social action: Voor dit soort activiteit, dient u een maatschappelijke actie toe te voegen.
+
+# admin
+This parameter must be equal to social issue parameter: Deze parameter moet gelijk zijn aan de parameter "zichtbaarheid veld sociaal vraagstuk".
+The socialActionsVisible value is not compatible with the socialIssuesVisible value: De waarde van de parameter "zichtbaarheid veld maatschappelijke actie" is niet compatibel met de waarde van de parameter "zichtbaarheid veld sociaal vraagstuk".

src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * Class AdminController.
+ */
+class AdminController extends AbstractController
+{
+    /**
+     * @Route("/{_locale}/admin/aside-activity", name="chill_aside_activity_admin")
+     */
+    public function indexAdminAction()
+    {
+        return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php

@@ -31,6 +31,10 @@ class Configuration implements ConfigurationInterface
             ->isRequired()
             ->defaultValue(
                 [
+                    ['label' => '1 minutes',  'seconds' => 60],
+                    ['label' => '2 minutes',  'seconds' => 120],
+                    ['label' => '3 minutes',  'seconds' => 180],
+                    ['label' => '4 minutes',  'seconds' => 240],
                     ['label' => '5 minutes',  'seconds' => 300],
                     ['label' => '10 minutes', 'seconds' => 600],
                     ['label' => '15 minutes', 'seconds' => 900],

src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php

@@ -14,8 +14,6 @@ namespace Chill\AsideActivityBundle\Menu;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
     private Security $security;
@@ -32,27 +30,25 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-            $menu->addChild('Aside activities', [
+        $menu->addChild('Aside activities', [
+            'route' => 'chill_aside_activity_admin',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 7000,
+                'explain' => 'Aside activity type configuration',
+            ]);
+        $menu
+            ->addChild('Aside activity categories', [
                 'route' => 'chill_crud_aside_activity_category_index',
             ])
-                ->setExtras([
-                    'order' => 900,
-                    'explain' => 'Aside activity type configuration',
-                ]);
-        } else {
-            $menu
-                ->addChild('Aside activity categories', [
-                    'route' => 'chill_crud_aside_activity_category_index',
-                ])
-                ->setExtras([
-                    'order' => '50',
-                ]);
-        }
+            ->setExtras([
+                'order' => 7010,
+            ]);
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'admin_aside_activity'];
+        return ['admin_section', 'admin_aside_activity'];
     }
 }

src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig

@@ -1,7 +1,9 @@
 {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
-	{{ chill_menu('admin_aside_activity') }}
+	{{ chill_menu('admin_aside_activity', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
 {% endblock %}
 
 {% block layout_wvm_content %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig

@@ -1,10 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig

@@ -1,7 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+
+{% block title %}{{ 'Aside Activity Type List'|trans }}{% endblock title %}
 
 {% block admin_content %}
-	<h1>{{ 'Aside Activity Type List'|trans }}</h1>
+
+    <h1>{{ 'Aside Activity Type List'|trans }}</h1>
 
 	<table class="records_list table table-bordered border-dark">
 		<thead>
@@ -36,7 +39,7 @@
 		</tbody>
 	</table>
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_aside_activity_category_new') }}" class="btn btn-create">
 				{{ 'Create a new aside activity type'|trans }}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig

@@ -1,10 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}

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

@@ -38,7 +38,7 @@ crud:
     confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
   aside_activity_category:
     title_new: Nouvelle catégorie d'activité annexe
-    title_edit: Edition d'une catégorie de type d'activité
+    title_edit: Édition d'une catégorie de type d'activité
 
 #forms
 Create a new aside activity type: Nouvelle categorie d'activité annexe
@@ -165,3 +165,4 @@ Phonecall: "Appel téléphonique"
 Aside activities: Activités annexes
 Aside activity types: Types d'activités annexes
 Aside activity type configuration: Configuration des categories d'activités annexes
+Aside activity configuration: Configuration des activités annexes

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

@@ -0,0 +1,167 @@
+#general
+Show the aside activity: Toon de nevenactiviteit
+Edit the aside activity: Wijzig de nevenactiviteit
+Remove aside activity: Verwijder de nevenactiviteit
+Aside activity: Nevenactiviteit
+Aside Activity Type List: Lijst van nevenactiviteiten
+Duration time: Duur
+durationTime: duur
+user_username: gebruikersnaam
+Remark: Opmerking
+No comments: Geen opmerkingen
+Add a new aside activity: Nevenactiviteit toeveogen
+Aside activity list: Nevenactiviteiten
+present: aanwezig
+not present: afwezig
+Delete: Verwijderen
+Update: Bijwerken
+Aside activity data: Gegevens van nevenactiviteit
+There aren't any aside activities.: Geen nevenactiviteiten om weer te geven
+Type: Type
+Invisible: Onzichtbaar
+Optional: Optioneel
+Required: Verplicht
+Persons: Personen
+Users: Gebruikers
+Emergency: Dringend
+by: "Door "
+location: Plaats
+
+# Crud
+crud:
+  aside_activity:
+    title_view: Details nevenactiviteit
+    title_new: Nieuwe nevenactiviteit
+    title_edit: Wijzig nevenactiviteit
+    title_delete: Verwijder nevenactiviteit
+    button_delete: Verwijderen
+    confirm_message_delete: Bent u zeker deze nevenactiviteit te willen verwijderen?
+  aside_activity_category:
+    title_new: Nieuwe categorie nevenactiviteiten
+    title_edit: Wijzigen categorie nevenactiviteiten
+
+#forms
+Create a new aside activity type: Nieuwe categorie nevenactiviteiten
+Back to the list: Terug naar de lijst
+Choose the duration: Kies een duur
+Choose a category: Kies een categorie
+Is active: Actief
+For agent: Voor de gebruiker
+date: Datum
+Duration: Duur
+Note: Opmerking
+Choose the agent for whom this activity is created: Kies de gebruiker voor wie deze nevenactiviteit wordt aangemaakt.
+Choose the activity category: Kies een categorie
+
+#Duration
+minutes: minuten
+hour: uur
+hours: uren
+day: dag
+days: dagen
+5 minutes: 5 minuten
+10 minutes: 10 minuten
+15 minutes: 15 minuten
+20 minutes: 20 minuten
+25 minutes: 25 minuten
+30 minutes: 30 minuten
+45 minutes: 45 minuten
+1 hour: 1 uur
+1 hour 15: 1 uur 15
+1 hour 30: 1 uur 30
+1 hour 45: 1 uur 45
+2 hours: 2 uren
+2 hours 30: 2 uur 30
+3 hours: 3 uren
+3 hours 30: 3 uur 30
+4 hours: 4 uren
+4 hours 30: 4 uur 30
+5 hours: 5 uren
+5 hours 30: 5 uur 30
+6 hours: 6 uren
+6 hours 30: 6 uur 30
+7 hours: 7 uren
+7 hours 30: 7 uur 30
+8 hours: 8 uren
+8 hours 30: 8 uur 30
+9 hours: 9 uren
+9 hours 30: 9 uur 30
+10 hours: 10 uren
+1/2 day: 1/2 dag
+1 day: 1 dag
+1 1/2 days: 1 1/2 dagen
+2 days: 2 dagen
+2 1/2 days: 2 1/2 dagen
+3 days: 3 dagen
+3 1/2 days: 3 1/2 dagen
+4 days: 4 dagen
+4 1/2 days: 4 1/2 dagen
+5 days: 5 dagen
+5 1/2 days: 5 1/2 dagen
+6 days: 6 dagen
+6 1/2 days: 6 1/2 dagen
+7 days: 7 dagen
+7 1/2 days: 7 1/2 dagen
+8 days: 8 dagen
+8 1/2 days: 8 1/2 dagen
+9 days: 9 dagen
+9 1/2 days: 9 1/2 dagen
+10 days: 10 dagen
+10 1/2 days: 10 1/2 dagen
+11 days: 11 dagen
+11 1/2 days: 11 1/2 dagen
+12 days: 12 dagen
+12 1/2 days: 12 1/2 dagen
+13 days: 13 dagen
+13 1/2 days: 13 1/2 dagen
+14 days: 14 dagen
+14 1/2 days: 14 1/2 dagen
+15 days: 15 dagen
+15 1/2 days: 15 1/2 dagen
+16 days: 16 dagen
+16 1/2 days: 16 1/2 dagen
+17 days: 17 dagen
+17 1/2 days: 17 1/2 dagen
+18 days: 18 dagen
+18 1/2 days: 18 1/2 dagen
+19 days: 19 dagen
+19 1/2 days: 19 1/2 dagen
+20 days: 20 dagen
+20 1/2 days: 20 1/2 dagen
+21 days: 21 dagen
+21 1/2 days: 21 1/2 dagen
+22 days: 22 dagen
+22 1/2 days: 22 1/2 dagen
+23 days: 23 dagen
+23 1/2 days: 23 1/2 dagen
+24 days: 24 dagen
+24 1/2 days: 24 1/2 dagen
+25 days: 25 dagen
+25 1/2 days: 25 1/2 dagen
+26 days: 26 dagen
+26 1/2 days: 26 1/2 dagen
+27 days: 27 dagen
+27 1/2 days: 27 1/2 dagen
+28 days: 28 dagen
+28 1/2 days: 28 1/2 dagen
+29 days: 29 dagen
+29 1/2 days: 29 1/2 dagen
+30 days: 30 dagen
+
+#list
+My aside activities: Mijn nevenactiviteiten
+#Aside activity delete
+Delete aside activity: Verwijder een nevenactiviteit
+Are you sure you want to remove the aside activity concerning "%name%" ?: Bent u zeker deze nevenactiviteit voor "%name%" te willen verwijderen ?
+The activity has been successfully removed.: De nevenactiviteit werd verwijdert.
+
+#Menu
+Create an aside activity: "Maak een nevenactiviteit aan"
+Aside activity categories: Categorieën van nevenactiviteiten
+Aside activity configuration menu: "Configuratie menu voor nevenactiviteiten"
+Phonecall: "Telefoon oproep"
+
+# admin
+Aside activities: Nevenactiviteiten
+Aside activity types: Types nevenactiviteiten
+Aside activity type configuration: Configuratie categorieën nevenactiviteiten

src/Bundle/ChillAsideActivityBundle/src/translations/validators.nl.yaml

@@ -0,0 +1 @@
+You must not add twice the same category in the parent tree (previous result returned): Je mag niet tweemaal dezelfde entiteit aanduiden in de stamboom. (Het vorige resultaat werd hersteld)

src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php

@@ -13,6 +13,7 @@ namespace Chill\BudgetBundle\Menu;
 
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\Household\Household;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php

@@ -13,6 +13,7 @@ namespace Chill\BudgetBundle\Menu;
 
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\Person;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php

@@ -25,13 +25,13 @@ use function count;
  */
 class SummaryBudget implements SummaryBudgetInterface
 {
-    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
 
-    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
 
-    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
 
-    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
 
     private array $chargeLabels;
 
@@ -110,7 +110,8 @@ class SummaryBudget implements SummaryBudgetInterface
         $rsm = new ResultSetMapping();
         $rsm
             ->addScalarResult('sum', 'sum')
-            ->addScalarResult('type', 'type');
+            ->addScalarResult('type', 'type')
+            ->addScalarResult('comment', 'comment');
 
         return $rsm;
     }
@@ -121,7 +122,7 @@ class SummaryBudget implements SummaryBudgetInterface
         $labels = $this->chargeLabels;
 
         return array_combine($keys, array_map(function ($i) use ($labels) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])];
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
         }, $keys));
     }
 
@@ -131,7 +132,7 @@ class SummaryBudget implements SummaryBudgetInterface
         $labels = $this->resourcesLabels;
 
         return array_combine($keys, array_map(function ($i) use ($labels) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i])];
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
         }, $keys));
     }
 
@@ -158,6 +159,7 @@ class SummaryBudget implements SummaryBudgetInterface
             $result[$row['type']] = [
                 'sum' => (float) $row['sum'],
                 'label' => $this->translatableStringHelper->localize($label[$row['type']]),
+                'comment' => (string) $row['comment'],
             ];
         }
 

src/Bundle/ChillBudgetBundle/translations/messages+intl-icu.nl.yml

@@ -0,0 +1,8 @@
+budget:
+    number of elements: >-
+        {nb_items, plural,
+            =0 {Geen element}
+            one {Één element}
+            many {# elementen}
+            other {# elementen}
+        }