personHasCenter validation removed from Person entity

Update paths - add paths to ignore.

.editorconfig

@@ -7,6 +7,7 @@ charset = utf-8
 end_of_line = LF
 insert_final_newline = true
 trim_trailing_whitespace = true
+indent_size = 4
 
 [*.{php,html,twig}]
 indent_style = space

.gitlab-ci.yml

@@ -5,15 +5,19 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 cache:
   paths:
     - tests/app/vendor/
+    - .composer
 
 before_script:
   # add extensions to postgres
   - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
+  - mkdir -p $COMPOSER_HOME
   - curl -sS https://getcomposer.org/installer | php
   - php -d memory_limit=2G composer.phar install
   - php tests/app/bin/console doctrine:migrations:migrate -n
-  - php -d memory_limit=2G tests/app/bin/console doctrine:fixtures:load -n
+  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+  - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
   - echo "before_script finished"
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
@@ -34,6 +38,10 @@ variables:
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_URL: redis://redis:6379
+  # change vendor dir to make the app install into tests/apps
+  COMPOSER_VENDOR_DIR: tests/app/vendor
+  # cache some composer data
+  COMPOSER_HOME: .composer
 
 
 # Run our tests

.gitlab/merge_request_templates/Default merge request.md

@@ -0,0 +1,24 @@
+
+# Description of changes
+
+<!--
+  describe here the change of your MR. It can be either a text, or a bullet list
+  for changes
+-->
+
+
+# Issues related
+
+<!--
+  list the issues related to this MR.
+
+  It may be client issues, or dev issues
+-->
+
+* ...
+* ...
+
+# Tests
+
+<!-- Describe tests if any, or why no tests -->
+

CHANGELOG.md

@@ -0,0 +1,147 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to
+
+* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
+* date versioning for test releases
+
+## Unreleased
+
+<!-- write down unreleased development here -->
+
+
+
+## Test releases
+
+### Test release 2021-11-08
+
+* [person]: Add civility to the person
+* [person]: Various improvements on the edit person form
+* [person]: Set available_languages and available_countries as parameters for use in the edit person form
+* [activity] Bugfix: documents can now be added to an activity.
+* [tasks] improve tasks with filter order
+* [tasks] refactor singleControllerTasks: limit the number of conditions from the context
+* [validations] validation of accompanying period added: no duplicate participations or resources (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/60).
+* [renderbox] If gender of person is not defined, no icon is displayed instead of neuter-icon (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/129).
+* [confidential information] module added to blur confidential information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/248).
+* refactor `AuthorizationHelper` and `UserACLAwareRepository` to fix constructor, and separate logic for parent role helper into `ParentRoleHelper`
+* [main]: filter location and locationType in backend: exclude NULL names, only active and availableToUsers
+* [activity]: perform client-side validation & show/hide fields in the "new location" modal
+* [person]: normalize person with CenterResolverDispatcher and handle case where center is null or multiple in PersonRenderBox
+* [docstore] voter for PersonDocument and AccompanyingCourseDocument on the 2.0 way (using VoterHelperFactory)
+* [docstore] add authorization check inside controller and menu
+* [activity]: fix inheritance for role `ACTIVITY FULL` and add missing acl in menu
+* [person] show current address in search results
+* [person] show alt names in search results
+* [admin]: links to activity admin section added again.
+* [household]: endDate field deleted from household edit form.
+* [household]: View accompanying periods of current and old household members.
+* [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning
+* [admin]: links to activity admin section added again.
+* [household]: household addresses ordered by ValidFrom date and by id to show the last created address on top.
+* [socialWorkAction]: display of social issue and parent issues + banner context added. 
+* [DBAL dependencies] Upgrade to DBAL 3.1
+* [person]: double parentheses removed around age in banner + whitespace
+
+
+### Test release 2021-10-27
+
+* [person]: delete double actions buttons on search person page
+* [person]: accompanying course work: remove creation date display the list of work + handle case when end date is null
+* [main]: Add new pages with a menu for managing location and location type in the admin
+* [main]: Add some fixtures for location type
+* [calendar]: Pass the location when transforming a calendar item (rdv) into an activity
+* [calendar]: Add a user menu for "my calendar"
+
+### Test release 2021-10-18
+
+* [3party]: french translation of contact and company
+* [3party]: show parent in list
+* [3party]: change color for badge "child"
+* [3party]: fix address creation
+* [household members editor] finalisation of editor
+* [AccompanyingCourse banner]: replace translation referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/70)
+* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location. 
+
+### Test release 2021-10-11
+
+* Address: zoom on postal code geometry + fix origin of manually entered postal code
+
+* in the Address vue component, order the postal code and street address by alphabetic and numeric order
+
+* add 3 new fields to PostalCode and adapt postal code command and fixtures
+
+* [Aside activity] Fixes for aside activity
+
+    * categories with child
+    * fast creation buttons
+    * add ordering for types
+
+* [AccompanyingCourse Resume page] badge-title for AccompanyingCourseWork and for Activities;
+* Improve badges behaviour with small screens;
+
+* [ThirdParty]:
+
+    * third party list
+    * create a kind contact/institution when create a new thirdparty, and set contact embedded as kind=child;
+    * filter thirdparties in list
+
+* [FilterOrder]: add development kit for generating filter and ordering in list
+* [Capitalization of names] person names are capitalized on creation, on prePersist event
+* [On-The-Fly] modale works for showing, editing and creating person or thirdparty ;
+* [AccompanyingCourse Resume page] associated persons list, can see household when hover, and with show on-the-fly modale when clicking person ;
+
+### test release 2021-10-04
+
+* [Household editor][UI] Update how household suggestion and addresses are picked;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/80
+* [AddAddress] Handle address suggestion;
+* [CenterType][Create a person] when overriding the ACL rules, allow to show a PickCenterType
+    when no centers are reachable by the default ACL.
+* [Household] Show comment event if no address are associated with the household;
+* [Person results] Add requestor into search results:
+
+    * a badge "requestor" is shown into search results;
+    * periods where the person is only requestor (without participating) are also shown;
+
+    Issues:
+
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/13
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/199
+* [Person form] "accept sms" not required:
+
+    https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/37
+    https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/221
+
+* [Household editor] suggest only temporarily addresses;
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/82
+* On-The-Fly modale works for showing, editing and creating person and thirdparty ;
+* AccompanyingCourse Resume page: list associated persons by household, see household when hover, and show on-the-fly modale when clicking on person ;
+* [AddAddress] Handle address suggestion;
+* [AddAddress][Entity address]: add a link between address and address reference;
+* [Household editor] suggest household by comparing the temporary addresses from courses;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/81
+* On-The-Fly modale works for showing, editing and creating person and thirdparty
+
+
+## Test released
+
+<!-- 
+
+Coming soon...
+
+DO NOT ADD unreleased items here. Add them under "Unreleased" title
+
+### Test release yyyy-mm-dd
+
+-->
+
+## Stable releases
+
+No stable releases for v2+
+ 

CONVENTIONS.md

@@ -0,0 +1,383 @@
+# Conventions Chill
+
+en cours de rédaction
+
+
+## Assets: nommage des entrypoints
+
+Trois types d'entrypoint:
+
+* application vue (souvent spécifique à une page) -> préfixé par `vue_`;
+* code js/css qui est réutilisé à plusieurs endroits:
+    * ckeditor
+    * async_upload (utilisé pour un formulaire)
+    * bootstrap
+    * chill.js
+    * ...
+
+   => on préfixe `mod_`
+* code css ou js pour une seule page
+    * ré-utilise parfois des "foncitionnalités": ShowHide, ...
+   => on préfixe `page_`
+
+
+Arborescence:
+
+```
+# Sous Resources/public
+
+- chill/ => theme (chill)
+    - chillmain.scss  -> push dans l'entrypoint chill
+- lib/ => ne vont jamais dans un entrypoint, mais sont ré-utilisés par d'autres
+    - ShowHide
+    - Collection
+    - Select2
+- module/ => termine dans des entrypoints ré-utilisables (mod_)
+    - bootstrap
+        - custom.scss
+        - custom/
+            - variables.scss
+            - ..
+    - forkawesome
+    - AsyncUpload
+- vue/ => uniquement application vue (vue_)
+    - _components
+    - app
+- page/ => uniquement pour une seule page (page_)
+    - login
+    - person
+    - personvendee
+    - household_edit_metadata
+        - index.js
+```
+
+## Organisation des feuilles de styles
+
+Comment s'échaffaudent les styles dans Chill ?
+
+
+1. l'entrypoint **mod_bootstrap** (module bootstrap) est le premier niveau. Toutes les parties(modules) de bootstrap sont convoquées dans le fichier ```bootstrap.js``` situé dans ```ChillMainBundle/Resources/public/module/bootstrap```. 
+    * Au début, ce fichier importe le fichier ```variables.scss``` qui détermine la plupart des réglages bootstrap tels qu'on les a personnalisés. Ce fichier surcharge l'original, et de nombreuses variables y sont adaptées pour Chill. 
+        * On veillera à ce qu'on puisse toujours comparer ce fichier à l'original de bootstrap. En cas de mise à jour de bootstrap, il faudra générer un diff, et adapter ce diff sur le fichier variable de la nouvelle version.
+    * A la fin on importe le fichier ```custom.scss```, qui comprends des adaptations de bootstrap pour le préparer à notre thème Chill. 
+        * ce ```custom.scss``` peut être splitté en plus petits fichiers avec des ```@import 'custom/...'```
+    * L'idée est que cette première couche bootstrap règle un partie importante des styles de l'application, en particulier ce qui touche aux position du layout, aux points de bascules responsive, aux marges et écarts appliqués par défauts aux éléments qu'on manipule.
+
+2. l'entrypoint **chill** est le second niveau. Il contient le thème Chill qui est reconnaissable à l'application.
+    * Chaque bundle a un dossier ```Resources/public/chill``` dans lequel on peut trouver une feuille sass principale, qui est éventuellement splittée avec des ```@imports```. Toutes ces feuilles sont compilées dans un unique entrypoint Chill, c'est le thème de l'application. Celui-ci surcharge bootstrap.
+    * La feuille chillmain.scss devrait contenir les cascades de styles les plus générales, celles qui sont appliquées à de nombreux endroits de l'application. 
+    * La feuille chillperson.scss va aussi retrouver des styles propres aux différents contextes des personnes: person, household et accompanyingcourse.
+    * Certains bundles plus secondaires ne contiennent que des styles spécifiques à leur fonctionnement.
+
+3. les entrypoints **vue_** sont utilisés pour des composants vue. Les fichiers vue peuvent contenir un bloc de styles scss. Ce sont des styles qui ne concernent que le composant et son héritage, le tag ```scoped``` précise justement sa portée (voir la doc).
+
+4. les entrypoints **page_** sont utilisés pour ajouter des assets spécifiques à certaines pages, le plus souvent des scripts et des styles. 
+
+
+## Taguer du code html et construire la cascade de styles
+
+L'exemple suivant montre comment taguer sans excès un élément de code. On remarque que:
+* il n'est pas nécessaire de taguer toutes les classes intérieures, 
+* il ne faut pas répéter la classe parent dans toutes les classes enfants. La cascade sass va permettre de saisir le html avec souplesse sans alourdir la structure des balises.
+* souvent la première classe sera déclinée par plusieurs classes qui commencent de la même manière: ```bloc-dark``` ajoute juste la version sombre de ```bloc```, on ne met pas ```bloc dark```, car on ne souhaite pas que la classe ```dark``` de ```bloc``` interagisse avec la même classe ```dark``` de ```table```. On aura donc un élément ```bloc bloc-dark``` et un élément ```table table-dark```.
+
+```html
+<div class="bloc bloc-dark mon-bloc">
+ <h3>mon titre</h3>
+ <ul class="record_actions">
+    <li>
+        <a class="btn btn-edit"></a>
+    </li>
+    <li></li>
+    <li></li>
+ </ul>
+</div>
+```
+
+Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'actions et ce qu'est un bouton. Ces 3 éléments existent de manière autonome, ce sont les seuls qu'on tagge. 
+
+Par exemple pour mettre un style au titre on précise juste h3 dans la cascade bloc.
+
+```sass
+div.bloc {
+   // un bloc générique, utilisé à plusieurs endroits
+   &.bloc-dark {
+      // la version sombre du bloc
+   }
+   h3 {}
+   ul {
+      // une liste standard dans bloc
+      li {
+         // des items de liste standard dans bloc
+      }
+   }
+}
+div.mon-bloc {
+   // des exceptions spécifiques à mon-bloc, 
+   // qui sont des adaptations de bloc
+}
+
+ul.record_actions {
+   // va uniformiser tous les record_actions de l'application  
+   li {
+     //...
+   }
+}
+
+.btn {
+  // les boutons de bootstrap
+  .btn-edit {
+     // chill étends les boutons bootstrap pour ses propres besoins
+  }
+}
+</style>
+```
+
+## Render box
+
+
+## URL
+
+### Nommage des routes
+
+:::warning
+Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhaitées pour le futur.
+:::
+
+Les routes sont nommées de cette manière:
+
+`chill_bundle_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`, ...)
+
+Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+
+Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.
+
+### URL
+
+Les URL respectent également une convention:
+
+#### Pour les pages html
+
+:::warning
+Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhaitées pour le futur.
+:::
+
+Syntaxe:
+
+```
+/{_locale}/bundle/entity/{id}/action
+/{_locale}/bundle/entity/sub-entity/{id}/action
+```
+
+Les éléments suivants devraient se trouver dans la liste:
+
+1. la locale;
+2. un identifiant du bundle
+3. l'entité auquel il se rapporte
+4. les éventuelles sous-entités auxquelles l'url se rapport
+5. l'action
+
+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.
+
+Exemple:
+
+```
+# liste des échanges pour une personne
+/fr/activity/person/25/activity/list
+
+# nouvelle activité
+/fr/activity/activity/new?person_id=25
+
+```
+
+#### Pour les API
+
+:::info
+Les routes générées automatiquement sont préfixées par chill_api
+:::
+
+Syntaxe:
+
+```
+/api/1.0/bundle/entity/{id}/action
+/api/1.0/bundle/entity/sub-entity/{id}/action
+```
+
+Les éléments suivants devraient se trouver dans la liste:
+
+1. la string `/api/` et puis la version (1.0)
+2. un identifiant du bundle
+3. l'entité auquel il se rapporte
+4. les éventuelles sous-entités auxquelles l'url se rapport
+5. l'action
+
+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.
+
+## Règles UI chill
+
+### Titre des pages
+
+#### Chaque page contient un titre
+
+Chaque page contient un titre dans la balise head. Ce titre est normalement identique à celui de l'entête de la page.
+
+Astuce: il est possible d'utiliser la fonction `block` de twig pour cela:
+
+```htmlmixed=
+{% block title "Titre de la page" %}
+
+{% block content %}
+<h1>
+    {{ block('title')}}
+</h1>
+{% endblock %}
+```
+
+
+### Utilisation des `entity_render`
+
+#### En twig
+
+Les templates twig doivent toujours utiliser la fonction chill_entity_render_box pour effectuer le rendu des éléments suivants:
+
+* User
+* Person
+* SocialIssue
+* SocialAction
+* Address
+* ThirdParty
+* ...
+
+Exemple:
+
+```
+address|chill_entity_render_box
+```
+
+Justification: 
+
+* des éléments sont parfois personnalisés par installation (par exemple, le nom de chaque utilisateur sera suivi par le nom du service)
+* pour rationaliser et rendre semblable les affichages
+* pour simplifier le code twig
+
+A prevoir:
+
+* toujours trois positions:
+    * inline
+    * block 
+    * item (dans un tableau, une ligne)
+
+> block et item sont en fait la même option passée au render_box: render: bloc. Il y a aussi ‘raw’ pour le inline, et ‘label’ pour une titraille configurable avec des options.
+
+> quand on passe l’option render: bloc, on peut placer le render_box dans une boucle for plus large qui fonctionne avec la classe flex-table ou la classe flex-bloc, ce qui donnera un affichage en rangée (table) ou en blocs. [name=Mathieu] 
+  
+
+
+#### En vue
+
+Il existe systématiquement une "box" équivalente en vue.
+
+#### Lien vers des sections
+
+A chaque fois qu'on indique le nom d'une personne, un parcours, un ménage, il y a toujours:
+
+* un lien pour accéder à son dossier (pour autant que l'utilisateur ait les droits d'accès);
+* à moins qu'il ne soit indiqué dans une phrase, l'icône de son dossier avant ou après (donc un bonhomme pour la personne, une maison pour le ménage, un fa-random pour les parcours);
+
+Ces éléments sont toujours proposé par des `render_box` par défaut. Des options permettent de les désactiver dans des cas particuliers
+
+> à discuter, quelques réflexion: 
+> quelle est la logique qui domine pour les boutons ? on a symbolisé les 4 actions du crud par des couleurs: bleu(show) orange(edit) vert(create) et rouge(delete). 
+> Est-ce que c'est ça qui prime, et comment ça s'articule avec la logique des pictos ? 
+> Par exemple, il pourrait être logique d'utiliser l'oeil bleu pour voir l'objet, qu'il s'agisse d'une personne ou d'un parcours, ce serait plutôt le contexte, et l'infobulle (title) qui préciserait le contexte.
+> Je pense que les pictos de boutons doivent faire référence à l'action, mais pas à l'objet. Autrement dit je n'utiliserais jamais l'icone du ménage ou du parcours dans les boutons.
+> Pour représenter les ménages et les parcours, je pense qu'il faudrait trouver autre chose que forkawesome. Si c'est des pictos, trouver un motif différents et de tailles différente. Réfléchir à un couplage picto-couleur-forme différent, qui exprime le contexte et qui se distingue bien des boutons.
+> Idem pour les badges, il faut une palette de badge qui couvre tous les besoins: socialIssue, socialActions, socialReason, members, etc. [name=Mathieu] 
+
+### Formulaires
+
+#### Vocabulaire:
+
+Utiliser toujours:
+
+* `Créer` dans un `bt bt-create` pour les **liens** vers le formulairep pour créer une entité (pour parvenir au formulaire);
+* `Enregistrer` dans un `bt bt-save` pour les boutons "Enregistrer" (dans un formulaire édition **ou** création);
+* `Enregistrer et nouveau`
+* `Enregistrer et voir`
+* `Modifier` dans un `bt bt-edit` pour les **liens** vers le formulaire d'édition
+* `Dupliquer` (préciser là où on peut le voir)
+* `Annuler` pour quitter une page d'édition avec un lien vers la liste, ou le `returnPath`
+
+#### Retour après un enregistrement
+
+Après avoir cliqué sur "Créer" ou "Sauver", la page devrait revenir:
+
+* vers le returnPath, s'il existe;
+* sinon, vers la page "vue".
+
+
+### Bandeaux contenant les boutons d'actions
+
+Les boutons sont toujours dans un bandeau "sticky-form" dans le bas du formulaire ou de la page de liste.
+
+Si pertinent:
+
+* Le bandeau contient un bouton "Annuler" qui retourne à la page précédente. Il est obligatoire pour les formulaires, optionnel pour les listes ou les pages "résumés"
+* Ce bouton "annuler" est toujours à gauche
+
+```
+<ul class="record_actions sticky-form-buttons">
+    <li class="cancel">
+        <a href="{{ chill_entity_return_path('route_name' { 'route': 'option' } )}}">{{ return_path_label }}</a>
+    </li>
+    <li>
+        <!-- action 1 -->
+    </li>
+</ul>
+```
+
+### Messages flash
+
+#### A la création d'une entité
+
+A chaque fois qu'un élément est créé par un formulaire, un message flash doit apparaitre. Il indique:
+
+> "L'élément a été créé"
+
+Le nom de l'élément peut être remplacé par quelque chose de plus pertinent: 
+
+> * L'activité a été créée
+> * Le rendez-vous a été créé
+> * ...
+
+
+#### A l'enregistrement d'une entité
+
+A chaque fois qu'un élément est enregistré, un message flash doit apparaitre:
+
+> * Les données ont été modifiées
+> 
+
+#### Erreur sur un formulaire (erreur de validation)
+
+En tête d'un formulaire, un message flash doit indiquer que des validations n'ont pas réussi:
+
+> Ce formulaire contient des erreurs
+
+Les erreurs doivent apparaitre attachée au champ qui les concerne. Toutefois, il est acceptable d'afficher les erreurs à la racine du formulaire s'il était complexe, techniquement, d'attacher les erreurs.
+
+### Liens de retour
+
+A chaque fois qu'un lien est indiqué, vérifier si on ne doit pas utiliser la fonction `chill_return_path`, `chill_forward_return_path` ou `chill_return_path_or`.
+
+* depuis la page liste, vers l'ouverture d'un élément, ou le bouton création => utiliser `chill_path_add_return_path`
+* dans ces pages d'éditions, 
+    * utiliser `chill_return_path_or` dans le bouton "Cancel";
+    * pour les boutons "enregistrer et voir" et "Enregistrer et fermer" => ?
+

LICENSE

@@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    chill-bundles
+    Copyright (C) 2021  Chill Project
 
     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
+    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,

composer.json

@@ -9,18 +9,20 @@
     "license": "AGPL-3.0-only",
     "require": {
         "champs-libres/async-uploader-bundle": "dev-sf4",
+        "champs-libres/wopi-bundle": "dev-master",
         "composer/package-versions-deprecated": "^1.10",
         "doctrine/doctrine-bundle": "^2.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.7",
-        "drupol/php-conventions": "^5.0",
         "erusev/parsedown": "^1.7",
         "graylog2/gelf-php": "^1.5",
         "knplabs/knp-menu": "^3.1",
         "knplabs/knp-menu-bundle": "^3.0",
         "knplabs/knp-time-bundle": "^1.12",
-        "league/csv": "^9.6",
+        "league/csv": "^9.7.1",
+        "nyholm/psr7": "^1.4",
         "phpoffice/phpspreadsheet": "^1.16",
+        "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
         "symfony/asset": "4.*",
         "symfony/browser-kit": "^5.2",
@@ -28,6 +30,7 @@
         "symfony/expression-language": "4.*",
         "symfony/form": "4.*",
         "symfony/intl": "4.*",
+        "symfony/mime": "^4 || ^5",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "4.*",
         "symfony/serializer": "^5.2",
@@ -51,6 +54,9 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^5.1",
@@ -76,7 +82,11 @@
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
-            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"
+            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
+            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
+            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
+            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
+            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
         }
     },
     "autoload-dev": {
@@ -84,6 +94,8 @@
             "App\\": "tests/app/src/"
         }
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",

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

@@ -98,7 +98,6 @@ class CountPerson implements ExportInterface
                   // immediatly
                   return $value;
         };
-        };
     }
     
     public function getAllowedFormattersTypes()

docs/source/development/pagination.rst

@@ -28,7 +28,7 @@ Then, render the pagination using the dedicated twig function.
 
 .. code-block:: html+twig
 
-   {% extends "ChillPersonBundle::layout.html.twig"  %}
+   {% extends "@ChillPerson/Person/layout.html.twig"  %}
 
    {% block title 'Item list'|trans %}
 

docs/source/development/pagination/example.php

@@ -34,8 +34,8 @@ class ItemController extends Controller {
         return $this->render('ChillMyBundle:Item:list.html.twig', array(
                 'items' => $items,
                 'paginator' => $paginator
-                )
                 );
+            
     }
 
 }

docs/source/development/user-interface/layout-template-usage.rst

@@ -149,7 +149,7 @@ It proposes a new block :
 
   * where to display the admin content
 
-ChillPersonBundle::layout.html.twig
+@ChillPersonBundle/Person/layout.html.twig
 -----------------------------------
 
 This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the person details in the block `top_banner`, set the menu `person` as the vertical menu.

grumphp.yml

@@ -1,22 +0,0 @@
-imports:
-  - { resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml }
-
-parameters:
-  tasks.license.name: AGPL-3.0
-  tasks.license.holder: Champs-Libres
-  tasks.phpstan.configuration: phpstan.neon
-  tasks.phpstan.ignore_patterns:
-    - /src\/Bundle\/(.*)\/migrations/
-    - /src\/Bundle\/(.*)\/Resources/
-    - /src\/Bundle\/(.*)\/Tests/
-    - /src\/Bundle\/(.*)\/Test/
-    - /src\/Bundle\/(.*)\/config/
-    - /src\/Bundle\/(.*)\/translations/
-    - /src\/Bundle\/(.*)\/DataFixtures/
-    - /^docs/
-    - /^tests/
-  skip_tasks:
-    - composer_require_checker
-    - phpcsfixer
-    - phpcs
-    - twigcs

package.json.txt

@@ -0,0 +1,3 @@
+add npm/yarn dependency in package.json :
+
+"select2-bootstrap-theme": "0.1.0-beta.10",

phpstan.neon

@@ -1,3 +0,0 @@
-includes:
-	- phpstan-baseline.neon
-

phpstan.neon.dist

@@ -0,0 +1,21 @@
+parameters:
+    level: 1
+    paths:
+        - src/
+    excludePaths:
+        - src/Bundle/*/Tests/*
+        - src/Bundle/*/Test/*
+        - src/Bundle/*/config/*
+        - src/Bundle/*/migrations/*
+        - src/Bundle/*/translations/*
+        - src/Bundle/*/Resources/*
+        - src/Bundle/*/src/Tests/*
+        - src/Bundle/*/src/Test/*
+        - src/Bundle/*/src/config/*
+        - src/Bundle/*/src/migrations/*
+        - src/Bundle/*/src/translations/*
+        - src/Bundle/*/src/Resources/*
+
+includes:
+    - phpstan-baseline.neon
+

phpunit.xml.dist

@@ -31,6 +31,12 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
+        <testsuite name="AsideActivityBundle">
+          <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+        </testsuite>
+        <testsuite name="CalendarBundle">
+            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+        </testsuite>
     </testsuites>
 
     <listeners>

src/Bundle/ChillActivityBundle/CHANGELOG.md

@@ -27,3 +27,4 @@ Version 1.5.5
 =============
 
 - [activity] replace dropdown for selecting reasons and use chillEntity for reason rendering
+- fix bug: error when trying to edit activity of which the type has been deactivated

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -22,17 +22,25 @@
 
 namespace Chill\ActivityBundle\Controller;
 
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Form\ActivityType;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Class ActivityController
@@ -41,62 +49,45 @@ use Chill\ActivityBundle\Form\ActivityType;
  */
 class ActivityController extends AbstractController
 {
+    protected EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected LoggerInterface $logger;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected SerializerInterface $serializer;
+
+    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
 
-    /**
-     * ActivityController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param AuthorizationHelper $authorizationHelper
-     */
     public function __construct(
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        SerializerInterface $serializer
     ) {
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
+        $this->serializer = $serializer;
     }
 
     /**
      * Lists all Activity entities.
-     *
      */
-    public function listAction($person_id, Request $request)
+    public function listAction(Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $view = null;
+        // TODO: add pagination
 
-        if ($person === NULL) {
-            throw $this->createNotFoundException('Person not found');
-        }
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableScopes($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
-            $person->getCenter());
-
-        $activities = $em->getRepository('ChillActivityBundle:Activity')
-                ->findBy(
-                      array('person' => $person, 'scope' => $reachableScopes),
-                      array('date' => 'DESC')
-                      );
+        if ($person instanceof Person) {
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
+            $activities = $this->activityACLAwareRepository
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
@@ -104,153 +95,251 @@ class ActivityController extends AbstractController
             ));
             $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        return $this->render('ChillActivityBundle:Activity:list.html.twig', array(
+            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
+        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
+
+            $activities = $this->activityACLAwareRepository
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
+
+            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
+        }
+
+        return $this->render($view, array(
             'activities' => $activities,
-            'person'   => $person
+            'person'   => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
         ));
     }
-    /**
-     * Creates a new Activity entity.
-     *
-     */
-    public function createAction($person_id, Request $request)
+
+    public function selectTypeAction(Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $view = null;
 
-        if ($person === NULL) {
-            throw $this->createNotFoundException('person not found');
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
         }
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        $data = [];
 
-        $entity = new Activity();
-        $entity->setPerson($person);
-        $form = $this->createCreateForm($entity, $person);
-        $form->handleRequest($request);
+        $activityTypeCategories = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityTypeCategory::class)
+            ->findBy(['active' => true], ['ordering' => 'ASC']);
 
-        if ($form->isValid()) {
+        foreach ($activityTypeCategories as $activityTypeCategory) {
+            $activityTypes = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
+                ->findBy(['active' => true, 'category' => $activityTypeCategory], ['ordering' => 'ASC']);
+
+            $data[] = [
+                'activityTypeCategory' => $activityTypeCategory,
+                'activityTypes' => $activityTypes,
+            ];
+        }
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        } else {
+            $activityData = [];
+        }
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'data' => $data,
+            'activityData' => $activityData
+        ]);
+    }
+
+    public function newAction(Request $request): Response
+    {
         $em = $this->getDoctrine()->getManager();
 
-            $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity,
-                    'creation of this activity not allowed');
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
 
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+        }
+
+        $activityType_id = $request->get('activityType_id', 0);
+        $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
+            ->find($activityType_id);
+
+        if (isset($activityType) && !$activityType->isActive()) {
+            throw new \InvalidArgumentException('Activity type must be active');
+        }
+
+        $activityData = null;
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        }
+
+        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
+            !$activityType->isActive()) {
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            if (null !== $activityData) {
+                $params['activityData'] = $activityData;
+            }
+            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
+        }
+
+        $entity = new Activity();
+        $entity->setUser($this->getUser());
+
+        if ($person instanceof Person) {
+            $entity->setPerson($person);
+        }
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $entity->setAccompanyingPeriod($accompanyingPeriod);
+        }
+
+        $entity->setType($activityType);
+        $entity->setDate(new \DateTime('now'));
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+
+            if (array_key_exists('durationTime', $activityData)) {
+                $durationTimeInMinutes = $activityData['durationTime'];
+                $hours = floor($durationTimeInMinutes / 60);
+                $minutes = $durationTimeInMinutes % 60;
+                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+                if ($duration) {
+                    $entity->setDurationTime($duration);
+                }
+            }
+
+            if (array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+                if ($date) {
+                    $entity->setDate($date);
+                }
+            }
+
+            if (array_key_exists('personsId', $activityData)) {
+                foreach($activityData['personsId'] as $personId){
+                    $concernedPerson = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
+                    $entity->addPerson($concernedPerson);
+                }
+            }
+
+            if (array_key_exists('professionalsId', $activityData)) {
+                foreach($activityData['professionalsId'] as $professionalsId){
+                    $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
+                    $entity->addThirdParty($professional);
+                }
+            }
+
+            if (array_key_exists('location', $activityData)) {
+                $location = $em->getRepository(\Chill\MainBundle\Entity\Location::class)->find($activityData['location']);
+                $entity->setLocation($location);
+            }
+            
+            if (array_key_exists('comment', $activityData)) {
+                $comment = new CommentEmbeddable();
+                $comment->setComment($activityData['comment']);
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new \DateTime('now'));
+                $entity->setComment($comment);
+            }
+
+        }
+
+        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_CREATE'),
+            'activityType' => $entity->getType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
             $em->persist($entity);
             $em->flush();
 
-            $this->get('session')
-                ->getFlashBag()
-                ->add('success',
-                    $this->get('translator')
-                        ->trans('Success : activity created!')
-                );
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
-            return $this->redirect(
-                $this->generateUrl('chill_activity_activity_show',
-                array('id' => $entity->getId(), 'person_id' => $person_id)));
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
 
-        $this->get('session')
-            ->getFlashBag()->add('danger',
-                $this->get('translator')
-                    ->trans('The form is not valid. The activity has not been created !')
-            );
-
-        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-            'person' => $person
-        ));
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
         }
 
-    /**
-     * Creates a form to create a Activity entity.
-     *
-     * @param Activity $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Activity $entity)
-    {
-        $form = $this->createForm(ActivityType::class, $entity,
-              array(
-                'action' => $this->generateUrl('chill_activity_activity_create', [
-                    'person_id' => $entity->getPerson()->getId(),
-                    ]),
-                'method' => 'POST',
-                'center' => $entity->getCenter(),
-                'role'   => new Role('CHILL_ACTIVITY_CREATE')
-            )
-        );
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new Activity entity.
-     *
-     */
-    public function newAction($person_id)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        if ($person === NULL){
-            throw $this->createNotFoundException('Person not found');
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $entity = new Activity();
-        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
-        $entity->setPerson($person);
-        $entity->setDate(new \DateTime('now'));
-
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
-
-        $form   = $this->createCreateForm($entity, $person);
-
-        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
+        return $this->render($view, [
             'person'   => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
             'form' => $form->createView(),
-        ));
+            'activity_json' => $activity_array
+        ]);
     }
 
-    /**
-     * Finds and displays a Activity entity.
-     *
-     */
-    public function showAction($person_id, $id)
+    public function showAction(Request $request, $id): Response
     {
         $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        if (!$person) {
-            throw $this->createNotFoundException('person not found');
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
         }
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
         $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
+        if (null !== $accompanyingPeriod) {
+           $entity->personsAssociated = $entity->getPersonsAssociated();
+           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
+        }
 
-        $deleteForm = $this->createDeleteForm($id, $person);
+        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
 
+        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+
+        // TODO
+        /*
         $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
             'action' => 'show'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        */
 
-        return $this->render('ChillActivityBundle:Activity:show.html.twig', array(
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, array(
             'person'      => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
             'entity'      => $entity,
             'delete_form' => $deleteForm->createView(),
         ));
@@ -260,118 +349,70 @@ class ActivityController extends AbstractController
      * Displays a form to edit an existing Activity entity.
      *
      */
-    public function editAction($person_id, $id)
+    public function editAction($id, Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        if (!$person) {
-            throw $this->createNotFoundException('person not found');
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
         }
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
         $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
-        $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id, $person);
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_UPDATE'),
+            'activityType' => $entity->getType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
 
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em->persist($entity);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $id;
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+
+        /*
+         * TODO
         $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
             'action' => 'edit'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'person' => $person
-        ));
-    }
-
-    /**
-    * Creates a form to edit a Activity entity.
-    *
-    * @param Activity $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
         */
-    private function createEditForm(Activity $entity)
-    {
-        $form = $this->createForm(ActivityType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activity_update',
-                    array(
-                        'id' => $entity->getId(),
-                        'person_id' => $entity->getPerson()->getId()
-                )),
-            'method' => 'PUT',
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_UPDATE')
-        ));
 
-        return $form;
-    }
-    /**
-     * Edits an existing Activity entity.
-     *
-     */
-    public function updateAction(Request $request, $person_id, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        $deleteForm = $this->createDeleteForm($id, $person);
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Activity::class,
-            'element_id' => $entity->getId(),
-            'action' => 'update'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            $this->get('session')
-                ->getFlashBag()
-                ->add('success',
-                    $this->get('translator')
-                        ->trans('Success : activity updated!')
-                );
-
-            return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $id, 'person_id' => $person_id)));
-        }
-
-        $this->get('session')
-            ->getFlashBag()
-            ->add('error',
-                $this->get('translator')
-                    ->trans('This form contains errors')
-            );
-
-        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
-            'person'      => $entity->getPerson(),
+        return $this->render($view, array(
             'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
+            'edit_form'   => $form->createView(),
             'delete_form' => $deleteForm->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'activity_json' => $activity_array
         ));
     }
 
@@ -379,22 +420,29 @@ class ActivityController extends AbstractController
      * Deletes a Activity entity.
      *
      */
-    public function deleteAction(Request $request, $id, $person_id)
+    public function deleteAction(Request $request, $id)
     {
         $em = $this->getDoctrine()->getManager();
 
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
         /* @var $activity Activity */
-        $activity = $em->getRepository('ChillActivityBundle:Activity')
-              ->find($id);
-        $person = $activity->getPerson();
+        $activity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
         if (!$activity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
 
-        $form = $this->createDeleteForm($id, $person);
+        $form = $this->createDeleteForm($id, $person, $accompanyingPeriod);
 
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
@@ -404,14 +452,14 @@ class ActivityController extends AbstractController
                 $this->logger->notice("An activity has been removed", array(
                    'by_user' => $this->getUser()->getUsername(),
                    'activity_id' => $activity->getId(),
-                   'person_id' => $activity->getPerson()->getId(),
+                   'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
                    'comment' => $activity->getComment()->getComment(),
-                   'scope_id' => $activity->getScope()->getId(),
+                   'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
                    'reasons_ids' => $activity->getReasons()
                       ->map(function ($ar) { return $ar->getId(); })
                       ->toArray(),
                    'type_id' => $activity->getType()->getId(),
-                   'duration' => $activity->getDurationTime()->format('U'),
+                   'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
                    'date' => $activity->getDate()->format('Y-m-d'),
                    'attendee' => $activity->getAttendee()
                 ));
@@ -422,37 +470,86 @@ class ActivityController extends AbstractController
                 $this->addFlash('success', $this->get('translator')
                       ->trans("The activity has been successfully removed."));
 
-                return $this->redirect($this->generateUrl(
-                  'chill_activity_activity_list', array(
-                     'person_id' => $person_id
-                  )));
+                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+                return $this->redirectToRoute('chill_activity_activity_list', $params);
             }
         }
 
-        return $this->render('ChillActivityBundle:Activity:confirm_delete.html.twig', array(
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, array(
            'activity' => $activity,
-           'delete_form' => $form->createView()
+           'delete_form' => $form->createView(),
+           'person' => $person,
+           'accompanyingCourse' => $accompanyingPeriod,
         ));
-
-
     }
 
     /**
      * Creates a form to delete a Activity entity by id.
-     *
-     * @param mixed $id The entity id
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm($id, $person)
+    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
     {
+        $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+        $params['id'] = $id;
+
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl(
-                'chill_activity_activity_delete',
-                array('id' => $id, 'person_id' => $person->getId())))
+            ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, array('label' => 'Delete'))
             ->getForm()
         ;
     }
+
+    private function getEntity(Request $request): array
+    {
+        $em = $this->getDoctrine()->getManager();
+        $person = $accompanyingPeriod  = null;
+
+        if ($request->query->has('person_id')) {
+            $person_id = $request->get('person_id');
+            $person = $em->getRepository(Person::class)->find($person_id);
+
+            if ($person === null) {
+                throw $this->createNotFoundException('Person not found');
+            }
+
+            $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        } elseif ($request->query->has('accompanying_period_id')) {
+            $accompanying_period_id = $request->get('accompanying_period_id');
+            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
+
+            if ($accompanyingPeriod === null) {
+                throw $this->createNotFoundException('Accompanying Period not found');
+            }
+
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        } else {
+            throw $this->createNotFoundException("Person or Accompanying Period not found");
+        }
+
+        return [
+            $person, $accompanyingPeriod
+        ];
+    }
+
+    private function buildParamsToUrl(
+        ?Person $person,
+        ?AccompanyingPeriod $accompanyingPeriod
+    ): array {
+        $params = [];
+
+        if ($person) {
+            $params['person_id'] = $person->getId();
+        }
+
+        if ($accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
+        }
+
+        return $params;
+    }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityTypeController.php

@@ -1,178 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Controller;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Form\ActivityTypeType;
-
-/**
- * Class ActivityTypeController
- *
- * @package Chill\ActivityBundle\Controller
- */
-class ActivityTypeController extends AbstractController
-{
-
-    /**
-     * Lists all ActivityType entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityType')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityType:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
-    /**
-     * Creates a new ActivityType entity.
-     *
-     */
-    public function createAction(Request $request)
-    {
-        $entity = new ActivityType();
-        $form = $this->createCreateForm($entity);
-        $form->handleRequest($request);
-
-        if ($form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($entity);
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('chill_activity_activitytype_show', array('id' => $entity->getId())));
-        }
-
-        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityType entity.
-     *
-     * @param ActivityType $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityType $entity)
-    {
-        $form = $this->createForm(ActivityTypeType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activitytype_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new ActivityType entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new ActivityType();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a ActivityType entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityType entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityType:show.html.twig', array(
-            'entity'      => $entity,
-        ));
-    }
-
-    /**
-     * Displays a form to edit an existing ActivityType entity.
-     *
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityType entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView()
-        ));
-    }
-
-    /**
-    * Creates a form to edit a ActivityType entity.
-    *
-    * @param ActivityType $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(ActivityType $entity)
-    {
-        $form = $this->createForm(ActivityTypeType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activitytype_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-    /**
-     * Edits an existing ActivityType entity.
-     *
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityType entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('chill_activity_activitytype_edit', array('id' => $id)));
-        }
-
-        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
-    }
-}

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Chill\ActivityBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class AdminActivityPresenceController extends CRUDController
+{
+    /**
+     * @param string $action
+     * @param \Doctrine\ORM\QueryBuilder|mixed $query
+     * @param Request $request
+     * @param PaginatorInterface $paginator
+     * @return \Doctrine\ORM\QueryBuilder|mixed
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        /** @var \Doctrine\ORM\QueryBuilder $query */
+        return $query->orderBy('e.id', 'ASC');
+    }
+}

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Chill\ActivityBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class AdminActivityTypeCategoryController extends CRUDController
+{
+    /**
+     * @param string $action
+     * @param \Doctrine\ORM\QueryBuilder|mixed $query
+     * @param Request $request
+     * @param PaginatorInterface $paginator
+     * @return \Doctrine\ORM\QueryBuilder|mixed
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        /** @var \Doctrine\ORM\QueryBuilder $query */
+        return $query->orderBy('e.ordering', 'ASC');
+    }
+}

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Chill\ActivityBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class AdminActivityTypeController extends CRUDController
+{
+    /**
+     * @param string $action
+     * @param \Doctrine\ORM\QueryBuilder|mixed $query
+     * @param Request $request
+     * @param PaginatorInterface $paginator
+     * @return \Doctrine\ORM\QueryBuilder|mixed
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        /** @var \Doctrine\ORM\QueryBuilder $query */
+        return $query->orderBy('e.ordering', 'ASC');
+    }
+}

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

@@ -116,9 +116,10 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
             ->setDurationTime($this->faker->dateTime(36000))
             ->setType($this->getRandomActivityType())
             ->setScope($this->getRandomScope())
-            ->setAttendee($this->faker->boolean())
             ;
 
+        //      ->setAttendee($this->faker->boolean())
+
         $usedId = array();
         for ($i = 0; $i < rand(0, 4); $i++) {
             $reason = $this->getRandomActivityReason($usedId);
@@ -137,11 +138,14 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
 
         foreach($persons as $person) {
             $activityNbr = rand(0,3);
+            $ref = 'activity_'.$person->getFullnameCanonical();
+
             for($i = 0; $i < $activityNbr; $i ++) {
-                print "Creating an activity type for  : ".$person."\n";
                 $activity = $this->newRandomActivity($person);
                 $manager->persist($activity);
             }
+
+            $this->setReference($ref, $activity);
         }
         $manager->flush();
     }

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace Chill\ActivityBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivity;
+
+/**
+ * Load notififications into database
+ */
+class LoadActivityNotifications extends AbstractFixture implements DependentFixtureInterface
+{
+    use LoadAbstractNotificationsTrait;
+
+    public $notifs = [
+        [
+            'message' => 'Hello !',
+            'entityClass' => Activity::class,
+            'entityRef' => 'activity_gerard depardieu',
+            'sender' => 'center a_social',
+            'addressees' => [
+                'center a_social',
+                'center a_administrative',
+                'center a_direction',
+                'multi_center'
+            ],
+        ]
+    ];
+
+    public function getDependencies()
+    {
+        return [
+            LoadActivity::class,
+        ];
+    }
+}

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

@@ -22,7 +22,7 @@
 
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Chill\ActivityBundle\Entity\ActivityType;
@@ -32,7 +32,7 @@ use Chill\ActivityBundle\Entity\ActivityType;
  *
  * @author Champs-Libres Coop
  */
-class LoadActivityType extends AbstractFixture implements OrderedFixtureInterface
+class LoadActivityType extends Fixture implements OrderedFixtureInterface
 {
     public function getOrder()
     {
@@ -44,20 +44,43 @@ class LoadActivityType extends AbstractFixture implements OrderedFixtureInterfac
     public function load(ObjectManager $manager)
     {
         $types = [
-            [ 'name' =>
-                ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel']],
-            [ 'name' =>
-                ['fr' => 'Entretien', 'en' => 'Interview', 'nl' => 'Vraaggesprek']],
-            [ 'name' =>
-                ['fr' => 'Inspection', 'en' => 'Inspection', 'nl' => 'Inspectie']]
+            # Exange
+            [
+                'name' =>
+                    ['fr' => 'Entretien physique avec l\'usager'],
+                'category' => 'exchange' ],
+            [
+                'name' =>
+                    ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
+                'category' => 'exchange' ],
+            [
+                'name' =>
+                    ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
+                'category' => 'exchange' ],
+            # Meeting
+            [
+                'name' =>
+                    ['fr' => 'Point technique encadrant'],
+                'category' => 'meeting' ],
+            [
+                'name' =>
+                    ['fr' => 'Réunion avec des partenaires'],
+                'category' => 'meeting' ],
+            [
+                'name' =>
+                    ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
+                'category' => 'meeting' ],
         ];
 
         foreach ($types as $t) {
-            print "Creating activity type : " . $t['name']['en'] . "\n";
+            print "Creating activity type : " . $t['name']['fr'] . " (cat:". $t['category']  . " \n";
             $activityType = (new ActivityType())
-                ->setName(($t['name']));
+                ->setName(($t['name']))
+                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
+                ->setSocialIssuesVisible(1)
+                ->setSocialActionsVisible(1);
             $manager->persist($activityType);
-            $reference = 'activity_type_'.$t['name']['en'];
+            $reference = 'activity_type_'.$t['name']['fr'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }

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

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <info@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/>.
+ */
+
+namespace Chill\ActivityBundle\DataFixtures\ORM;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+
+/**
+ * Fixtures for ActivityTypeCategory
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterface
+{
+    public static $references = array();
+
+    public function getOrder()
+    {
+        return 16050;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $categories = [
+            [
+                'name' => ['fr' => 'Échange avec usager', 'en' => 'Exchange with user'],
+                'ref' => 'exchange',
+            ],
+            [
+                'name' => ['fr' => 'Réunion', 'en' => 'Meeting'],
+                'ref' => 'meeting',
+            ],
+        ];
+
+        foreach ($categories as $cat) {
+            print "Creating activity type category : " . $cat['ref'] . "\n";
+
+            $newCat = (new ActivityTypeCategory())
+                ->setName(($cat['name']));
+
+            $manager->persist($newCat);
+            $reference = 'activity_type_cat_'.$cat['ref'];
+
+            $this->addReference($reference, $newCat);
+            static::$references[] = $reference;
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -55,12 +55,14 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
+        $loader->load('services/accompanyingPeriodConsistency.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
     {
         $this->prependRoutes($container);
         $this->prependAuthorization($container);
+        $this->prependCruds($container);
     }
 
     /* (non-PHPdoc)
@@ -85,8 +87,81 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
               ActivityVoter::UPDATE => array(ActivityVoter::SEE_DETAILS),
               ActivityVoter::CREATE => array(ActivityVoter::SEE_DETAILS),
               ActivityVoter::DELETE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE)
+              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE),
+              ActivityVoter::FULL => [ActivityVoter::CREATE, ActivityVoter::DELETE,
+                   ActivityVoter::UPDATE],
            )
         ));
     }
+
+    protected function prependCruds(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => \Chill\ActivityBundle\Entity\ActivityType::class,
+                    'name' => 'activity_type',
+                    'base_path' => '/admin/activity/type',
+                    'form_class' => \Chill\ActivityBundle\Form\ActivityTypeType::class,
+                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillActivity/ActivityType/index.html.twig',
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityType/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityType/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
+                    'name' => 'activity_type_category',
+                    'base_path' => '/admin/activity/type_category',
+                    'form_class' => \Chill\ActivityBundle\Form\ActivityTypeCategoryType::class,
+                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeCategoryController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillActivity/ActivityTypeCategory/index.html.twig',
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityTypeCategory/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityTypeCategory/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\ActivityBundle\Entity\ActivityPresence::class,
+                    'name' => 'activity_presence',
+                    'base_path' => '/admin/activity/presence',
+                    'form_class' => \Chill\ActivityBundle\Form\ActivityPresenceType::class,
+                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityPresenceController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillActivity/ActivityPresence/index.html.twig',
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityPresence/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillActivity/ActivityPresence/edit.html.twig',
+                        ]
+                    ]
+                ],
+            ]
+        ]);
+    }
 }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -20,19 +20,27 @@
 
 namespace Chill\ActivityBundle\Entity;
 
+use Chill\DocStoreBundle\Entity\Document;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Location;
+use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * Class Activity
@@ -41,311 +49,536 @@ use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
  * @ORM\Table(name="activity")
  * @ORM\HasLifecycleCallbacks()
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *  "activity"=Activity::class
+ *  })
+ */
+
+/*
+ * TODO : revoir
  * @UserCircleConsistency(
  *      "CHILL_ACTIVITY_SEE_DETAILS",
  *      getUserFunction="getUser",
  *      path="scope")
  */
-class Activity implements HasCenterInterface, HasScopeInterface
+
+class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
 {
+    const SENTRECEIVED_SENT = 'sent';
+    const SENTRECEIVED_RECEIVED = 'received';
+
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var User
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $user;
+    private User $user;
 
     /**
-     * @var \DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private \DateTime $date;
 
     /**
-     * @var \DateTime
-     * @ORM\Column(type="time")
+     * @ORM\Column(type="time", nullable=true)
      */
-    private $durationTime;
+    private ?\DateTime $durationTime = null;
 
     /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="time", nullable=true)
      */
-    private $attendee;
+    private ?\DateTime $travelTime = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     */
+    private ?ActivityPresence $attendee = null;
 
     /**
-     * @var ActivityReason
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      */
-    private $reasons;
+    private Collection $reasons;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     * @Groups({"read"})
+     */
+    private Collection $socialIssues;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     * @Groups({"read"})
+     */
+    private Collection $socialActions;
 
     /**
-     * @var ActivityType
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
      */
-    private $type;
+    private ActivityType $type;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $scope;
+    private ?Scope $scope = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person;
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     * @Groups({"read"})
+     */
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
      */
-    private $comment;
+    private CommentEmbeddable $comment;
 
     /**
-     * Activity constructor.
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @Groups({"read"})
      */
+    private ?Collection $persons = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     * @Groups({"read"})
+     */
+    private ?Collection $thirdParties = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     */
+    private Collection $documents;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"read"})
+     */
+    private ?Collection $users = null;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default"=false})
+     */
+    private bool $emergency = false;
+
+    /**
+     * @ORM\Column(type="string", options={"default"=""})
+     */
+    private string $sentReceived = '';
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @groups({"read"})
+     */
+    private ?Location $location = null;
+
+
     public function __construct()
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
+        $this->persons = new ArrayCollection();
+        $this->thirdParties = new ArrayCollection();
+        $this->documents = new ArrayCollection();
+        $this->users = new ArrayCollection();
+        $this->socialIssues = new ArrayCollection();
+        $this->socialActions = new ArrayCollection();
     }
 
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
 
-    /**
-     * Set user
-     *
-     * @param User $user
-     * @return Activity
-     */
-    public function setUser(User $user)
+    public function setUser(User $user): self
     {
         $this->user = $user;
 
         return $this;
     }
 
-    /**
-     * Get user
-     *
-     * @return User
-     */
-    public function getUser()
+    public function getUser(): User
     {
         return $this->user;
     }
 
-    /**
-     * Set date
-     *
-     * @param \DateTime $date
-     * @return Activity
-     */
-    public function setDate($date)
+    public function setDate(\DateTime $date): self
     {
         $this->date = $date;
 
         return $this;
     }
 
-    /**
-     * Get date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
+    public function getDate(): \DateTime
     {
         return $this->date;
     }
 
-    /**
-     * Set durationTime
-     *
-     * @param \DateTime $durationTime
-     * @return Activity
-     */
-    public function setDurationTime($durationTime)
+    public function setDurationTime(?\DateTime $durationTime): self
     {
         $this->durationTime = $durationTime;
 
         return $this;
     }
 
-    /**
-     * Get durationTime
-     *
-     * @return \DateTime
-     */
-    public function getDurationTime()
+    public function getDurationTime(): ?\DateTime
     {
         return $this->durationTime;
     }
 
-    /**
-     * Set attendee
-     *
-     * @param boolean $attendee
-     * @return Activity
-     */
-    public function setAttendee($attendee)
+    public function setTravelTime(\DateTime $travelTime): self
+    {
+        $this->travelTime = $travelTime;
+
+        return $this;
+    }
+
+    public function getTravelTime(): ?\DateTime
+    {
+        return $this->travelTime;
+    }
+
+    public function setAttendee(ActivityPresence $attendee): self
     {
         $this->attendee = $attendee;
 
         return $this;
     }
 
-    /**
-     * Get attendee
-     *
-     * @return boolean
-     */
-    public function getAttendee()
+    public function getAttendee(): ?ActivityPresence
     {
         return $this->attendee;
     }
 
-    /**
-     * Add a reason
-     *
-     * @param ActivityReason $reason
-     * @return Activity
-     */
-    public function addReason(ActivityReason $reason)
+    public function addReason(ActivityReason $reason): self
     {
-        $this->reasons[] = $reason;
+        $this->reasons->add($reason);
 
         return $this;
     }
 
-    /**
-     * @param ActivityReason $reason
-     */
-    public function removeReason(ActivityReason $reason)
+    public function removeReason(ActivityReason $reason): void
     {
         $this->reasons->removeElement($reason);
     }
 
-    /**
-     * Get reasons
-     *
-     * @return Collection
-     */
-    public function getReasons()
+    public function getReasons(): Collection
     {
         return $this->reasons;
     }
 
-    /**
-     * Set type
-     *
-     * @param ActivityType $type
-     * @return Activity
-     */
-    public function setType(ActivityType $type)
+    public function setReasons(?ArrayCollection $reasons): self
+    {
+        $this->reasons = $reasons;
+
+        return $this;
+    }
+
+    public function getSocialIssues(): Collection
+    {
+        return $this->socialIssues;
+    }
+
+    public function addSocialIssue(SocialIssue $socialIssue): self
+    {
+        if (!$this->socialIssues->contains($socialIssue)) {
+            $this->socialIssues[] = $socialIssue;
+        }
+
+        return $this;
+    }
+
+    public function removeSocialIssue(SocialIssue $socialIssue): self
+    {
+        $this->socialIssues->removeElement($socialIssue);
+
+        return $this;
+    }
+
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function addSocialAction(SocialAction $socialAction): self
+    {
+        if (!$this->socialActions->contains($socialAction)) {
+            $this->socialActions[] = $socialAction;
+        }
+
+        return $this;
+    }
+
+    public function removeSocialAction(SocialAction $socialAction): self
+    {
+        $this->socialActions->removeElement($socialAction);
+
+        return $this;
+    }
+
+
+
+
+    public function setType(ActivityType $type): self
     {
         $this->type = $type;
 
         return $this;
     }
 
-    /**
-     * Get type
-     *
-     * @return ActivityType
-     */
-    public function getType()
+    public function getType(): ActivityType
     {
         return $this->type;
     }
 
-    /**
-     * Set scope
-     *
-     * @param Scope $scope
-     * @return Activity
-     */
-    public function setScope(Scope $scope)
+    public function setScope(Scope $scope): self
     {
         $this->scope = $scope;
 
         return $this;
     }
 
-    /**
-     * Get scope
-     *
-     * @return Scope
-     */
-    public function getScope()
+    public function getScope(): ?Scope
     {
         return $this->scope;
     }
 
-    /**
-     * Set person
-     *
-     * @param Person $person
-     * @return Activity
-     */
-    public function setPerson(Person $person)
+    public function setPerson(?Person $person): self
     {
         $this->person = $person;
 
         return $this;
     }
 
-    /**
-     * Get person
-     *
-     * @return Person
-     */
-    public function getPerson()
+    public function getPerson(): ?Person
     {
         return $this->person;
     }
 
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->accompanyingPeriod;
+    }
+
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    {
+        $this->accompanyingPeriod = $accompanyingPeriod;
+
+        return $this;
+    }
+
     /**
      * get the center
      * center is extracted from person
-     *
-     * @return Center
      */
-    public function getCenter()
+    public function getCenter(): ?Center
     {
+        if ($this->person instanceof Person) {
             return $this->person->getCenter();
         }
 
-    /**
-     * @return \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable
-     */
-    public function getComment()
+        return null;
+    }
+
+    public function getComment(): CommentEmbeddable
     {
         return $this->comment;
     }
 
-    /**
-     * @param \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable $comment
-     */
-    public function setComment($comment)
+    public function setComment(CommentEmbeddable $comment): self
     {
         $this->comment = $comment;
-    }
+
+        return $this;
     }
 
+    /**
+     * Add a person to the person list
+     */
+    public function addPerson(?Person $person): self
+    {
+        if (null !== $person) {
+            $this->persons[] = $person;
+        }
+
+        return $this;
+    }
+
+    public function removePerson(Person $person): void
+    {
+        $this->persons->removeElement($person);
+    }
+
+    public function getPersons(): Collection
+    {
+        return $this->persons;
+    }
+
+    public function getPersonsAssociated(): array
+    {
+        if (null !== $this->accompanyingPeriod) {
+            $personsAssociated = [];
+            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
+                if ($this->persons->contains($participation->getPerson())) {
+                    $personsAssociated[] = $participation->getPerson();
+                }
+            }
+            return $personsAssociated;
+        }
+        return [];
+    }
+
+    public function getPersonsNotAssociated(): array
+    {
+        if (null !== $this->accompanyingPeriod) {
+            $personsNotAssociated = [];
+            foreach ($this->persons as $person) {
+                if (!in_array($person, $this->getPersonsAssociated())) {
+                     $personsNotAssociated[] = $person;
+                }
+            }
+            return $personsNotAssociated;
+        }
+        return [];
+    }
+
+    public function setPersons(?Collection $persons): self
+    {
+        $this->persons = $persons;
+
+        return $this;
+    }
+
+    public function addThirdParty(?ThirdParty $thirdParty): self
+    {
+        if (null !== $thirdParty) {
+           $this->thirdParties[] = $thirdParty;
+        }
+        return $this;
+    }
+
+    public function removeThirdParty(ThirdParty $thirdParty): void
+    {
+        $this->thirdParties->removeElement($thirdParty);
+    }
+
+    public function getThirdParties(): Collection
+    {
+        return $this->thirdParties;
+    }
+
+    public function setThirdParties(?Collection $thirdParties): self
+    {
+        $this->thirdParties = $thirdParties;
+
+        return $this;
+    }
+
+    public function addDocument(Document $document): self
+    {
+        $this->documents[] = $document;
+
+        return $this;
+    }
+
+    public function removeDocument(Document $document): void
+    {
+        $this->documents->removeElement($document);
+    }
+
+    public function getDocuments(): Collection
+    {
+        return $this->documents;
+    }
+
+    public function setDocuments(Collection $documents): self
+    {
+        $this->documents = $documents;
+
+        return $this;
+    }
+
+    public function addUser(?User $user): self
+    {
+        if (null !== $user) {
+            $this->users[] = $user;
+        }
+        return $this;
+    }
+
+    public function removeUser(User $user): void
+    {
+        $this->users->removeElement($user);
+    }
+
+    public function getUsers(): Collection
+    {
+        return $this->users;
+    }
+
+    public function setUsers(?Collection $users): self
+    {
+        $this->users = $users;
+
+        return $this;
+    }
+
+    public function isEmergency(): bool
+    {
+        return $this->getEmergency();
+    }
+
+    public function getEmergency(): bool
+    {
+        return $this->emergency;
+    }
+
+    public function setEmergency(bool $emergency): self
+    {
+        $this->emergency = $emergency;
+
+        return $this;
+    }
+
+    public function getSentReceived(): string
+    {
+        return $this->sentReceived;
+    }
+
+    public function setSentReceived(?string $sentReceived): self
+    {
+        $this->sentReceived = (string) $sentReceived;
+
+        return $this;
+    }
+
+    /**
+     * @return Location|null
+     */
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    /**
+     * @param Location|null $location
+     * @return Activity
+     */
+    public function setLocation(?Location $location): Activity
+    {
+        $this->location = $location;
+        return $this;
+    }
+}

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -0,0 +1,97 @@
+<?php
+
+/*
+ *
+ * Copyright (C) 2015, 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/>.
+ */
+
+namespace Chill\ActivityBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Class ActivityPresence
+ *
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="activitytpresence")
+ * @ORM\HasLifecycleCallbacks()
+ */
+class ActivityPresence
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get active
+     * return true if the category type is active.
+     */
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * Is active
+     * return true if the category type is active
+     */
+    public function isActive(): bool
+    {
+        return $this->getActive();
+    }
+
+    /**
+     * Set active
+     * set to true if the category type is active
+     */
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+}

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -44,7 +44,7 @@ class ActivityReason
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -43,7 +43,7 @@ class ActivityReasonCategory
 
     /**
      * @var string
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -32,45 +32,249 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class ActivityType
 {
+    const FIELD_INVISIBLE = 0;
+    const FIELD_OPTIONAL = 1;
+    const FIELD_REQUIRED = 2;
+
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id;
 
     /**
-     * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
-    private $name;
+    private array $name = [];
 
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityTypeCategory")
+     */
+    private ?ActivityTypeCategory $category = null;
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
+     */
+    private int $personVisible = self::FIELD_REQUIRED;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $personLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
+     */
+    private int $userVisible = self::FIELD_REQUIRED;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $userLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
+     */
+    private int $dateVisible = self::FIELD_REQUIRED;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $dateLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $placeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $placeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $personsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $personsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $thirdPartiesLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $durationTimeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $durationTimeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $travelTimeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $travelTimeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $attendeeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $attendeeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $reasonsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $reasonsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $commentVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $commentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $sentReceivedVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $sentReceivedLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $documentsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $documentsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $usersVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $usersLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $emergencyVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $emergencyLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $accompanyingPeriodLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $socialDataVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $socialDataLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $socialIssuesVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $socialIssuesLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $socialActionsVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $socialActionsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
+     */
+    private int $locationVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     */
+    private string $locationLabel = '';
+
+    /**
+     * @ORM\Column(type="float", options={"default"="0.0"})
+     */
+    private float $ordering = 0.0;
 
     /**
      * Get id
-     *
-     * @return integer
      */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
     /**
      * Set name
-     *
-     * @param array $name
-     * @return ActivityType
      */
-    public function setName($name)
+    public function setName(array $name): self
     {
         $this->name = $name;
 
@@ -79,58 +283,576 @@ class ActivityType
 
     /**
      * Get name
-     *
-     * @return array | string
      */
-    public function getName($locale = null)
+    public function getName(): array
     {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            } else {
-                foreach ($this->name as $name) {
-                    if (!empty($name)) {
-                        return $name;
-                    }
-                }
-            }
-            return '';
-        } else {
         return $this->name;
     }
-    }
 
     /**
      * Get active
      * return true if the type is active.
-     * 
-     * @return boolean
      */
-    public function getActive() {
+    public function getActive(): bool
+    {
         return $this->active;
     }
 
     /**
      * Is active
      * return true if the type is active
-     * 
-     * @return boolean
      */
-    public function isActive() {
+    public function isActive(): bool
+    {
         return $this->getActive();
     }
 
     /**
      * Set active
      * set to true if the type is active
-     * 
-     * @param boolean $active
-     * @return ActivityType
      */
-    public function setActive($active) {
+    public function setActive(bool $active): self
+    {
         $this->active = $active;
+
+        return $this;
+    }
+
+    public function getCategory(): ?ActivityTypeCategory
+    {
+        return $this->category;
+    }
+
+    public function setCategory(?ActivityTypeCategory $category): self
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    public function getPersonVisible(): int
+    {
+        return $this->personVisible;
+    }
+
+    public function setPersonVisible(int $personVisible): self
+    {
+        $this->personVisible = $personVisible;
+
+        return $this;
+    }
+
+    public function getPersonLabel(): string
+    {
+        return $this->personLabel;
+    }
+
+    public function setPersonLabel(string $personLabel): self
+    {
+        $this->personLabel = $personLabel;
+
+        return $this;
+    }
+
+    public function getUserVisible(): int
+    {
+        return $this->userVisible;
+    }
+
+    public function setUserVisible(int $userVisible): self
+    {
+        $this->userVisible = $userVisible;
+
+        return $this;
+    }
+
+    public function getUserLabel(): string
+    {
+        return $this->userLabel;
+    }
+
+    public function setUserLabel(string $userLabel): self
+    {
+        $this->userLabel = $userLabel;
+
+        return $this;
+    }
+
+    public function getDateVisible(): int
+    {
+        return $this->dateVisible;
+    }
+
+    public function setDateVisible(int $dateVisible): self
+    {
+        $this->dateVisible = $dateVisible;
+
+        return $this;
+    }
+
+    public function getDateLabel(): string
+    {
+        return $this->dateLabel;
+    }
+
+    public function setDateLabel(string $dateLabel): self
+    {
+        $this->dateLabel = $dateLabel;
+
+        return $this;
+    }
+
+    public function getPlaceVisible(): int
+    {
+        return $this->placeVisible;
+    }
+
+    public function setPlaceVisible(int $placeVisible): self
+    {
+        $this->placeVisible = $placeVisible;
+
+        return $this;
+    }
+
+    public function getPlaceLabel(): string
+    {
+        return $this->placeLabel;
+    }
+
+    public function setPlaceLabel(string $placeLabel): self
+    {
+        $this->placeLabel = $placeLabel;
+
+        return $this;
+    }
+
+    public function getPersonsVisible(): int
+    {
+        return $this->personsVisible;
+    }
+
+    public function setPersonsVisible(int $personsVisible): self
+    {
+        $this->personsVisible = $personsVisible;
+
+        return $this;
+    }
+
+    public function getPersonsLabel(): string
+    {
+        return $this->personsLabel;
+    }
+
+    public function setPersonsLabel(string $personsLabel): self
+    {
+        $this->personsLabel = $personsLabel;
+
+        return $this;
+    }
+
+    public function getThirdPartiesVisible(): int
+    {
+        return $this->thirdPartiesVisible;
+    }
+
+    public function setThirdPartiesVisible(int $thirdPartiesVisible): self
+    {
+        $this->thirdPartiesVisible = $thirdPartiesVisible;
+
+        return $this;
+    }
+
+    public function getThirdPartiesLabel(): string
+    {
+        return $this->thirdPartiesLabel;
+    }
+
+    public function setThirdPartiesLabel(string $thirdPartiesLabel): self
+    {
+        $this->thirdPartiesLabel = $thirdPartiesLabel;
+
+        return $this;
+    }
+
+    public function getDurationTimeVisible(): int
+    {
+        return $this->durationTimeVisible;
+    }
+
+    public function setDurationTimeVisible(int $durationTimeVisible): self
+    {
+        $this->durationTimeVisible = $durationTimeVisible;
+
+        return $this;
+    }
+
+    public function getDurationTimeLabel(): string
+    {
+        return $this->durationTimeLabel;
+    }
+
+    public function setDurationTimeLabel(string $durationTimeLabel): self
+    {
+        $this->durationTimeLabel = $durationTimeLabel;
+
+        return $this;
+    }
+
+    public function getTravelTimeVisible(): int
+    {
+        return $this->travelTimeVisible;
+    }
+
+    public function setTravelTimeVisible(int $TravelTimeVisible): self
+    {
+        $this->travelTimeVisible = $TravelTimeVisible;
+
+        return $this;
+    }
+
+    public function getTravelTimeLabel(): string
+    {
+        return $this->travelTimeLabel;
+    }
+
+    public function setTravelTimeLabel(string $TravelTimeLabel): self
+    {
+        $this->travelTimeLabel = $TravelTimeLabel;
+
+        return $this;
+    }
+
+    public function getAttendeeVisible(): int
+    {
+        return $this->attendeeVisible;
+    }
+
+    public function setAttendeeVisible(int $attendeeVisible): self
+    {
+        $this->attendeeVisible = $attendeeVisible;
+
+        return $this;
+    }
+
+    public function getAttendeeLabel(): string
+    {
+        return $this->attendeeLabel;
+    }
+
+    public function setAttendeeLabel(string $attendeeLabel): self
+    {
+        $this->attendeeLabel = $attendeeLabel;
+
+        return $this;
+    }
+
+    public function getReasonsVisible(): int
+    {
+        return $this->reasonsVisible;
+    }
+
+    public function setReasonsVisible(int $reasonsVisible): self
+    {
+        $this->reasonsVisible = $reasonsVisible;
+
+        return $this;
+    }
+
+    public function getReasonsLabel(): string
+    {
+        return $this->reasonsLabel;
+    }
+
+    public function setReasonsLabel(string $reasonsLabel): self
+    {
+        $this->reasonsLabel = $reasonsLabel;
+
+        return $this;
+    }
+
+    public function getCommentVisible(): int
+    {
+        return $this->commentVisible;
+    }
+
+    public function setCommentVisible(int $commentVisible): self
+    {
+        $this->commentVisible = $commentVisible;
+
+        return $this;
+    }
+
+    public function getCommentLabel(): string
+    {
+        return $this->commentLabel;
+    }
+
+    public function setCommentLabel(string $commentLabel): self
+    {
+        $this->commentLabel = $commentLabel;
+
+        return $this;
+    }
+
+    public function getSentReceivedVisible(): int
+    {
+        return $this->sentReceivedVisible;
+    }
+
+    public function setSentReceivedVisible(int $sentReceivedVisible): self
+    {
+        $this->sentReceivedVisible = $sentReceivedVisible;
+
+        return $this;
+    }
+
+    public function getSentReceivedLabel(): string
+    {
+        return $this->sentReceivedLabel;
+    }
+
+    public function setSentReceivedLabel(string $sentReceivedLabel): self
+    {
+        $this->sentReceivedLabel = $sentReceivedLabel;
+
+        return $this;
+    }
+
+    public function getDocumentsVisible(): int
+    {
+        return $this->documentsVisible;
+    }
+
+    public function setDocumentsVisible(int $documentsVisible): self
+    {
+        $this->documentsVisible = $documentsVisible;
+
+        return $this;
+    }
+
+    public function getDocumentsLabel(): string
+    {
+        return $this->documentsLabel;
+    }
+
+    public function setDocumentsLabel(string $documentsLabel): self
+    {
+        $this->documentsLabel = $documentsLabel;
+
+        return $this;
+    }
+
+    public function getUsersVisible(): int
+    {
+        return $this->usersVisible;
+    }
+
+    public function setUsersVisible(int $usersVisible): self
+    {
+        $this->usersVisible = $usersVisible;
+
+        return $this;
+    }
+
+    public function getUsersLabel(): string
+    {
+        return $this->usersLabel;
+    }
+
+    public function setUsersLabel(string $usersLabel): self
+    {
+        $this->usersLabel = $usersLabel;
+
+        return $this;
+    }
+
+    public function getEmergencyVisible(): int
+    {
+        return $this->emergencyVisible;
+    }
+
+    public function setEmergencyVisible(int $emergencyVisible): self
+    {
+        $this->emergencyVisible = $emergencyVisible;
+
+        return $this;
+    }
+
+    public function getEmergencyLabel(): string
+    {
+        return $this->emergencyLabel;
+    }
+
+    public function setEmergencyLabel(string $emergencyLabel): self
+    {
+        $this->emergencyLabel = $emergencyLabel;
+
+        return $this;
+    }
+
+    public function getAccompanyingPeriodVisible(): int
+    {
+        return $this->accompanyingPeriodVisible;
+    }
+
+    public function setAccompanyingPeriodVisible(int $accompanyingPeriodVisible): self
+    {
+        $this->accompanyingPeriodVisible = $accompanyingPeriodVisible;
+
+        return $this;
+    }
+
+    public function getAccompanyingPeriodLabel(): string
+    {
+        return $this->accompanyingPeriodLabel;
+    }
+
+    public function setAccompanyingPeriodLabel(string $accompanyingPeriodLabel): self
+    {
+        $this->accompanyingPeriodLabel = $accompanyingPeriodLabel;
+
+        return $this;
+    }
+
+    public function getSocialDataVisible(): int
+    {
+        return $this->socialDataVisible;
+    }
+
+    public function setSocialDataVisible(int $socialDataVisible): self
+    {
+        $this->socialDataVisible = $socialDataVisible;
+
+        return $this;
+    }
+
+    public function getSocialDataLabel(): string
+    {
+        return $this->socialDataLabel;
+    }
+
+    public function setSocialDataLabel(string $socialDataLabel): self
+    {
+        $this->socialDataLabel = $socialDataLabel;
+
+        return $this;
+    }
+
+    public function isVisible(string $field): bool
+    {
+        $property = $field.'Visible';
+
+        if (!property_exists($this, $property)) {
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+        }
+
+        return self::FIELD_INVISIBLE !== $this->$property;
+    }
+
+    public function isRequired(string $field): bool
+    {
+        $property = $field.'Visible';
+
+        if (!property_exists($this, $property)) {
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+        }
+
+        return self::FIELD_REQUIRED === $this->$property;
+    }
+
+    public function getLabel(string $field): ?string
+    {
+        $property = $field.'Label';
+
+        if (!property_exists($this, $property)) {
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+        }
+
+        return $this->$property;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(float $ordering): self
+    {
+        $this->ordering = $ordering;
+
+        return $this;
+    }
+
+    public function getSocialIssuesVisible(): ?int
+    {
+        return $this->socialIssuesVisible;
+    }
+
+    public function setSocialIssuesVisible(int $socialIssuesVisible): self
+    {
+        $this->socialIssuesVisible = $socialIssuesVisible;
+
+        return $this;
+    }
+
+    public function getSocialIssuesLabel(): ?string
+    {
+        return $this->socialIssuesLabel;
+    }
+
+    public function setSocialIssuesLabel(string $socialIssuesLabel): self
+    {
+        $this->socialIssuesLabel = $socialIssuesLabel;
+
+        return $this;
+    }
+
+    public function getSocialActionsVisible(): ?int
+    {
+        return $this->socialActionsVisible;
+    }
+
+    public function setSocialActionsVisible(int $socialActionsVisible): self
+    {
+        $this->socialActionsVisible = $socialActionsVisible;
+
+        return $this;
+    }
+
+    public function getSocialActionsLabel(): ?string
+    {
+        return $this->socialActionsLabel;
+    }
+
+    public function setSocialActionsLabel(string $socialActionsLabel): self
+    {
+        $this->socialActionsLabel = $socialActionsLabel;
+
+        return $this;
+    }
+
+    public function getLocationVisible(): ?int
+    {
+        return $this->locationVisible;
+    }
+
+    public function setLocationVisible(int $locationVisible): self
+    {
+        $this->locationVisible = $locationVisible;
+
+        return $this;
+    }
+
+    public function getLocationLabel(): ?string
+    {
+        return $this->locationLabel;
+    }
+
+    public function setLocationLabel(string $locationLabel): self
+    {
+        $this->locationLabel = $locationLabel;
+
         return $this;
     }
 
 }
-

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -0,0 +1,123 @@
+<?php
+
+/*
+ *
+ * Copyright (C) 2015, 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/>.
+ */
+
+namespace Chill\ActivityBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Class ActivityTypeCateogry
+ *
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="activitytypecategory")
+ * @ORM\HasLifecycleCallbacks()
+ */
+class ActivityTypeCategory
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\Column(type="float", options={"default"="0.0"})
+     */
+    private float $ordering = 0.0;
+
+    /**
+     * Get id
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set name
+     */
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get active
+     * return true if the category type is active.
+     */
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * Is active
+     * return true if the category type is active
+     */
+    public function isActive(): bool
+    {
+        return $this->getActive();
+    }
+
+    /**
+     * Set active
+     * set to true if the category type is active
+     */
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(float $ordering): self
+    {
+        $this->ordering = $ordering;
+
+        return $this;
+    }
+}

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

@@ -105,12 +105,12 @@ class ActivityTypeAggregator implements AggregatorInterface
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->typeRepository->findBy(array('id' => $values));
 
-        return function($value) use ($data) {
+        return function($value): string {
             if ($value === '_header') {
                 return 'Activity type';
             }
@@ -120,12 +120,11 @@ class ActivityTypeAggregator implements AggregatorInterface
 
             return $this->stringHelper->localize($t->getName());
         };
-        
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return array(self::KEY);
+        return [self::KEY];
     }
 
 }

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Chill\ActivityBundle\Form;
+
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+
+class ActivityPresenceType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class)
+            ->add('active', ChoiceType::class, array(
+                'choices' => array(
+                    'Yes' => true,
+                    'No'  => false
+                ),
+                'expanded' => true
+            ));
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults(array(
+            'data_class' => ActivityPresence::class
+        ));
+    }
+}

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -2,8 +2,22 @@
 
 namespace Chill\ActivityBundle\Form;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -15,126 +29,331 @@ use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTra
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\CallbackTransformer;
+use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 
 class ActivityType extends AbstractType
 {
+    protected User $user;
 
-    /**
-     * the user running this form
-     *
-     * @var User
-     */
-    protected $user;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected ObjectManager $om;
 
-    /**
-     *
-     * @var ObjectManager
-     */
-    protected $om;
+    protected TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    protected SocialIssueRender $socialIssueRender;
 
-    protected $timeChoices;
+    protected SocialActionRender $socialActionRender;
+
+    protected array $timeChoices;
 
     public function __construct (
         TokenStorageInterface $tokenStorage,
-            AuthorizationHelper $authorizationHelper, ObjectManager $om,
+        AuthorizationHelper $authorizationHelper,
+        ObjectManager $om,
         TranslatableStringHelper $translatableStringHelper,
-            array $timeChoices
-            )
-    {
+        array $timeChoices,
+        SocialIssueRender $socialIssueRender,
+        SocialActionRender $socialActionRender
+    ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException("you should have a valid user");
         }
+
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
         $this->om = $om;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->timeChoices = $timeChoices;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->socialActionRender = $socialActionRender;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         // handle times choices
-        $timeChoices = array();
+        $timeChoices = [];
 
         foreach ($this->timeChoices as $e) {
             $timeChoices[$e['label']] = $e['seconds'];
-        };
+        }
 
         $durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
-        $durationTimeOptions = array(
+        $durationTimeOptions = [
             'choices' => $timeChoices,
             'placeholder' => 'Choose the duration',
+        ];
+
+        /** @var \Chill\ActivityBundle\Entity\ActivityType $activityType */
+        $activityType = $options['activityType'];
+
+        // TODO revoir la gestion des center au niveau du form des activité.
+        if ($options['center']) {
+            $builder->add('scope', ScopePickerType::class, [
+                'center' => $options['center'],
+                'role' => $options['role'],
+                // TODO make required again once scope and rights are fixed
+                'required' => false
+            ]);
+        }
+
+        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
+        $accompanyingPeriod = NULL;
+        if ($options['accompanyingPeriod']) {
+            $accompanyingPeriod = $options['accompanyingPeriod'];
+        }
+
+        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
+            $builder->add('socialIssues', HiddenType::class);
+            $builder->get('socialIssues')
+               ->addModelTransformer(new CallbackTransformer(
+                   function (iterable $socialIssuesAsIterable): string {
+                       $socialIssueIds = [];
+                       foreach ($socialIssuesAsIterable as $value) {
+                          $socialIssueIds[] = $value->getId();
+                       }
+                       return implode(',', $socialIssueIds);
+                   },
+                   function (?string $socialIssuesAsString): array {
+                       if (null === $socialIssuesAsString) {
+                          return [];
+                       }
+                       return array_map(
+                          fn(string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
+                          explode(',', $socialIssuesAsString)
                        );
-
-        $builder
-            ->add('date', ChillDateType::class, array(
-               'required' => true
+                   }
                ))
-            ->add('durationTime', ChoiceType::class, $durationTimeOptions)
-            ->add('attendee', ChoiceType::class, array(
-               'expanded' => true,
-               'required' => false,
-               'choices' => array(
-                  'present' => true,
-                  'not present' => false
-               )
-            ))
-            ->add('user', UserPickerType::class, [
-                'center' => $options['center'],
-                'role'   => $options['role']
-            ])
-            ->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
-                'role'   => $options['role']
-            ])
-            ->add('reasons', TranslatableActivityReason::class, array(
-                'multiple' => true,
-                'required' => false,
-            ))
-            ->add('type', TranslatableActivityType::class, array(
-                'placeholder' => 'Choose a type',
-                'active_only' => true
-            ))
-            ->add('comment', CommentType::class, [
-                'required' => false,
-            ])
             ;
+        }
 
-        $builder->get('durationTime')
+        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
+            $builder->add('socialActions', HiddenType::class);
+            $builder->get('socialActions')
+               ->addModelTransformer(new CallbackTransformer(
+                   function (iterable $socialActionsAsIterable): string {
+                       $socialActionIds = [];
+                       foreach ($socialActionsAsIterable as $value) {
+                          $socialActionIds[] = $value->getId();
+                       }
+                       return implode(',', $socialActionIds);
+                   },
+                   function (?string $socialActionsAsString): array {
+                       if (null === $socialActionsAsString) {
+                          return [];
+                       }
+                       return array_map(
+                          fn(string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
+                          explode(',', $socialActionsAsString)
+                       );
+                   }
+               ))
+            ;
+        }
+
+        if ($activityType->isVisible('date')) {
+            $builder->add('date', ChillDateType::class, [
+                'label' => $activityType->getLabel('date'),
+                'required' => $activityType->isRequired('date'),
+            ]);
+        }
+
+        if ($activityType->isVisible('durationTime')) {
+            $durationTimeOptions['label'] = $activityType->getLabel('durationTime');
+            $durationTimeOptions['required'] = $activityType->isRequired('durationTime');
+
+            $builder->add('durationTime', ChoiceType::class, $durationTimeOptions);
+        }
+
+        if ($activityType->isVisible('travelTime')) {
+            $durationTimeOptions['label'] = $activityType->getLabel('travelTime');
+            $durationTimeOptions['required'] = $activityType->isRequired('travelTime');
+
+            $builder->add('travelTime', ChoiceType::class, $durationTimeOptions);
+        }
+
+        if ($activityType->isVisible('attendee')) {
+            $builder->add('attendee', EntityType::class, [
+                'label' => $activityType->getLabel('attendee'),
+                'required' => $activityType->isRequired('attendee'),
+                'expanded' => true,
+                'class' => ActivityPresence::class,
+                'choice_label' => function (ActivityPresence $activityPresence) {
+                    return $this->translatableStringHelper->localize($activityPresence->getName());
+                },
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('a')
+                        ->where('a.active = true');
+                },
+            ]);
+        }
+
+        if ($activityType->isVisible('user') && $options['center']) {
+            $builder->add('user', UserPickerType::class, [
+                'label' => $activityType->getLabel('user'),
+                'required' => $activityType->isRequired('user'),
+                'center' => $options['center'],
+                'role'   => $options['role']
+            ]);
+        }
+
+        if ($activityType->isVisible('reasons')) {
+            $builder->add('reasons', EntityType::class, [
+                'label' => $activityType->getLabel('reasons'),
+                'required' => $activityType->isRequired('reasons'),
+                'class' => ActivityReason::class,
+                'multiple' => true,
+                'choice_label' => function (ActivityReason $activityReason) {
+                    return $this->translatableStringHelper->localize($activityReason->getName());
+                },
+                'attr' => array('class' => 'select2 '),
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('a')
+                        ->where('a.active = true');
+                },
+            ]);
+        }
+
+        if ($activityType->isVisible('comment')) {
+            $builder->add('comment', CommentType::class, [
+                'label' => empty($activityType->getLabel('comment'))
+                    ? 'activity.comment' : $activityType->getLabel('comment'),
+                'required' => $activityType->isRequired('comment'),
+            ]);
+        }
+
+        if ($activityType->isVisible('persons')) {
+            $builder->add('persons', HiddenType::class);
+            $builder->get('persons')
+               ->addModelTransformer(new CallbackTransformer(
+                   function (iterable $personsAsIterable): string {
+                       $personIds = [];
+                       foreach ($personsAsIterable as $value) {
+                          $personIds[] = $value->getId();
+                       }
+                       return implode(',', $personIds);
+                   },
+                   function (?string $personsAsString): array {
+                       return array_map(
+                          fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                          explode(',', $personsAsString)
+                       );
+                   }
+               ))
+           ;
+        }
+
+        if ($activityType->isVisible('thirdParties')) {
+            $builder->add('thirdParties', HiddenType::class);
+            $builder->get('thirdParties')
+               ->addModelTransformer(new CallbackTransformer(
+                   function (iterable $thirdpartyAsIterable): string {
+                       $thirdpartyIds = [];
+                       foreach ($thirdpartyAsIterable as $value) {
+                          $thirdpartyIds[] = $value->getId();
+                       }
+                       return implode(',', $thirdpartyIds);
+                   },
+                   function (?string $thirdpartyAsString): array {
+                       return array_map(
+                           fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                           explode(',', $thirdpartyAsString)
+                       );
+                   }
+               ))
+           ;
+        }
+
+        if ($activityType->isVisible('documents')) {
+            $builder->add('documents', ChillCollectionType::class, [
+                'entry_type' => StoredObjectType::class,
+                'label' => $activityType->getLabel('documents'),
+                'required' => $activityType->isRequired('documents'),
+                'allow_add' => true,
+                'button_add_label' => 'activity.Insert a document',
+                'button_remove_label' => 'activity.Remove a document'
+            ]);
+        }
+
+        if ($activityType->isVisible('users')) {
+            $builder->add('users', HiddenType::class);
+            $builder->get('users')
+               ->addModelTransformer(new CallbackTransformer(
+                   function (iterable $usersAsIterable): string {
+                       $userIds = [];
+                       foreach ($usersAsIterable as $value) {
+                           $userIds[] = $value->getId();
+                       }
+                       return implode(',', $userIds);
+                   },
+                   function (?string $usersAsString): array {
+                       return array_map(
+                           fn(string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
+                           explode(',', $usersAsString)
+                       );
+                   }
+               ))
+           ;
+        }
+
+        if ($activityType->isVisible('location')) {
+            $builder->add('location', HiddenType::class)
+                ->get('location')
+                ->addModelTransformer(new CallbackTransformer(
+                    function (?Location $location): string {
+                        if (null === $location) {
+                            return '';
+                        }
+                        return $location->getId();
+                    },
+                    function (?string $id): ?Location {
+                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
+                    }
+                ))
+            ;
+        }
+
+        if ($activityType->isVisible('emergency')) {
+            $builder->add('emergency', CheckboxType::class, [
+                'label' => $activityType->getLabel('emergency'),
+                'required' => $activityType->isRequired('emergency'),
+            ]);
+        }
+
+        if ($activityType->isVisible('sentReceived')) {
+            $builder->add('sentReceived', ChoiceType::class, [
+                'label' => $activityType->getLabel('sentReceived'),
+                'required' => $activityType->isRequired('sentReceived'),
+                'choices' => [
+                    'Sent' => Activity::SENTRECEIVED_SENT,
+                    'Received' => Activity::SENTRECEIVED_RECEIVED,
+                ],
+            ]);
+        }
+
+        foreach (['durationTime', 'travelTime'] as $fieldName) {
+            if (!$activityType->isVisible($fieldName)) {
+                continue;
+            }
+
+            $builder->get($fieldName)
                 ->addModelTransformer($durationTimeTransformer);
 
-
-        $builder->get('durationTime')
-                ->addEventListener(
-                        FormEvents::PRE_SET_DATA,
-                        function(FormEvent $formEvent) use (
+            $builder->get($fieldName)
+                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
                     $timeChoices,
                     $builder,
                     $durationTimeTransformer,
-                                $durationTimeOptions
-                                )
-                        {
+                    $durationTimeOptions,
+                    $fieldName
+                ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
                     $timezoneUTC = new \DateTimeZone('GMT');
@@ -151,42 +370,37 @@ class ActivityType extends AbstractType
                     if (!in_array($data->getTimestamp(), $timeChoices)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
-                                $form = $builder->create(
-                                        'durationTime',
-                                        ChoiceType::class,
-                                        array_merge(
-                                                $durationTimeOptions,
-                                                array(
+                        $form = $builder->create($fieldName, ChoiceType::class, array_merge(
+                            $durationTimeOptions, [
                                 'choices' => $timeChoices,
                                 'auto_initialize' => false
-                                                )
+                            ]
                         ));
                         $form->addModelTransformer($durationTimeTransformer);
                         $formEvent->getForm()->getParent()->add($form->getForm());
                     }
                 });
         }
+    }
 
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
-    public function configureOptions(OptionsResolver $resolver)
+
+
+    public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\Activity'
-        ));
+        $resolver->setDefaults([
+            'data_class' => Activity::class
+        ]);
 
         $resolver
-              ->setRequired(array('center', 'role'))
-              ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
+            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
+            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
             ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
         ;
     }
 
-    /**
-     * @return string
-     */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'chill_activitybundle_activity';
     }

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Chill\ActivityBundle\Form;
+
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+
+class ActivityTypeCategoryType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class)
+            ->add('active', ChoiceType::class, array(
+                'choices' => array(
+                    'Yes' => true,
+                    'No'  => false
+                ),
+                'expanded' => true
+            ))
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 5
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults(array(
+            'data_class' => ActivityTypeCategory::class
+        ));
+    }
+}

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -2,7 +2,13 @@
 
 namespace Chill\ActivityBundle\Form;
 
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Chill\ActivityBundle\Form\Type\ActivityFieldPresence;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -10,38 +16,56 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
+            ->add('active', ChoiceType::class, [
+                'choices' => [
                     'Yes' => true,
                     'No'  => false
-                ),
+                ],
                 'expanded' => true
-            ));
+            ])
+            ->add('category', EntityType::class, [
+                'class' => ActivityTypeCategory::class,
+                'choice_label' => function (ActivityTypeCategory $activityTypeCategory) {
+                    return $this->translatableStringHelper->localize($activityTypeCategory->getName());
+                },
+            ])
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 5
+            ])
+        ;
+
+        $fields = [
+            'persons', 'user', 'date', 'place', 'persons',
+            'thirdParties', 'durationTime', 'travelTime', 'attendee',
+            'reasons', 'comment', 'sentReceived', 'documents',
+            'emergency', 'accompanyingPeriod', 'socialData', 'users'
+        ];
+        foreach ($fields as $field) {
+            $builder
+                ->add($field.'Visible', ActivityFieldPresence::class)
+                ->add($field.'Label', TextType::class, [
+                    'required' => false,
+                    'empty_data' => '',
+                ]);
+        }
     }
 
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityType'
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class
         ));
     }
-
-    /**
-     * @return string
-     */
-    public function getBlockPrefix()
-    {
-        return 'chill_activitybundle_activitytype';
-    }
 }

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace Chill\ActivityBundle\Form\Type;
+
+use Chill\ActivityBundle\Entity\ActivityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ActivityFieldPresence extends AbstractType
+{
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            array(
+                'choices' => [
+                    'Invisible' => ActivityType::FIELD_INVISIBLE,
+                    'Optional' => ActivityType::FIELD_OPTIONAL,
+                    'Required' => ActivityType::FIELD_REQUIRED,
+                ],
+            )
+        );
+    }
+}

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

@@ -71,7 +71,7 @@ class TranslatableActivityType extends AbstractType
 
         if ($options['active_only'] === true) {
             $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
+            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Types::BOOLEAN);
         }
     }
 

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected TranslatorInterface $translator;
+
+    protected Security $security;
+
+    public function __construct(
+        Security $security,
+        TranslatorInterface $translator
+    ) {
+        $this->security = $security;
+        $this->translator = $translator;
+    }
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        $period = $parameters['accompanyingCourse'];
+
+        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
+            && $this->security->isGranted(ActivityVoter::SEE, $period)) {
+            $menu->addChild($this->translator->trans('Activity'), [
+                'route' => 'chill_activity_activity_list',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ]])
+                ->setExtras(['order' => 40]);
+        }
+    }
+}

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+
+final class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_activity'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        if (in_array($menuId, ['admin_index', 'admin_section'])) {
+            $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'
+                ]);
+        }
+    }
+}

src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php

@@ -1,88 +0,0 @@
-<?php
-/*
- * 
- */
-namespace Chill\ActivityBundle\Menu;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class MenuBuilder implements LocalMenuBuilderInterface
-{
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-    
-    public function __construct(
-        TokenStorageInterface $tokenStorage, 
-        TranslatorInterface $translator, 
-        AuthorizationHelper $authorizationHelper
-    ) {
-        $this->tokenStorage = $tokenStorage;
-        $this->translator = $translator;
-        $this->authorizationHelper = $authorizationHelper;
-    }
-
-    
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person  = $parameters['person'];
-        $user    = $this->tokenStorage->getToken()->getUser();
-        $roleSee = new Role(ActivityVoter::SEE);
-        $roleAdd = new Role(ActivityVoter::CREATE);
-        
-        if ($this->authorizationHelper->userHasAccess($user, $person, $roleSee)) {
-            $menu->addChild($this->translator->trans('Activity list'), [
-                    'route' => 'chill_activity_activity_list',
-                    'routeParameters' => [
-                        'person_id' => $person->getId()
-                    ]
-                ])
-                ->setExtras([
-                    'order' => 201
-                ]);
-        }
-        
-        if ($this->authorizationHelper->userHasAccess($user, $person, $roleAdd)) {
-            $menu->addChild($this->translator->trans('Add a new activity'), [
-                    'route' => 'chill_activity_activity_new',
-                    'routeParameters' => [
-                        'person_id' => $person->getId()
-                    ]
-                ])
-                ->setExtras([
-                    'order' => 200
-                ]);
-        }
-    }
-
-    public static function getMenuIds(): array
-    {
-        return [ 'person' ];
-    }
-}

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 namespace Chill\ActivityBundle\Menu; 
-
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -65,15 +64,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 ->setExtra('order', 201)
                 ;
         }
-        if ($this->authorizationChecker->isGranted(ActivityVoter::CREATE, $person)) {
-            $menu->addChild(
-                $this->translator->trans('Add a new activity'), [
-                    'route' => 'chill_activity_activity_new',
-                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ])
-                ->setExtra('order', 200)
-                ;
-        }
     }
 
     public static function getMenuIds(): array

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Chill\ActivityBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\ActivityBundle\Entity\Activity;
+
+final class ActivityNotificationRenderer
+{
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() == Activity::class;
+    }
+
+    public function getTemplate()
+    {
+        return '@ChillActivity/Activity/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return ['notification' => $notification];
+    }
+}

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -33,9 +35,10 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
 
 
-final class ActivityACLAwareRepository 
+final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     private AuthorizationHelper $authorizationHelper;
 
@@ -45,16 +48,63 @@ final class ActivityACLAwareRepository
 
     private EntityManagerInterface $em;
 
+    private Security $security;
+
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
+        Security $security
     ) {
         $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->tokenStorage = $tokenStorage;
         $this->repository = $repository;
         $this->em = $em;
+        $this->security = $security;
+    }
+
+    /**
+     * @param Person $person
+     * @param string $role
+     * @param int|null $start
+     * @param int|null $limit
+     * @param array $orderBy
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+        ;
+    }
+
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($period);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $scopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
     public function queryTimelineIndexer(string $context, array $args = []): array

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+interface ActivityACLAwareRepositoryInterface
+{
+    /**
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+}

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -39,4 +41,85 @@ class ActivityRepository extends ServiceEntityRepository
         parent::__construct($registry, Activity::class);
     }
 
+    /**
+     * @param $person
+     * @param array $scopes
+     * @param string[] $orderBy
+     * @param int $limit
+     * @param int $offset
+     * @return array|Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        $qb
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('a.person', ':person'),
+                    ':person MEMBER OF a.persons'
+                )
+            )
+            ->setParameter('person', $person)
+            ;
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * @param AccompanyingPeriod $period
+     * @param array $scopes
+     * @param int|null $limit
+     * @param int|null $offset
+     * @param array|string[] $orderBy
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        if (!$allowNullScope) {
+            $qb
+                ->where($qb->expr()->in('a.scope', ':scopes'))
+                ->setParameter('scopes', $scopes)
+            ;
+        } else {
+            $qb
+                ->where(
+                    $qb->expr()->orX(
+                        $qb->expr()->in('a.scope', ':scopes'),
+                        $qb->expr()->isNull('a.scope')
+                    )
+                )
+                ->setParameter('scopes', $scopes)
+            ;
+        }
+
+        $qb
+            ->andWhere(
+                $qb->expr()->eq('a.accompanyingPeriod', ':period')
+            )
+            ->setParameter('period', $period)
+        ;
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()
+            ->getResult();
+    }
 }

src/Bundle/ChillActivityBundle/Resources/public/activity/activity.scss

@@ -1,10 +0,0 @@
-@import '~ChillMainSass/custom/config/colors';
-@import '~ChillMainSass/custom/mixins/entity';
-
-.chill-entity.chill-entity__activity-reason {
-    @include entity($chill-pink, white);
-}
-
-.activity {
-    color: $chill-green;
-}

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -0,0 +1,88 @@
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
+
+//// ACTIVITY CREATION
+// first step: select type page
+
+div.new-activity-select-type {
+   div.activity-row {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: center;
+      gap: 12px;
+
+      div.bloc {
+         width: 200px;
+         align-self: flex-end;
+         height: 140px;
+         display: flex;
+         justify-content: center;
+         align-items: center;
+      }
+   }
+}
+
+//// ACTIVITY LIST PAGE
+// precise badge-title specific details
+
+h2.badge-title {
+    div.duration {
+        font-size: smaller;
+        padding-left: 1em;
+        margin-top: 1em;
+    }
+    ul.list-content {
+        font-size: 70%;
+        list-style-type: none;
+        padding-left: 0;
+        margin: 0;
+        li {
+            margin-bottom: 0.2em;
+            // exception: change bg color for action badges above badge-title
+            .bg-light {
+                background-color: $chill-light-gray !important;
+            }
+        }
+    }
+}
+div.main {
+    padding: 1em;
+}
+
+//// ACTIVITY SHOW AND FORM PAGES
+// Exceptions for flex-bloc in concerned-groups
+
+div.flex-bloc.concerned-groups {
+   margin-top: 1em;
+   div.item-bloc {
+      flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
+      ul.list-content {
+         list-style-type: none;
+         padding-left: 0;
+         li {
+            margin-bottom: 0.2em;
+            a {
+               color: $white;
+               cursor: pointer;
+               &:hover {
+                  color: #ffffffab;
+               }
+            }
+         }
+      }
+   }
+   &.person div.item-bloc {
+      flex-basis: 33%; //3 blocs
+   }
+}
+
+/// CHILL ENTITY RENDER BOX
+.chill-entity {
+
+   /// ACTIVITY-REASON
+   &.entity-activity-reason {
+      margin-right: 0.3em;
+      font-size: 120%;
+   }
+}

src/Bundle/ChillActivityBundle/Resources/public/chill/index.js

@@ -0,0 +1 @@
+require('./chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./activity/activity.scss');

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -0,0 +1,20 @@
+<template>
+   <concerned-groups></concerned-groups>
+   <social-issues-acc></social-issues-acc>
+   <location></location>
+</template>
+
+<script>
+import ConcernedGroups from './components/ConcernedGroups.vue';
+import SocialIssuesAcc from './components/SocialIssuesAcc.vue';
+import Location from './components/Location.vue';
+
+export default {
+   name: "App",
+   components: {
+      ConcernedGroups,
+      SocialIssuesAcc,
+      Location
+   }
+}
+</script>

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

@@ -0,0 +1,63 @@
+import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+
+/*
+*  Load socialActions by socialIssue (id)
+*/
+const getSocialActionByIssue = (id) => {
+   const url = `/api/1.0/person/social/social-action/by-social-issue/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+*   Load Locations
+ */
+const getLocations = () => {
+    const url = `/api/1.0/main/location.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+/*
+*   Load Location Types
+ */
+const getLocationTypes = () => {
+    const url = `/api/1.0/main/location-type.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+/*
+*   Post a Location
+ */
+const postLocation = (body) => {
+    const url = `/api/1.0/main/location.json`;
+    return fetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(body)
+    })
+    .then(response => {
+        if (response.ok) { return response.json(); }
+        throw Error('Error with request resource response');
+    });
+};
+
+export {
+   getSocialIssues,
+   getSocialActionByIssue,
+   getLocations,
+   getLocationTypes,
+   postLocation
+};

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

@@ -0,0 +1,188 @@
+<template>
+   <teleport to="#add-persons">
+
+      <div class="flex-bloc concerned-groups" :class="getContext">
+         <persons-bloc
+            v-for="bloc in contextPersonsBlocs"
+            v-bind:key="bloc.key"
+            v-bind:bloc="bloc"
+            v-bind:setPersonsInBloc="setPersonsInBloc">
+         </persons-bloc>
+      </div>
+
+     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
+        <ul>
+          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
+             {{ p.text }}
+          </li>
+        </ul>
+     </div>
+
+      <add-persons
+         buttonTitle="activity.add_persons"
+         modalTitle="activity.add_persons"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons">
+      </add-persons>
+
+  </teleport>
+</template>
+
+<script>
+import { mapState, mapGetters } from 'vuex';
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
+
+export default {
+   name: "ConcernedGroups",
+   components: {
+      AddPersons,
+      PersonsBloc
+   },
+   data() {
+      return {
+         personsBlocs: [
+            {  key: 'persons',
+               title: 'activity.bloc_persons',
+               persons: [],
+               included: false
+            },
+            {  key: 'personsAssociated',
+               title: 'activity.bloc_persons_associated',
+               persons: [],
+               included: false
+            },
+            {  key: 'personsNotAssociated',
+               title: 'activity.bloc_persons_not_associated',
+               persons: [],
+               included: false
+            },
+            {  key: 'thirdparty',
+               title: 'activity.bloc_thirdparty',
+               persons: [],
+               included: true
+            },
+            {  key: 'users',
+               title: 'activity.bloc_users',
+               persons: [],
+               included: true
+            },
+         ],
+         addPersons: {
+            key: 'activity',
+            options: {
+               type: ['person', 'thirdparty', 'user'],
+               priority: null,
+               uniq: false,
+               button: {
+                   size: 'btn-sm'
+               }
+            }
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         persons: state => state.activity.persons,
+         thirdParties: state => state.activity.thirdParties,
+         users: state => state.activity.users,
+         accompanyingCourse: state => state.activity.accompanyingPeriod
+      }),
+      ...mapGetters([
+          'filterSuggestedPersons'
+      ]),
+      getContext() {
+         return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
+      },
+      contextPersonsBlocs() {
+         return this.personsBlocs.filter(bloc => bloc.included !== false);
+      }
+   },
+   mounted() {
+      this.setPersonsInBloc();
+   },
+   methods: {
+      setPersonsInBloc() {
+         let groups;
+         if (this.accompanyingCourse) {
+            groups = this.splitPersonsInGroups();
+         }
+         this.personsBlocs.forEach(bloc => {
+            if (this.accompanyingCourse) {
+               switch (bloc.key) {
+                  case 'personsAssociated':
+                     bloc.persons = groups.personsAssociated;
+                     bloc.included = true;
+                     break;
+                  case 'personsNotAssociated':
+                     bloc.persons = groups.personsNotAssociated;
+                     bloc.included = true;
+                     break;
+               }
+            } else {
+               switch (bloc.key) {
+                  case 'persons':
+                     bloc.persons = this.persons;
+                     bloc.included = true;
+                     break;
+               }
+            }
+            switch (bloc.key) {
+               case 'thirdparty':
+                  bloc.persons = this.thirdParties;
+                  break;
+               case 'users':
+                  bloc.persons = this.users;
+                  break;
+            }
+         }, groups);
+      },
+      splitPersonsInGroups() {
+         let personsAssociated = [];
+         let personsNotAssociated = this.persons;
+         let participations = this.getCourseParticipations();
+         this.persons.forEach(person => {
+            participations.forEach(participation => {
+               if (person.id === participation.id) {
+                  //console.log(person.id);
+                  personsAssociated.push(person);
+                  personsNotAssociated = personsNotAssociated.filter(p => p !== person);
+               }
+            });
+         });
+         return {
+            'personsAssociated': personsAssociated,
+            'personsNotAssociated': personsNotAssociated
+         };
+      },
+      getCourseParticipations() {
+         let participations = [];
+         this.accompanyingCourse.participations.forEach(participation => {
+            if (!participation.endDate) {
+               participations.push(participation.person);
+            }
+         });
+         return participations;
+      },
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addPersonsInvolved', item);
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+         this.setPersonsInBloc();
+      },
+      addNewPerson(person) {
+        this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
+        this.setPersonsInBloc();
+      },
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -0,0 +1,29 @@
+<template>
+   <li>
+      <span class="badge bg-primary" :title="person.text">
+         <span class="chill_denomination">
+            {{ textCutted }}
+         </span>
+         <a class="fa fa-fw fa-times"
+            @click.prevent="$emit('remove', person)">
+         </a>
+      </span>
+   </li>
+</template>
+
+<script>
+export default {
+   name: "PersonBadge",
+   props: ['person'],
+   computed: {
+      textCutted() {
+         let more = (this.person.text.length > 15) ?'…' : '';
+         return this.person.text.slice(0,15) + more;
+      }
+   },
+   emits: ['remove'],
+}
+</script>
+
+<style lang="css" scoped>
+</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue

@@ -0,0 +1,41 @@
+<template>
+   <div class="item-bloc">
+      <div class="item-row">
+         <div class="item-col">
+            <h4>{{ $t(bloc.title) }}</h4>
+         </div>
+         <div class="item-col">
+            <ul class="list-content">
+               <person-badge
+                  v-for="person in bloc.persons"
+                  v-bind:key="person.id"
+                  v-bind:person="person"
+                  @remove="removePerson">
+               </person-badge>
+            </ul>
+         </div>
+      </div>
+   </div>
+</template>
+
+<script>
+import PersonBadge from './PersonBadge.vue';
+export default {
+   name:"PersonsBloc",
+   components: {
+      PersonBadge
+   },
+   props: ['bloc', 'setPersonsInBloc'],
+   methods: {
+      removePerson(item) {
+         console.log('@@ CLICK remove person: item', item);
+         this.$store.dispatch('removePersonInvolved', item);
+         this.setPersonsInBloc();
+      }
+   }
+}
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,74 @@
+<template>
+    <teleport to="#location">
+        <div class="mb-3 row">
+            <label class="col-form-label col-sm-4">
+                {{ $t('activity.location') }}
+            </label>
+            <div class="col-sm-8">
+
+                <VueMultiselect
+                    name="selectLocation"
+                    id="selectLocation"
+                    label="name"
+                    track-by="id"
+                    open-direction="top"
+                    :multiple="false"
+                    :searchable="true"
+                    :placeholder="$t('activity.choose_location')"
+                    :custom-label="customLabel"
+                    :options="locations"
+                    v-model="location">
+                </VueMultiselect>
+
+                <new-location v-bind:locations="locations"></new-location>
+            </div>
+        </div>
+    </teleport>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import VueMultiselect from 'vue-multiselect';
+import NewLocation from './Location/NewLocation.vue';
+import { getLocations } from '../api.js';
+
+export default {
+    name: "Location",
+    components: {
+        NewLocation,
+        VueMultiselect
+    },
+    data() {
+        return {
+            locations: []
+        }
+    },
+    computed: {
+        ...mapState(['activity']),
+        location: {
+            get() {
+                return this.activity.location;
+            },
+            set(value) {
+                this.$store.dispatch('updateLocation', value);
+            }
+        }
+    },
+    mounted() {
+        this.getLocationsList();
+    },
+    methods: {
+        getLocationsList() {
+            getLocations().then(response => new Promise(resolve => {
+                console.log('getLocations', response);
+                this.locations = response.results;
+                resolve();
+            }))
+        },
+        customLabel(value) {
+            return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
+        }
+    }
+}
+
+</script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -0,0 +1,271 @@
+<template>
+    <div>
+        <ul class="record_actions">
+            <li>
+                <a class="btn btn-sm btn-create" @click="openModal">
+                    {{ $t('activity.create_new_location') }}
+                </a>
+            </li>
+        </ul>
+
+        <teleport to="body">
+            <modal v-if="modal.showModal"
+                :modalDialogClass="modal.modalDialogClass"
+                @close="modal.showModal = false">
+
+                <template v-slot:header>
+                    <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
+                </template>
+                <template v-slot:body>
+                    <form>
+                        <div class="form-floating mb-3">
+                            <p v-if="errors.length">
+                                <b>{{ $t('activity.errors') }}</b>
+                                <ul>
+                                    <li v-for="error in errors" :key="error">{{ error }}</li>
+                                </ul>
+                            </p>
+                        </div>
+
+                        <div class="form-floating mb-3">
+                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
+                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
+                                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                                    {{ t.title.fr }}
+                                </option>
+                            </select>
+                            <label>{{ $t('activity.location_fields.type') }}</label>
+                        </div>
+
+                        <div class="form-floating mb-3">
+                            <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
+                            <label for="name">{{ $t('activity.location_fields.name') }}</label>
+                        </div>
+
+                        <add-address
+                            :context="addAddress.context"
+                            :options="addAddress.options"
+                            :addressChangedCallback="submitNewAddress"
+                            v-if="showAddAddress"
+                            ref="addAddress">
+                        </add-address>
+
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
+                            <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
+                            <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
+                            <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
+                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
+                        </div>
+                    </form>
+                </template>
+                <template v-slot:footer>
+                    <button class="btn btn-save"
+                        @click.prevent="saveNewLocation"
+                    >
+                        {{ $t('action.save') }}
+                    </button>
+                </template>
+
+            </modal>
+        </teleport>
+    </div>
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
+import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
+import { mapState } from "vuex";
+import { getLocationTypes, postLocation } from "../../api";
+
+export default {
+    name: "NewLocation",
+    components: {
+        Modal,
+        AddAddress,
+    },
+    props: ['locations'],
+    data() {
+        return {
+            errors: [],
+            selected: {
+                type: null,
+                name: null,
+                addressId: null,
+                phonenumber1: null,
+                phonenumber2: null,
+                email: null,
+            },
+            locationTypes: [],
+            modal: {
+                showModal: false,
+                modalDialogClass: "modal-dialog-scrollable modal-xl"
+            },
+            addAddress: {
+                options: {
+                    button: {
+                        text:  { create: 'activity.create_address', edit: 'activity.edit_address' },
+                        size: 'btn-sm'
+                    },
+                    title: { create: 'activity.create_address', edit: 'activity.edit_address' },
+                },
+                context: {
+                    target: { //name, id
+                        },
+                    edit: false,
+                    addressId: null
+                }
+            }
+        }
+    },
+    computed: {
+        ...mapState(['activity']),
+        selectType: {
+            get() {
+                return this.selected.type;
+            },
+            set(value) {
+                this.selected.type = value;
+            }
+        },
+        inputName: {
+            get() {
+                return this.selected.name;
+            },
+            set(value) {
+                this.selected.name = value;
+            }
+        },
+        inputEmail: {
+            get() {
+                return this.selected.email;
+            },
+            set(value) {
+                this.selected.email = value;
+            }
+        },
+        inputPhonenumber1: {
+            get() {
+                return this.selected.phonenumber1;
+            },
+            set(value) {
+                this.selected.phonenumber1 = value;
+            }
+        },
+        inputPhonenumber2: {
+            get() {
+                return this.selected.phonenumber2;
+            },
+            set(value) {
+                this.selected.phonenumber2 = value;
+            }
+        },
+        hasPhonenumber1() {
+            return this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== "";
+        },
+        showAddAddress() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.addressRequired !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
+        showContactData() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.contactData !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
+    },
+    mounted() {
+        this.getLocationTypesList();
+    },
+    methods: {
+        checkForm() {
+            let cond = true;
+            this.errors = [];
+            if (!this.selected.type) {
+                this.errors.push('Type de localisation requis');
+                cond = false;
+            } else {
+                if (this.selected.type.addressRequired === 'required' && !this.selected.addressId) {
+                    this.errors.push('Adresse requise');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.phonenumber1) {
+                    this.errors.push('Numéro de téléphone requis');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.email) {
+                    this.errors.push('Adresse email requise');
+                    cond = false;
+                }
+            }
+            return cond;
+        },
+        getLocationTypesList() {
+            getLocationTypes().then(response => new Promise(resolve => {
+                console.log('getLocationTypes', response);
+                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
+                resolve();
+            }))
+        },
+        openModal() {
+            this.modal.showModal = true;
+        },
+        saveNewLocation() {
+            if (this.checkForm()) {
+                console.log('saveNewLocation', this.selected);
+                let body = {
+                    type: 'location',
+                    name: this.selected.name,
+                    locationType: {
+                        id: this.selected.type.id,
+                        type: 'location-type'
+                    },
+                    phonenumber1: this.selected.phonenumber1,
+                    phonenumber2: this.selected.phonenumber2,
+                    email: this.selected.email,
+                };
+                if (this.selected.addressId) {
+                    body = Object.assign(body, {
+                        address: {
+                            id: this.selected.addressId
+                        }
+                    });
+                }
+                postLocation(body)
+                    .then(
+                        location => new Promise(resolve => {
+                            console.log('postLocation', location);
+                            this.locations.push(location);
+                            this.$store.dispatch('updateLocation', location);
+                            resolve();
+                            this.modal.showModal = false;
+                        })
+                    ).catch(
+                        err => {
+                            this.errors.push(err.message);
+                        }
+                    );
+            };
+        },
+        submitNewAddress(payload) {
+            console.log('submitNewAddress', payload);
+            this.selected.addressId = payload.addressId;
+            this.addAddress.context.addressId = payload.addressId;
+            this.addAddress.context.edit = true;
+        }
+    }
+}
+</script>

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

@@ -0,0 +1,212 @@
+<template>
+   <teleport to="#social-issues-acc">
+
+      <div class="mb-3 row">
+         <div class="col-4">
+            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
+         </div>
+         <div class="col-8">
+
+            <check-social-issue
+               v-for="issue in socialIssuesList"
+               v-bind:key="issue.id"
+               v-bind:issue="issue"
+               v-bind:selection="socialIssuesSelected"
+               @updateSelected="updateIssuesSelected">
+            </check-social-issue>
+
+            <div class="my-3">
+            <VueMultiselect
+               name="otherIssues"
+               label="text"
+               track-by="id"
+               open-direction="bottom"
+               v-bind:close-on-select="true"
+               v-bind:preserve-search="false"
+               v-bind:reset-after="true"
+               v-bind:hide-selected="true"
+               v-bind:taggable="false"
+               v-bind:multiple="false"
+               v-bind:searchable="true"
+               v-bind:allow-empty="true"
+               v-bind:show-labels="false"
+               v-bind:loading="issueIsLoading"
+               v-bind:placeholder="$t('activity.choose_other_social_issue')"
+               v-bind:options="socialIssuesOther"
+               @select="addIssueInList">
+            </VueMultiselect>
+            </div>
+
+         </div>
+      </div>
+
+      <div class="mb-3 row">
+         <div class="col-4">
+            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
+         </div>
+         <div class="col-8">
+
+            <div v-if="actionIsLoading === true">
+               <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
+            </div>
+
+            <check-social-action
+               v-if="socialIssuesSelected.length || socialActionsSelected.length"
+               v-for="action in socialActionsList"
+               v-bind:key="action.id"
+               v-bind:action="action"
+               v-bind:selection="socialActionsSelected"
+               @updateSelected="updateActionsSelected">
+            </check-social-action>
+
+            <span v-else class="inline-choice chill-no-data-statement mt-3">
+               {{ $t('activity.select_first_a_social_issue') }}
+            </span>
+
+         </div>
+      </div>
+
+   </teleport>
+</template>
+
+<script>
+import VueMultiselect from 'vue-multiselect';
+import CheckSocialIssue from './SocialIssuesAcc/CheckSocialIssue.vue';
+import CheckSocialAction from './SocialIssuesAcc/CheckSocialAction.vue';
+import { getSocialIssues, getSocialActionByIssue } from '../api.js';
+
+export default {
+   name: "SocialIssuesAcc",
+   components: {
+      CheckSocialIssue,
+      CheckSocialAction,
+      VueMultiselect
+   },
+   data() {
+      return {
+         issueIsLoading: false,
+         actionIsLoading: false
+      }
+   },
+   computed: {
+      socialIssuesList() {
+         return this.$store.state.activity.accompanyingPeriod.socialIssues;
+      },
+      socialIssuesSelected() {
+         return this.$store.state.activity.socialIssues;
+      },
+      socialIssuesOther() {
+         return this.$store.state.socialIssuesOther;
+      },
+      socialActionsList() {
+         return this.$store.state.socialActionsList;
+      },
+      socialActionsSelected() {
+         return this.$store.state.activity.socialActions;
+      }
+   },
+   mounted() {
+      /* Load others issues in multiselect
+      */
+      this.issueIsLoading = true;
+      getSocialIssues().then(response => new Promise((resolve, reject) => {
+         this.$store.commit('updateIssuesOther', response.results);
+
+         /* Add in list the issues already associated (if not yet listed)
+         */
+         this.socialIssuesSelected.forEach(issue => {
+            if (this.socialIssuesList.filter(i => i.id === issue.id).length !== 1) {
+               this.$store.commit('addIssueInList', issue);
+            }
+         }, this);
+
+         /* Remove from multiselect the issues that are not yet in checkbox list
+         */
+         this.socialIssuesList.forEach(issue => {
+            this.$store.commit('removeIssueInOther', issue);
+         }, this);
+
+         /* Filter issues
+         */
+         this.$store.commit('filterList', 'issues');
+
+         /* Add in list the actions already associated (if not yet listed)
+         */
+         this.socialActionsSelected.forEach(action => {
+            this.$store.commit('addActionInList', action);
+         }, this);
+
+         /* Filter issues
+         */
+         this.$store.commit('filterList', 'actions');
+
+         this.issueIsLoading = false;
+         resolve();
+      }));
+   },
+   methods: {
+
+      /* When choosing an issue in multiselect, add it in checkboxes (as selected),
+         remove it from multiselect, and add socialActions concerned
+      */
+      addIssueInList(value) {
+         //console.log('addIssueInList', value);
+         this.$store.commit('addIssueInList', value);
+         this.$store.commit('removeIssueInOther', value);
+         this.$store.dispatch('addIssueSelected', value);
+         this.updateActionsList();
+      },
+      /* Update value for selected issues checkboxes
+      */
+      updateIssuesSelected(issues) {
+         //console.log('updateIssuesSelected', issues);
+         this.$store.dispatch('updateIssuesSelected', issues);
+         this.updateActionsList();
+      },
+      /* Update value for selected actions checkboxes
+      */
+      updateActionsSelected(actions) {
+         //console.log('updateActionsSelected', actions);
+         this.$store.dispatch('updateActionsSelected', actions);
+      },
+      /* Add socialActions concerned: after reset, loop on each issue selected
+         to get social actions concerned
+      */
+      updateActionsList() {
+         //console.log('updateActionsList');
+         this.resetActionsList();
+         this.socialIssuesSelected.forEach(item => {
+
+            this.actionIsLoading = true;
+            getSocialActionByIssue(item.id)
+               .then(actions => new Promise((resolve, reject) => {
+
+                  actions.results.forEach(action => {
+                     this.$store.commit('addActionInList', action);
+                  }, this);
+
+                  this.$store.commit('filterList', 'actions');
+
+                  this.actionIsLoading = false;
+                  resolve();
+            }));
+         }, this);
+      },
+      /* Reset socialActions List: flush list and restore selected actions
+      */
+      resetActionsList() {
+         this.$store.commit('resetActionsList');
+         this.socialActionsSelected.forEach(item => {
+            this.$store.commit('addActionInList', item);
+         }, this);
+      }
+   }
+}
+</script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+<style lang="scss" scoped>
+   span.multiselect__single {
+      display: none !important;
+   }
+</style>

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

@@ -0,0 +1,36 @@
+<template>
+   <span class="inline-choice">
+      <div class="form-check">
+   
+         <input class="form-check-input"
+            type="checkbox" 
+            v-model="selected"
+            name="action"
+            v-bind:id="action.id" 
+            v-bind:value="action"
+            />
+         <label class="form-check-label" v-bind:for="action.id">
+            {{ action.text }}
+         </label>
+         
+      </div>
+   </span>
+</template>
+
+<script>
+export default {
+   name: "CheckSocialAction",
+   props: [ 'action', 'selection' ],
+   emits: [ 'updateSelected' ],
+   computed: {
+      selected: {
+         set(value) {
+            this.$emit('updateSelected', value);
+         },
+         get() {
+            return this.selection;
+         }
+      }
+   }
+}
+</script>

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

@@ -0,0 +1,36 @@
+<template>
+   <span class="inline-choice">
+      <div class="form-check">
+      
+         <input class="form-check-input"
+            type="checkbox" 
+            v-model="selected"
+            name="issue"
+            v-bind:id="issue.id" 
+            v-bind:value="issue"
+            />
+         <label class="form-check-label" v-bind:for="issue.id">
+            {{ issue.text }}
+         </label>
+         
+      </div>
+   </span>
+</template>
+
+<script>
+export default {
+   name: "CheckSocialIssue",
+   props: [ 'issue', 'selection' ],
+   emits: [ 'updateSelected' ],
+   computed: {
+      selected: {
+         set(value) {
+            this.$emit('updateSelected', value);
+         },
+         get() {
+            return this.selection;
+         }
+      }
+   }
+}
+</script>

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

@@ -0,0 +1,44 @@
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+
+const activityMessages = {
+   fr: {
+      activity: {
+         //
+         errors: "Le formulaire contient des erreurs",
+         social_issues: "Problématiques sociales",
+         choose_other_social_issue: "Ajouter une autre problématique sociale...",
+         social_actions: "Actions d'accompagnement",
+         select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
+
+         //
+         add_persons: "Ajouter des personnes concernées",
+         bloc_persons: "Usagers",
+         bloc_persons_associated: "Usagers du parcours",
+         bloc_persons_not_associated: "Tiers non-pro.",
+         bloc_thirdparty: "Tiers professionnels",
+         bloc_users: "T(M)S",
+
+          //
+          location: "Localisation",
+          choose_location: "Choisissez une localisation",
+          choose_location_type: "Choisissez un type de localisation",
+          create_new_location: "Créer une nouvelle localisation",
+          location_fields: {
+              name: "Nom",
+              type: "Type",
+              phonenumber1: "Téléphone",
+              phonenumber2: "Autre téléphone",
+              email: "Adresse courriel",
+          },
+          create_address: 'Créer une adresse',
+          edit_address: "Modifier l'adresse"
+
+      }
+   }
+}
+
+Object.assign(activityMessages.fr, personMessages.fr);
+
+export {
+   activityMessages
+};

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

@@ -0,0 +1,16 @@
+import { createApp } from 'vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { activityMessages } from './i18n'
+import store from './store'
+
+import App from './App.vue';
+
+const i18n = _createI18n(activityMessages);
+
+const app = createApp({
+   template: `<app></app>`,
+})
+.use(store)
+.use(i18n)
+.component('app', App)
+.mount('#activity');

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

@@ -0,0 +1,190 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+
+const debug = process.env.NODE_ENV !== 'production';
+//console.log('window.activity', window.activity);
+
+const addIdToValue = (string, id) => {
+  let array = string ? string.split(',') : [];
+  array.push(id.toString());
+  let str = array.join();
+  return str;
+};
+
+const removeIdFromValue = (string, id) => {
+  let array = string.split(',');
+  array = array.filter(el => el !== id.toString());
+  let str = array.join();
+  return str;
+};
+
+const store = createStore({
+  strict: debug,
+  state: {
+    activity: window.activity,
+    socialIssuesOther: [],
+    socialActionsList: [],
+  },
+  getters: {
+    filterSuggestedPersons(state) {
+      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+        return [];
+      }
+      let existingPersonIds = state.activity.persons.map(p => p.id);
+      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
+        .map(p => p.person)
+        .filter(p => !existingPersonIds.includes(p.id))
+    }
+  },
+  mutations: {
+    // SocialIssueAcc
+    addIssueInList(state, issue) {
+      //console.log('add issue list', issue.id);
+      state.activity.accompanyingPeriod.socialIssues.push(issue);
+    },
+    addIssueSelected(state, issue) {
+      //console.log('add issue selected', issue.id);
+      state.activity.socialIssues.push(issue);
+    },
+    updateIssuesSelected(state, issues) {
+      //console.log('update issues selected', issues);
+      state.activity.socialIssues = issues;
+    },
+    updateIssuesOther(state, payload) {
+      //console.log('update issues other');
+      state.socialIssuesOther = payload;
+    },
+    removeIssueInOther(state, issue) {
+      //console.log('remove issue other', issue.id);
+      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
+    },
+    resetActionsList(state) {
+      //console.log('reset list actions');
+      state.socialActionsList = [];
+    },
+    addActionInList(state, action) {
+      //console.log('add action list', action.id);
+      state.socialActionsList.push(action);
+    },
+    updateActionsSelected(state, actions) {
+      //console.log('update actions selected', actions);
+      state.activity.socialActions = actions;
+    },
+    filterList(state, list) {
+      const filterList = (list) => {
+        // remove duplicates entries
+        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
+        // alpha sort
+        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
+        return list;
+      };
+      if (list === 'issues') {
+        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+      }
+      if (list === 'actions') {
+        state.socialActionsList = filterList(state.socialActionsList);
+      }
+    },
+
+    // ConcernedGroups
+    addPersonsInvolved(state, payload) {
+      //console.log('### mutation addPersonsInvolved', payload.result.type);
+      switch (payload.result.type) {
+        case 'person':
+          state.activity.persons.push(payload.result);
+          break;
+        case 'thirdparty':
+          state.activity.thirdParties.push(payload.result);
+          break;
+        case 'user':
+          state.activity.users.push(payload.result);
+          break;
+      };
+    },
+    removePersonInvolved(state, payload) {
+      //console.log('### mutation removePersonInvolved', payload.type);
+      switch (payload.type) {
+        case 'person':
+          state.activity.persons = state.activity.persons.filter(person => person !== payload);
+          break;
+        case 'thirdparty':
+          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
+          break;
+        case 'user':
+          state.activity.users = state.activity.users.filter(user => user !== payload);
+          break;
+      };
+    },
+    updateLocation(state, value) {
+        console.log('### mutation: updateLocation', value);
+        state.activity.location = value;
+    }
+  },
+  actions: {
+    addIssueSelected({ commit }, issue) {
+      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+      aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+      commit('addIssueSelected', issue);
+    },
+    updateIssuesSelected({ commit }, payload) {
+      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+      aSocialIssues.value = '';
+      payload.forEach(item => {
+        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
+      });
+      commit('updateIssuesSelected', payload);
+    },
+    updateActionsSelected({ commit }, payload) {
+      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
+      aSocialActions.value = '';
+      payload.forEach(item => {
+        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
+      });
+      commit('updateActionsSelected', payload);
+    },
+    addPersonsInvolved({ commit }, payload) {
+      //console.log('### action addPersonsInvolved', payload.result.type);
+      switch (payload.result.type) {
+        case 'person':
+          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
+          break;
+        case 'thirdparty':
+          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
+          break;
+        case 'user':
+          let aUsers = document.getElementById("chill_activitybundle_activity_users");
+          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
+          break;
+      };
+      commit('addPersonsInvolved', payload);
+    },
+    removePersonInvolved({ commit }, payload) {
+      //console.log('### action removePersonInvolved', payload);
+      switch (payload.type) {
+        case 'person':
+          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
+          break;
+        case 'thirdparty':
+          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
+          break;
+        case 'user':
+          let aUsers = document.getElementById("chill_activitybundle_activity_users");
+          aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+          break;
+      };
+      commit('removePersonInvolved', payload);
+    },
+    updateLocation({ commit }, value) {
+        console.log('### action: updateLocation', value);
+        let hiddenLocation = document.getElementById("chill_activitybundle_activity_location");
+        hiddenLocation.value = value.id;
+        commit('updateLocation', value);
+    }
+  }
+});
+
+export default store;

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -0,0 +1,88 @@
+<h2 class="badge-title">
+    <span class="title_label">
+
+        {% if activity.date %}
+            <h3>{{ activity.date|format_date('short') }}</h3>
+        {% endif %}
+
+        <div class="duration">
+            {% if activity.durationTime and t.durationTimeVisible %}
+                <p>
+                    <abbr class="fa fa-fw fa-hourglass-end" title="{{ 'Duration Time'|trans }}"></abbr>
+                    {{ activity.durationTime|date('H:i') }}
+                </p>
+            {% endif %}
+
+            {% if activity.travelTime and t.travelTimeVisible %}
+                <p>
+                    <abbr class="fa fa-fw fa-car" title="{{ 'Travel time'|trans }}"></abbr>
+                    {{ activity.travelTime|date('H:i') }}
+                </p>
+            {% endif %}
+        </div>
+
+    </span>
+    <span class="title_action">
+
+        {{ activity.type.name | localize_translatable_string }}
+
+        <ul class="small_in_title">
+            <li>
+                <abbr title="{{ 'location'|trans }}">{{ 'location'|trans ~ ': ' }}</abbr>
+                {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
+                Domicile de l'usager
+            </li>
+            {% if activity.user and t.userVisible %}
+                <li>
+                    <abbr title="{{ 'Referrer'|trans }}">{{ 'Referrer'|trans ~ ': ' }}</abbr>
+                    {{ activity.user.usernameCanonical }}
+                </li>
+            {% endif %}
+        </ul>
+
+        <ul class="list-content">
+            {%- if t.reasonsVisible -%}
+                {%- if activity.reasons is not empty -%}
+                    <li class="reasons">
+                        {% for r in activity.reasons %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+            {%- if t.socialIssuesVisible %}
+                {%- if activity.socialIssues is not empty -%}
+                    <li class="social-issues">
+                        {% for r in activity.socialIssues %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+            {%- if t.socialActionsVisible -%}
+                {%- if activity.socialActions is not empty -%}
+                    <li class="social-actions">
+                        {% for r in activity.socialActions %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+        </ul>
+
+    </span>
+</h2>
+
+{#
+{% if context == 'person' and activity.accompanyingPeriod is not empty %}
+    <div class="mt-3">
+        <a class="btn btn-sm btn-outline-primary"
+           title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
+           href="{{ chill_path_add_return_path(
+               "chill_person_accompanying_course_index",
+               { 'accompanying_period_id': activity.accompanyingPeriod.id }
+           ) }}"><i class="fa fa-random"></i>
+        </a>
+    </div>
+{% endif %}
+#}

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

@@ -0,0 +1,131 @@
+{% macro href(pathname, key, value) %}
+    {% set parms = { (key): value } %}
+    {{ path(pathname, parms) }}
+{% endmacro %}
+
+{% if context == 'person' %}
+    {% set blocs = [
+        {   'title': 'Others persons'|trans,
+            'items': entity.persons,
+            'path' : 'chill_person_view',
+            'key'  : 'person_id'
+        },
+        {   'title': 'Third parties'|trans,
+            'items': entity.thirdParties,
+            'path' : 'chill_3party_3party_show',
+            'key'  : 'thirdparty_id'
+        },
+        {   'title': 'Users concerned'|trans,
+            'items': entity.users,
+            'path' : 'admin_user_show',
+            'key'  : 'id'
+        },
+    ] %}
+{% else %}
+    {% set blocs = [
+        {   'title': 'Persons in accompanying course'|trans,
+            'items': entity.personsAssociated,
+            'path' : 'chill_person_view',
+            'key'  : 'person_id'
+        },
+        {   'title': 'Third persons'|trans,
+            'items': entity.personsNotAssociated,
+            'path' : 'chill_person_view',
+            'key'  : 'person_id'
+        },
+        {   'title': 'Third parties'|trans,
+            'items': entity.thirdParties,
+            'path' : 'chill_3party_3party_show',
+            'key'  : 'thirdparty_id'
+        },
+        {   'title': 'Users concerned'|trans,
+            'items': entity.users,
+            'path' : 'admin_user_show',
+            'key'  : 'id'
+        },
+    ] %}
+{% endif %}
+
+{% if (with_display == 'bloc') %}
+<div class="{{ context }} flex-bloc concerned-groups">
+    {% for bloc in blocs %}
+    <div class="item-bloc">
+        <div class="item-row">
+            <div class="item-col">
+                <h4>{{ bloc.title }}</h4>
+            </div>
+            <div class="item-col">
+                <ul class="list-content">
+                    {% for item in bloc.items %}
+                    <li>
+                        <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                {{ item|chill_entity_render_box({
+                                    'render': 'raw',
+                                    'addAltNames': false
+                                }) }}
+                            </span>
+                        </a>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
+
+{% if (with_display == 'row') %}
+<div class="concerned-groups">
+    {% for bloc in blocs %}
+    <div class="group">
+        {% if bloc.items|length > 0 %}
+            <h4>{{ bloc.title }}</h4>
+            <ul class="list-content">
+                {% for item in bloc.items %}
+                <li>
+                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {{ item|chill_entity_render_box({
+                                'render': 'raw',
+                                'addAltNames': false
+                            }) }}
+                        </span>
+                    </a>
+                </li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
+
+{% if (with_display == 'wrap-list') %}
+<div class="concerned-groups wrap-list">
+    {% for bloc in blocs %}
+        <div class="wl-row">
+            {% if bloc.items|length > 0 %}
+                <div class="wl-col title">
+                    <h4>{{ bloc.title }}</h4>
+                </div>
+                <div class="wl-col list">
+                    {% for item in bloc.items %}
+
+                        <span class="wl-item {% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                                {{ item|chill_entity_render_box({
+                                    'render': 'raw',
+                                    'addAltNames': false
+                                }) }}
+                            </a>
+                        </span>
+
+                    {% endfor %}
+                </div>
+            {% endif %}
+        </div>
+    {% endfor %}
+</div>
+{% endif %}

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

@@ -0,0 +1,16 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title  'Remove activity'|trans %}
+
+{% block content %}
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Remove activity'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_activity_activity_list',
+            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : activity.id },
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

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

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 {% set person = activity.person %}
@@ -6,7 +6,6 @@
 {% block title  'Remove activity'|trans %}
 
 {% block personcontent %}
-
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove activity'|trans,
@@ -15,5 +14,4 @@
         'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
         'form'              : delete_form
     } ) }}
-    
 {% endblock %}

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

@@ -1,59 +1,107 @@
-{#
- * 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 "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title  'Update activity'|trans %}
-
-{% block personcontent %}
 <h1>{{ "Update activity"|trans }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
 
 {{ form_start(edit_form) }}
+{{ form_errors(edit_form) }}
 
+{%- if edit_form.emergency is defined -%}
+    {{ form_row(edit_form.emergency) }}
+{% endif %}
+
+{%- if edit_form.sentReceived is defined -%}
+    {{ form_row(edit_form.sentReceived) }}
+{% endif %}
+
+{%- if edit_form.user is defined -%}
     {{ form_row(edit_form.user) }}
+{% endif %}
+
+{%- if edit_form.scope is defined -%}
     {{ form_row(edit_form.scope) }}
+{% endif %}
 
-    <h2>{{ 'Activity data'|trans }}</h2>
-    {{ form_row(edit_form.date) }}
-    {{ form_row(edit_form.durationTime) }}
-    {{ form_row(edit_form.type) }}
-    {{ form_row(edit_form.attendee) }}
+{%- if edit_form.socialIssues is defined -%}
+    {{ form_row(edit_form.socialIssues) }}
+{% endif %}
+
+{%- if edit_form.socialActions is defined -%}
+    {{ form_row(edit_form.socialActions) }}
+{% endif %}
+
+<div id="social-issues-acc"></div>
+
+{%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}
-    {{ form_row(edit_form.comment) }}
+{% endif %}
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+
+{%- if edit_form.persons is defined -%}
+    {{ form_widget(edit_form.persons) }}
+{% endif %}
+{%- if edit_form.thirdParties is defined -%}
+    {{ form_widget(edit_form.thirdParties) }}
+{% endif %}
+{%- if edit_form.users is defined -%}
+    {{ form_widget(edit_form.users) }}
+{% endif %}
+
+<div id="add-persons"></div>
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+{%- if edit_form.date is defined -%}
+    {{ form_row(edit_form.date) }}
+{% endif %}
+
+{%- if edit_form.location is defined -%}
+    {{ form_row(edit_form.location) }}
+    <div id="location"></div>
+{% endif %}
+
+{%- if edit_form.durationTime is defined -%}
+    {{ form_row(edit_form.durationTime) }}
+{% endif %}
+
+{%- if edit_form.travelTime is defined -%}
+    {{ form_row(edit_form.travelTime) }}
+{% endif %}
+
+{%- if edit_form.comment is defined -%}
+    {# TODO .. public and private #}
+    {{ form_row(edit_form.comment) }}
+{% endif %}
+
+{%- if edit_form.documents is defined -%}
+    {{ form_row(edit_form.documents) }}
+{% endif %}
+
+{%- if edit_form.attendee is defined -%}
+    {{ form_row(edit_form.attendee) }}
+{% endif %}
+
+{# TODO .. status #}
+
+{% set person_id = null %}
+{% if entity.person %}
+    {% set person_id = entity.person.id %}
+{% endif %}
+
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
 
-    {{ form_widget(edit_form) }}
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-                <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': entity.person.id } ) }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         <li>
-                <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
         </li>
     </ul>
 {{ form_end(edit_form) }}
 
 {# {{ form(delete_form) }} #}
-{% endblock %}
-
-{% block js %}
-<script type="text/javascript">
-    chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-</script>
-{% endblock %}

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

@@ -0,0 +1,33 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title  'Update activity'|trans %}
+
+{% block content %}
+<div class="activity-edit">
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.activity = {{ activity_json|json_encode|raw }};
+    </script>
+    {{ encore_entry_script_tags('vue_activity') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('vue_activity') }}
+{% endblock %}

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

@@ -0,0 +1,47 @@
+{#
+ * 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 "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title  'Update activity'|trans %}
+
+{% block personcontent %}
+<div class="activity-edit">
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.activity = {{ activity_json|json_encode|raw }};
+    </script>
+    {{ encore_entry_script_tags('vue_activity') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('vue_activity') }}
+{% endblock %}

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

@@ -1,87 +1,66 @@
-{#
- * 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 "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
-
-{% block personcontent %}
-    <h2>{{ 'Activity list' |trans }}</h2>
+<div class="context-{{ context }}">
 
     {% if activities|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "There isn't any activities."|trans }}
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create button-small"></a>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
         </p>
+
     {% else %}
-    <table class="records_list">
-        <thead>
-            <tr>
-                <th class="chill-red">{{'Date' | trans }}</th>
-                <th class="chill-green">{{'Duration Time' | trans }}</th>
-                <th class="chill-orange">{{'Reasons' | trans}}</th>
-                <th>{{'Type' | trans}}</th>
-                <th>&nbsp;</th>
-            </tr>
-        </thead>
-        <tbody>
+        <div class="flex-table activity-list">
             {% for activity in activities %}
-            <tr>
-                <td>{% if activity.date %}{{ activity.date|format_date('long') }}{% endif %}</td>
-                <td>{{ activity.durationTime|date('H:i') }}</td>
-                <td>
+                {% set t = activity.type %}
+                <div class="item-bloc">
+                    <div class="item-row">
+                        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+                    </div>
+
+                    {%  if activity.comment.comment is not empty
+                        or activity.persons|length > 0
+                        or activity.thirdParties|length > 0
+                        or activity.users|length > 0
+                    %}
+                    <div class="main">
                         {% if activity.comment.comment is not empty %}
-                            {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                    {% endif %}
-                    {%- if activity.reasons is empty -%}
-                        {{ 'No reason associated'|trans }}
-                    {%- else -%}
-                        {% for r in activity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}
-                    {%- endif -%}
-                </td>
-                <td>{{ activity.type.name | localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-show "></a>
-                        </li>
-                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                        <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-update "></a>
-                        </li>
-                        {% endif %}
-                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                        <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete "></a>
-                        </li>
-                        {% endif %}
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+                            {{ activity.comment|chill_entity_render_box({
+                                'disable_markdown': false,
+                                'limit_lines': 3,
+                                'metadata': false,
+                            }) }}
                         {% endif %}
 
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                            'context': context,
+                            'with_display': 'row',
+                            'entity': activity,
+                            'badge_person': true
+                        } %}
+                    </div>
+                    {% endif %}
+
+                    <div class="item-row separator">
+                        <div class="updatedBy"></div>
                         <ul class="record_actions">
                             <li>
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-                {{ 'Add a new activity' | trans }}
-            </a>
+                                <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                                   class="btn btn-sm btn-show "></a>
                             </li>
+                            {% if no_action is not defined or no_action == false %}
+                                <li>
+                                    <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                                       class="btn btn-sm btn-update "></a>
+                                </li>
+                                <li>
+                                    <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
+                                       class="btn btn-sm btn-delete "></a>
+                                </li>
+                            {% endif %}
                         </ul>
-{% endblock %}
+                    </div>
+
+                </div>
+            {% endfor %}
+        </div>
+    {% endif %}
+
+</div>

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

@@ -0,0 +1,31 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
+
+{% block content %}
+
+    {% set person_id = null %}
+    {% if person %}
+        {% set person_id = person.id %}
+    {% endif %}
+
+    {% set accompanying_course_id = null %}
+    {% if accompanyingCourse %}
+        {% set accompanying_course_id = accompanyingCourse.id %}
+    {% endif %}
+
+    <h1>{{ 'Activity list' |trans }}</h1>
+
+    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
+
+    <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}) }}" class="btn btn-create">
+                {{ 'Add a new activity' | trans }}
+            </a>
+        </li>
+    </ul>
+
+{% endblock %}

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

@@ -0,0 +1,47 @@
+{#
+ * 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 "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
+
+{% block personcontent %}
+
+    {% set person_id = null %}
+    {% if person %}
+        {% set person_id = person.id %}
+    {% endif %}
+
+    {% set accompanying_course_id = null %}
+    {% if accompanyingCourse %}
+        {% set accompanying_course_id = accompanyingCourse.id %}
+    {% endif %}
+
+    <h1>{{ 'Activity list' |trans }}</h1>
+
+    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': '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}) }}"
+               class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }}
+            </a>
+        </li>
+    </ul>
+
+{% endblock %}

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

@@ -0,0 +1,10 @@
+<div class="activity-list">
+    {% for activity in activities | slice(0,5) %}
+        {% set t = activity.type %}
+
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
+
+        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+
+    {% endfor %}
+</div>

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

@@ -1,50 +1,105 @@
-{#
- * 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 "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_new' %}
-
-{% block title 'Activity creation' |trans %}
-
-{% block personcontent %}
-    <h2 class="chill-red">{{ "Activity creation"|trans }}</h1>
+<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
 
 {{ form_start(form) }}
+{{ form_errors(form) }}
 
+
+{%- if form.emergency is defined -%}
+    {{ form_row(form.emergency) }}
+{% endif %}
+
+{%- if form.sentReceived is defined -%}
+    {{ form_row(form.sentReceived) }}
+{% endif %}
+
+{%- if form.user is defined -%}
     {{ form_row(form.user) }}
+{% endif %}
+
+{%- if form.scope is defined -%}
     {{ form_row(form.scope) }}
+{% endif %}
+
+{%- if form.socialIssues is defined -%}
+    {{ form_row(form.socialIssues) }}
+{% endif %}
+
+{%- if form.socialActions is defined -%}
+    {{ form_row(form.socialActions) }}
+{% endif %}
+
+<div id="social-issues-acc"></div>
+
+{%- if form.reasons is defined -%}
+    {{ form_row(form.reasons) }}
+{% endif %}
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+
+{%- if form.persons is defined -%}
+    {{ form_widget(form.persons) }}
+{% endif %}
+{%- if form.thirdParties is defined -%}
+    {{ form_widget(form.thirdParties) }}
+{% endif %}
+{%- if form.users is defined -%}
+    {{ form_widget(form.users) }}
+{% endif %}
+
+<div id="add-persons"></div>
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 
+{%- if form.date is defined -%}
     {{ form_row(form.date) }}
+{% endif %}
+
+{%- if form.location is defined -%}
+    {{ form_row(form.location) }}
+    <div id="location"></div>
+{% endif %}
+
+{%- if form.durationTime is defined -%}
     {{ form_row(form.durationTime) }}
-    {{ form_row(form.type) }}
-    {{ form_row(form.attendee) }}
-    {{ form_row(form.reasons) }}
+{% endif %}
+
+{%- if form.travelTime is defined -%}
+    {{ form_row(form.travelTime) }}
+{% endif %}
+
+{%- if form.comment is defined -%}
+    {# TODO .. public and private #}
     {{ form_row(form.comment) }}
+{% endif %}
 
-        <div class="grid-12 centered sticky-form-buttons">
-            <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
-        </div>
+{%- if form.documents is defined -%}
+    {{ form_row(form.documents) }}
+{% endif %}
+
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
+{% endif %}
+
+{# TODO .. status #}
+
+<ul class="record_actions sticky-form-buttons">
+  <li class="cancel">
+    <a
+      class="btn btn-cancel"
+      {%- if context == 'person' -%}
+      href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
+      {%- else -%}
+      href="{{ chill_return_path_or('chill_activity_activity_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      {%- endif -%}
+      >
+      {{ 'Cancel'|trans|chill_return_path_label }}
+    </a>
+  </li>
+  <li>
+    <button class="btn btn-create" type="submit">
+      {{ 'Create'|trans }}
+    </button>
+  </li>
+</ul>
 {{ form_end(form) }}
-{% endblock %}
-
-{% block js %}
-<script type="text/javascript">
-    chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-</script>
-{% endblock %}

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

@@ -0,0 +1,33 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_new' %}
+
+{% block title 'Activity creation' |trans %}
+
+{% block content %}
+<div class="activity-new">
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.activity = {{ activity_json|json_encode|raw }};
+    </script>
+    {{ encore_entry_script_tags('vue_activity') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('vue_activity') }}
+{% endblock %}

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

@@ -0,0 +1,31 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_new' %}
+
+{% block title 'Activity creation' |trans %}
+
+{% block personcontent %}
+<div class="activity-new">
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.activity = {{ activity_json|json_encode|raw }};
+    </script>
+    {{ encore_entry_script_tags('vue_activity') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('vue_activity') }}
+{% endblock %}

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

@@ -0,0 +1,35 @@
+<div class="new-activity-select-type">
+    <h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
+
+    {# TODO: refaire l'html css des tuilles #}
+
+    {% for row in data %}
+        <h3>{{ row.activityTypeCategory.name|localize_translatable_string }}</h3>
+        <div class="activity-row">
+            {% for activityType in row.activityTypes %}
+
+                {% set person_id = null %}
+                {% if person %}
+                    {% set person_id = person.id %}
+                {% endif %}
+
+                {% set accompanying_course_id = null %}
+                {% if accompanyingCourse %}
+                    {% set accompanying_course_id = accompanyingCourse.id %}
+                {% endif %}
+
+                <a href="{{ path('chill_activity_activity_new', {
+                    'person_id': person_id,
+                    'activityType_id': activityType.id,
+                    'accompanying_period_id': accompanying_course_id,
+                    'activityData': activityData
+                }) }}">
+
+                    <div class="bloc btn btn-primary btn-lg btn-block">
+                        {{ activityType.name|localize_translatable_string }}
+                    </div>
+                </a>
+            {% endfor %}
+        </div>
+    {% endfor %}
+</div>

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

@@ -0,0 +1,9 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_new' %}
+
+{% block title 'Activity creation'|trans %}
+
+{% block content %}
+    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+{% endblock %}

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

@@ -0,0 +1,9 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_new' %}
+
+{% block title 'Activity creation'|trans %}
+
+{% block personcontent %}
+    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+{% endblock %}

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

@@ -1,68 +1,162 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{%- set t = entity.type -%}
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
 
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title 'Activity'|trans %}
-
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
-
-{% block personcontent -%}
-    <h1 >{{ "Activity"|trans }}</h1>
+<h1>
+  {{ "Activity"|trans }}
+  {%- if t.emergencyVisible and entity.emergency -%}
+  <span class="badge bg-secondary">
+    {{- 'Emergency'|trans -}}
+  </span>
+{%- endif -%}
+</h1>
 
 <dl class="chill_view_data">
-        <dt class="inline">{{ 'User'|trans }}</dt>
+
+    <dt class="inline">{{ 'by'|trans|capitalize }}</dt>
     <dd>{{ entity.user }}</dd>
-        <dt class="inline">{{ 'Scope'|trans }}</dt>
-        <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
 
-        <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-        <dt class="inline">{{ 'Person'|trans }}</dt>
-        <dd>{{ entity.person }}</dd>
-
-        <dt class="inline">{{ 'Date'|trans }}</dt>
-        <dd>{{ entity.date|format_date('long') }}</dd>
-        <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-        <dd>{{ entity.durationTime|date('H:i') }}</dd>
     <dt class="inline">{{ 'Type'|trans }}</dt>
     <dd>{{ entity.type.name | localize_translatable_string }}</dd>
 
-        <dt class="inline">{{ 'Attendee'|trans }}</dt>
-        <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
+    {%- if entity.scope -%}
+        <dt class="inline">{{ 'Scope'|trans }}</dt>
+        <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
+    {% endif %}
 
+    {% if t.socialIssuesVisible %}
+      <dt class="inline">{{ 'Social issues'|trans }}</dt>
+      <dd>
+        {% if entity.socialIssues|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
+        {% else %}
+          {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
+    {% endif %}
+
+    {% if t.socialActionsVisible %}
+      <dt class="inline">{{ 'Social actions'|trans }}</dt>
+      <dd>
+        {% if entity.socialActions|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
+        {% else %}
+          {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
+    {% endif %}
+
+    {% if t.reasonsVisible %}
     <dt class="inline">{{ 'Reasons'|trans }}</dt>
     {%- if entity.reasons is empty -%}
     <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
     {%- else -%}
     <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
     {%- endif -%}
+    {% endif %}
 
-        <dt class="inline">{{ 'Comment'|trans }}</dt>
-        {%- if entity.comment is empty -%}
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+    <dt class="inline">{{ 'Date'|trans }}</dt>
+    <dd>{{ entity.date|format_date('long') }}</dd>
+
+    {% if t.locationVisible %}
+        <dt class="inline">{{ 'Activity location'|trans }}</dt>
+        <dd>
+            {% if entity.location is not null %}
+                <p>
+                    <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
+                    {{ entity.location.name }}
+                </p>
+                {{ entity.location.address|chill_entity_render_box }}
+            {% else %}
+                <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+            {% endif %}
+        </dd>
+    {% endif %}
+
+    {% if t.durationTimeVisible %}
+    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
+    <dd>{% if entity.durationTime is not null %}
+            {{ entity.durationTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
+    {% endif %}
+
+    {% if t.travelTimeVisible %}
+    <dt class="inline">{{ 'Travel time'|trans }}</dt>
+    <dd>{% if entity.travelTime is not null %}
+            {{ entity.travelTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
+    {% endif %}
+
+    {% if t.commentVisible %}
+    <dt class="inline">{{ 'activity.comment'|trans }}</dt>
+      {%- if entity.comment.empty -%}
           <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
       {%- else -%}
           <dd>{{ entity.comment|chill_entity_render_box }}</dd>
       {%- endif -%}
+    {% endif %}
+
+    {% if t.documentsVisible and entity.documents|length > 0 %}
+      <dt>{{ 'Documents'|trans }}</dt>
+      <dd>
+        <ul>
+        {% for d in entity.documents %}
+          <li>{{ m.download_button(d) }}</li>
+        {% endfor %}
+        </ul>
+      </dd>
+    {% endif %}
+
+    {% if t.attendeeVisible %}
+    <dt class="inline">{{ 'Attendee'|trans }}</dt>
+    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
+    {% endif %}
 
 </dl>
 
-    <ul class="record_actions">
+{% set person_id = null %}
+{% if person %}
+    {% set person_id = person.id %}
+{% endif %}
+
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
+
+<ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-            <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person.id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
-            {{ 'Edit the activity'|trans }}
+        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
         </a>
     </li>
+
+    {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
+    #}
+
     <li>
-            <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete">
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-        {% endif %}
-    </ul>
 
-{% endblock personcontent %}
+    {#
+    {% endif %}
+    #}
+</ul>

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

@@ -0,0 +1,15 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title 'Show the activity'|trans %}
+
+{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+
+{% block content -%}
+<div class="activity-show">
+
+            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+
+</div>
+{% endblock content %}

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

@@ -0,0 +1,4 @@
+
+{{ dump(notification) }}
+
+<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>

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

@@ -0,0 +1,15 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+
+{% block title 'Show the activity'|trans %}
+
+{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+
+{% block personcontent -%}
+<div class="activity-show">
+
+            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
+
+</div>
+{% endblock personcontent %}

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

@@ -0,0 +1,12 @@
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+
+{% block title %}
+{% 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 %}
+{% endblock %}

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

@@ -0,0 +1,44 @@
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+
+{% block admin_content %}
+    <h1>{{ 'ActivityPresence list'|trans }}</h1>
+
+    <table class="records_list">
+        <thead>
+        <tr>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'Actions'|trans }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entity in entities %}
+            <tr>
+                <td>{{ entity.name|localize_translatable_string }}</td>
+                <td style="text-align:center;">
+                    {%- if entity.active -%}
+                        <i class="fa fa-check-square-o"></i>
+                    {%- else -%}
+                        <i class="fa fa-square-o"></i>
+                    {%- endif -%}
+                </td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
+                {{ 'Create a new activity presence'|trans }}
+            </a>
+        </li>
+    </ul>
+{% endblock %}

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

@@ -0,0 +1,11 @@
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+
+{% block title %}
+{% 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 %}
+{% endblock %}

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

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-orange' } } ) }}
         </li>
     </ul>
 

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

@@ -33,10 +33,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -47,7 +47,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
+            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
                 {{ 'Create a new activity reason'|trans }}
             </a>
         </li>

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

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
         </li>
     </ul>
 

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

@@ -40,12 +40,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>

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

@@ -25,12 +25,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
         </li>
     </ul>
 

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

@@ -34,10 +34,10 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -48,7 +48,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
+            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
                 {{ 'Create a new activity category reason'|trans }}
             </a>
         </li>

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

@@ -25,10 +25,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+            {{ form_widget(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
         </li>
     </ul>
     {{ form_end(form) }}

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

@@ -39,12 +39,12 @@
     </table>
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>