buttons reduced to one save button

Use centerResolverDispatcher to normalize a person's center


# Description of changes

There is a normalizer for a person, which include a property "center":

```json
{

    "type": "person",
    "id": 4362539,
    "text": "Diakite BAH",
    "firstName": "Diakite",
    "lastName": "BAH",
    "center": {
        "id": 475,
        "type": "center",
        "name": "Nord Vendée"
    },
    "phonenumber": "",
    "mobilenumber": "",
    "altNames": [ ],
    "gender": "woman",
    "gender_numeric": 1,
    // ...
}
```

Previously, the center was the center attached to the person in the database.

But since September, version 2.0 allow to resolve the center dynamically, for instance with the usage of address. This resolution is done through `CenterResolverDispatcher`.

This `CenterResolverDispatcher` is now used into person normalization.

As a consequence, the center may now be:

* null;
* a center;
* an array of center;

Thoses case are taken into account into `PersonRenderBox` in Vue.



# Issues related

Any issue related.

# Tests

Any new tests.

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

.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,146 @@
+# 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
+
+
+### 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" => ?
+

composer.json

@@ -1,9 +1,72 @@
 {
     "name": "chill-project/chill-bundles",
-    "license": "AGPL-3.0-only",
     "type": "library",
     "description": "Most used bundles for chill-project",
-    "keywords": ["chill", "social worker"],
+    "keywords": [
+        "chill",
+        "social worker"
+    ],
+    "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",
+        "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.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",
+        "symfony/css-selector": "^5.2",
+        "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",
+        "symfony/swiftmailer-bundle": "^3.5",
+        "symfony/templating": "4.*",
+        "symfony/translation": "4.*",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/validator": "4.*",
+        "symfony/webpack-encore-bundle": "^1.11",
+        "symfony/workflow": "4.*",
+        "symfony/yaml": "4.*",
+        "twig/extra-bundle": "^2.12 || ^3.0",
+        "twig/intl-extra": "^3.0",
+        "twig/markdown-extra": "^3.3",
+        "twig/twig": "^2.12 || ^3.0"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "fakerphp/faker": "^1.13",
+        "nelmio/alice": "^3.8",
+        "phpunit/phpunit": "^7.0",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/dotenv": "^5.1",
+        "symfony/maker-bundle": "^1.20",
+        "symfony/phpunit-bridge": "^5.2",
+        "symfony/stopwatch": "^5.1",
+        "symfony/var-dumper": "4.*",
+        "symfony/web-profiler-bundle": "^5.0"
+    },
+    "config": {
+        "bin-dir": "bin",
+        "vendor-dir": "tests/app/vendor"
+    },
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
@@ -16,75 +79,24 @@
             "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": {
         "psr-4": {
-          "App\\": "tests/app/src/"
+            "App\\": "tests/app/src/"
         }
     },
-    "require": {
-        "champs-libres/async-uploader-bundle": "dev-sf4",
-        "graylog2/gelf-php": "^1.5",
-        "symfony/form": "4.*",
-        "symfony/twig-bundle": "^4.4",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
-        "composer/package-versions-deprecated": "^1.10",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.7",
-        "symfony/asset": "4.*",
-        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "4.*",
-        "symfony/translation": "4.*",
-        "symfony/validator": "4.*",
-        "sensio/framework-extra-bundle": "^5.5",
-        "symfony/yaml": "4.*",
-        "symfony/webpack-encore-bundle": "^1.11",
-        "knplabs/knp-menu": "^3.1",
-        "knplabs/knp-menu-bundle": "^3.0",
-        "symfony/templating": "4.*",
-        "twig/intl-extra": "^3.0",
-        "symfony/workflow": "4.*",
-        "symfony/expression-language": "4.*",
-        "knplabs/knp-time-bundle": "^1.12",
-        "symfony/intl": "4.*",
-        "symfony/swiftmailer-bundle": "^3.5",
-        "league/csv": "^9.6",
-        "phpoffice/phpspreadsheet": "^1.16",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "twig/markdown-extra": "^3.3",
-        "erusev/parsedown": "^1.7",
-        "symfony/serializer": "^5.2",
-        "symfony/webpack-encore-bundle": "^1.11"
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "require-dev": {
-        "fakerphp/faker": "^1.13",
-        "phpunit/phpunit": "^7.0",
-        "symfony/dotenv": "^5.1",
-        "symfony/maker-bundle": "^1.20",
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "symfony/stopwatch": "^5.1",
-        "symfony/web-profiler-bundle": "^5.0",
-        "symfony/var-dumper": "4.*",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/phpunit-bridge": "^5.2",
-        "nelmio/alice": "^3.8"
-    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
-    },
-    "config": {
-      "vendor-dir": "tests/app/vendor",
-      "bin-dir": "bin"
     }
 }

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/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.

phpunit.xml.dist

@@ -10,7 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> 
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
 
@@ -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,6 +22,9 @@
 
 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;
@@ -36,6 +39,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Form\ActivityType;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -53,12 +57,16 @@ class ActivityController extends AbstractController
 
     protected SerializerInterface $serializer;
 
+    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
     public function __construct(
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
         SerializerInterface $serializer
     ) {
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
@@ -77,13 +85,9 @@ class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($person instanceof Person) {
-            $reachableScopes = $this->authorizationHelper
-                ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
-                    $person->getCenter());
-
-            $activities = $em->getRepository(Activity::class)
-                ->findByPersonImplied($person, $reachableScopes)
-                ;
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
+            $activities = $this->activityACLAwareRepository
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
@@ -93,10 +97,10 @@ class ActivityController extends AbstractController
 
             $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
-                ['date' => 'DESC'],
-            );
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
+
+            $activities = $this->activityACLAwareRepository
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -136,6 +140,12 @@ class ActivityController extends AbstractController
             ];
         }
 
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        } else {
+            $activityData = [];
+        }
+
         if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
@@ -144,6 +154,7 @@ class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
+            'activityData' => $activityData
         ]);
     }
 
@@ -163,10 +174,23 @@ class ActivityController extends AbstractController
         $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);
         }
 
@@ -184,6 +208,55 @@ class ActivityController extends AbstractController
         $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);
 
@@ -201,6 +274,7 @@ class ActivityController extends AbstractController
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
             $params['id'] = $entity->getId();
 
             return $this->redirectToRoute('chill_activity_activity_show', $params);
@@ -238,7 +312,7 @@ class ActivityController extends AbstractController
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
-        
+
         if (null !== $accompanyingPeriod) {
            $entity->personsAssociated = $entity->getPersonsAssociated();
            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();

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

@@ -141,7 +141,6 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
             $ref = 'activity_'.$person->getFullnameCanonical();
 
             for($i = 0; $i < $activityNbr; $i ++) {
-                print "Creating an activity type for  : ".$person." (ref: ".$ref.")  \n";
                 $activity = $this->newRandomActivity($person);
                 $manager->persist($activity);
             }

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

@@ -22,6 +22,7 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
             'entityRef' => 'activity_gerard depardieu',
             'sender' => 'center a_social',
             'addressees' => [
+                'center a_social',
                 'center a_administrative',
                 'center a_direction',
                 'multi_center'

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -55,6 +55,7 @@ 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)
@@ -86,7 +87,9 @@ 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],
            )
         ));
     }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -23,6 +23,8 @@ 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;
@@ -60,7 +62,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  *      path="scope")
  */
 
-class Activity implements HasCenterInterface, HasScopeInterface
+class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
 {
     const SENTRECEIVED_SENT = 'sent';
     const SENTRECEIVED_RECEIVED = 'received';
@@ -156,7 +158,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
     private ?Collection $thirdParties = null;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject")
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
      */
     private Collection $documents;
 
@@ -176,6 +178,13 @@ class Activity implements HasCenterInterface, HasScopeInterface
      */
     private string $sentReceived = '';
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @groups({"read"})
+     */
+    private ?Location $location = null;
+
+
     public function __construct()
     {
         $this->reasons = new ArrayCollection();
@@ -417,7 +426,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->persons;
     }
 
-    public function getPersonsAssociated(): array 
+    public function getPersonsAssociated(): array
     {
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
@@ -426,11 +435,11 @@ class Activity implements HasCenterInterface, HasScopeInterface
                     $personsAssociated[] = $participation->getPerson();
                 }
             }
-            return $personsAssociated; 
+            return $personsAssociated;
         }
         return [];
     }
-    
+
     public function getPersonsNotAssociated(): array
     {
         if (null !== $this->accompanyingPeriod) {
@@ -443,7 +452,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
             return $personsNotAssociated;
         }
         return [];
-    }    
+    }
 
     public function setPersons(?Collection $persons): self
     {
@@ -554,4 +563,22 @@ class Activity implements HasCenterInterface, HasScopeInterface
 
         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/ActivityReason.php

@@ -1,19 +1,19 @@
 <?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/>.
  */
@@ -44,7 +44,7 @@ class ActivityReason
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
@@ -108,7 +108,7 @@ class ActivityReason
             return $this->name;
         }
     }
-    
+
     /**
      * Set category of the reason. If you set to the reason an inactive
      * category, the reason will become inactive
@@ -121,7 +121,7 @@ class ActivityReason
         if($this->category !== $category && ! $category->getActive()) {
             $this->setActive(False);
         }
-        
+
         $this->category = $category;
 
         return $this;

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -2,17 +2,17 @@
 
 /*
  * 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/>.
  */
@@ -43,7 +43,7 @@ class ActivityReasonCategory
 
     /**
      * @var string
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
@@ -52,7 +52,7 @@ class ActivityReasonCategory
      * @ORM\Column(type="boolean")
      */
     private $active = true;
-    
+
     /**
      * Array of ActivityReason
      * @var ArrayCollection
@@ -61,7 +61,7 @@ class ActivityReasonCategory
      *     mappedBy="category")
      */
     private $reasons;
-    
+
     /**
      * ActivityReasonCategory constructor.
      */
@@ -69,7 +69,7 @@ class ActivityReasonCategory
     {
         $this->reasons = new ArrayCollection();
     }
-    
+
     /**
      * @return string
      */
@@ -139,9 +139,9 @@ class ActivityReasonCategory
                 $reason->setActive($active);
             }
         }
-        
+
         $this->active = $active;
-        
+
         return $this;
     }
 

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -44,7 +44,7 @@ class ActivityType
     private ?int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private array $name = [];
 
@@ -248,6 +248,16 @@ class ActivityType
      */
     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"})
      */
@@ -820,4 +830,29 @@ class ActivityType
 
         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

@@ -40,7 +40,7 @@ class ActivityTypeCategory
     private ?int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private array $name = [];
 

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -6,6 +6,7 @@ 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;
@@ -93,15 +94,13 @@ class ActivityType extends AbstractType
         /** @var \Chill\ActivityBundle\Entity\ActivityType $activityType */
         $activityType = $options['activityType'];
 
-        if (!$activityType->isActive()) {
-            throw new \InvalidArgumentException('Activity type must be active');
-        }
-
         // 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']
+                'role' => $options['role'],
+                // TODO make required again once scope and rights are fixed
+                'required' => false
             ]);
         }
 
@@ -224,7 +223,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('comment')) {
             $builder->add('comment', CommentType::class, [
-                'label' => empty($activityType->getLabel('comment')) 
+                'label' => empty($activityType->getLabel('comment'))
                     ? 'activity.comment' : $activityType->getLabel('comment'),
                 'required' => $activityType->isRequired('comment'),
             ]);
@@ -304,6 +303,23 @@ class ActivityType extends AbstractType
            ;
         }
 
+        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'),

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

@@ -2,29 +2,27 @@
 
 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 TokenStorageInterface $tokenStorage;
-
-    protected AuthorizationHelper $authorizationHelper;
-
     protected TranslatorInterface $translator;
 
+    protected Security $security;
+
     public function __construct(
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
+        Security $security,
         TranslatorInterface $translator
     ) {
+        $this->security = $security;
         $this->translator = $translator;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->tokenStorage = $tokenStorage;
     }
     public static function getMenuIds(): array
     {
@@ -35,8 +33,9 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     {
         $period = $parameters['accompanyingCourse'];
 
-        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
-            $menu->addChild($this->translator->trans('Activity list'), [
+        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(),

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/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
@@ -81,7 +131,7 @@ final class ActivityACLAwareRepository
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
-        
+
         return $metadataActivity->getTableName().' JOIN '
             .$metadataPerson->getTableName().' ON '
             .$metadataPerson->getTableName().'.'.
@@ -95,7 +145,7 @@ final class ActivityACLAwareRepository
     {
         $where = '';
         $parameters = [];
-        
+
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
@@ -105,20 +155,20 @@ final class ActivityACLAwareRepository
 
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
                 $role);
-        
+
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ($context === 'person') { 
-            // we start with activities having the person_id linked to person 
+        if ($context === 'person') {
+            // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
         }
-        
+
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
@@ -131,7 +181,7 @@ final class ActivityACLAwareRepository
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); }, 
+                function(Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 
@@ -162,7 +212,7 @@ final class ActivityACLAwareRepository
         }
         // close loop for centers
         $where .= ')';
-        
+
         return [$where, $parameters];
     }
 

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,15 +41,22 @@ class ActivityRepository extends ServiceEntityRepository
         parent::__construct($registry, Activity::class);
     }
 
-    public function findByPersonImplied($person, array $scopes, $orderBy = [ 'date' => 'DESC'], $limit = 100, $offset = 0)
+    /**
+     * @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
-            // TODO add acl
-            //->where($qb->expr()->in('a.scope', ':scopes'))
-            //->setParameter('scopes', $scopes)
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->eq('a.person', ':person'),
@@ -61,7 +70,56 @@ class ActivityRepository extends ServiceEntityRepository
             $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/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('./scss/chillactivity.scss');

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

@@ -1,130 +0,0 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
-//@import '~ChillMainSass/custom/mixins/entity';
-
-//.chill-entity.chill-entity__activity-reason {
-//    @include entity($chill-pink, white);
-//}
-
-.activity {
-    color: $chill-green;
-}
-
-// 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
-   }
-}
-
-// exceptions for flex-table in list-records
-div.flex-table.list-records {
-   div.item-bloc {
-      div.item-row.main {
-         div.item-col {
-            &:first-child {
-               flex-basis: 27%;
-            }
-            ul.list-content {
-               li.social-issues, li.social-actions {
-                  .badge-primary {
-                     font-variant: small-caps;
-                     font-weight: bold;
-                     font-size: 88%;
-                     margin-bottom: 0.2em;
-                  }
-               }
-               li.social-issues .badge-primary {
-                  background-color: var(--chill-orange);
-               }
-               li.social-actions .badge-primary {
-                  background-color: var(--chill-green);
-               }
-            }
-         }
-      }
-      div.item-row.details {
-         flex-direction: row;
-         & > div.item-col {
-            justify-content: flex-start;
-            align-self: center;
-            &:nth-child(1) {
-               flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-            }
-            &:nth-child(2) {
-               flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
-            }
-            
-            &:only-child {
-               flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
-               & > div.concerned-groups {
-                  flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
-                  display: flex;
-                  flex-direction: column; // TODO pas fini
-                  div.group {
-                     flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-                     h4 {} 
-                     ul.list-content {
-                        li { 
-                           display: inline;
-                        } 
-                     }
-                  }
-               }
-            }
-         }
-         div.concerned-groups {
-            font-size: 85%;
-            h4 {
-               text-transform: uppercase;
-            }
-         }
-      }
-      ul.list-content {
-         list-style-type: none;
-         padding-left: 1em;
-         margin: 0 0;
-         li {
-            margin-bottom: 0.2em;
-         }
-      }
-   }
-   div.duration {
-      font-size: smaller;
-      padding-left: 1em;
-      margin-top: 1em;
-   }
-}
-
-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;
-   }
-}

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

@@ -1,17 +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
+      SocialIssuesAcc,
+      Location
    }
 }
 </script>

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

@@ -3,16 +3,61 @@ import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.
 /*
 *  Load socialActions by socialIssue (id)
 */
-const getSocialActionByIssue = (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'); 
+         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
+   getSocialActionByIssue,
+   getLocations,
+   getLocationTypes,
+   postLocation
 };

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

@@ -2,7 +2,7 @@
    <teleport to="#add-persons">
 
       <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc 
+         <persons-bloc
             v-for="bloc in contextPersonsBlocs"
             v-bind:key="bloc.key"
             v-bind:bloc="bloc"
@@ -10,7 +10,15 @@
          </persons-bloc>
       </div>
 
-      <add-persons 
+     <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"
@@ -18,12 +26,12 @@
          @addNewPersons="addNewPersons"
          ref="addPersons">
       </add-persons>
- 
-  </teleport>  
+
+  </teleport>
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
 
@@ -36,38 +44,41 @@ export default {
    data() {
       return {
          personsBlocs: [
-            {  key: 'persons', 
-               title: 'activity.bloc_persons', 
-               persons: [], 
-               included: false 
+            {  key: 'persons',
+               title: 'activity.bloc_persons',
+               persons: [],
+               included: false
             },
-            {  key: 'personsAssociated', 
-               title: 'activity.bloc_persons_associated', 
-               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: 'personsNotAssociated',
+               title: 'activity.bloc_persons_not_associated',
+               persons: [],
+               included: false
             },
-            {  key: 'thirdparty', 
-               title: 'activity.bloc_thirdparty', 
-               persons: [], 
+            {  key: 'thirdparty',
+               title: 'activity.bloc_thirdparty',
+               persons: [],
                included: true
             },
-            {  key: 'users', 
-               title: 'activity.bloc_users', 
-               persons: [], 
+            {  key: 'users',
+               title: 'activity.bloc_users',
+               persons: [],
                included: true
             },
          ],
          addPersons: {
             key: 'activity',
             options: {
-               type: ['person', 'thirdparty', 'user'], // TODO add 'user'
+               type: ['person', 'thirdparty', 'user'],
                priority: null,
                uniq: false,
+               button: {
+                   size: 'btn-sm'
+               }
             }
          }
       }
@@ -79,6 +90,9 @@ export default {
          users: state => state.activity.users,
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
+      ...mapGetters([
+          'filterSuggestedPersons'
+      ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
@@ -91,10 +105,10 @@ export default {
    },
    methods: {
       setPersonsInBloc() {
-         let groups; 
+         let groups;
          if (this.accompanyingCourse) {
             groups = this.splitPersonsInGroups();
-         }     
+         }
          this.personsBlocs.forEach(bloc => {
             if (this.accompanyingCourse) {
                switch (bloc.key) {
@@ -109,7 +123,7 @@ export default {
                }
             } else {
                switch (bloc.key) {
-                  case 'persons': 
+                  case 'persons':
                      bloc.persons = this.persons;
                      bloc.included = true;
                      break;
@@ -128,7 +142,7 @@ export default {
       splitPersonsInGroups() {
          let personsAssociated = [];
          let personsNotAssociated = this.persons;
-         let participations = this.getCourseParticipations();         
+         let participations = this.getCourseParticipations();
          this.persons.forEach(person => {
             participations.forEach(participation => {
                if (person.id === participation.id) {
@@ -138,9 +152,9 @@ export default {
                }
             });
          });
-         return { 
-            'personsAssociated': personsAssociated, 
-            'personsNotAssociated': personsNotAssociated 
+         return {
+            'personsAssociated': personsAssociated,
+            'personsNotAssociated': personsNotAssociated
          };
       },
       getCourseParticipations() {
@@ -161,7 +175,11 @@ export default {
          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>

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

@@ -1,12 +1,12 @@
 <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"
@@ -14,7 +14,7 @@
                v-bind:selection="socialIssuesSelected"
                @updateSelected="updateIssuesSelected">
             </check-social-issue>
-            
+
             <div class="my-3">
             <VueMultiselect
                name="otherIssues"
@@ -28,16 +28,15 @@
                v-bind:taggable="false"
                v-bind:multiple="false"
                v-bind:searchable="true"
-               v-bind:allow-empty="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"
-               v-model="value"
                @select="addIssueInList">
             </VueMultiselect>
             </div>
-            
+
          </div>
       </div>
 
@@ -46,11 +45,11 @@
             <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"
@@ -59,19 +58,18 @@
                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 { readonly } from 'vue';
 import VueMultiselect from 'vue-multiselect';
 import CheckSocialIssue from './SocialIssuesAcc/CheckSocialIssue.vue';
 import CheckSocialAction from './SocialIssuesAcc/CheckSocialAction.vue';
@@ -113,7 +111,7 @@ export default {
       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 => {
@@ -121,34 +119,34 @@ export default {
                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), 
+
+      /* When choosing an issue in multiselect, add it in checkboxes (as selected),
          remove it from multiselect, and add socialActions concerned
       */
       addIssueInList(value) {
@@ -171,30 +169,30 @@ export default {
          //console.log('updateActionsSelected', actions);
          this.$store.dispatch('updateActionsSelected', actions);
       },
-      /* Add socialActions concerned: after reset, loop on each issue selected 
+      /* 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 
+      /* Reset socialActions List: flush list and restore selected actions
       */
       resetActionsList() {
          this.$store.commit('resetActionsList');
@@ -207,7 +205,7 @@ export default {
 </script>
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
-<style lang="scss">
+<style lang="scss" scoped>
    span.multiselect__single {
       display: none !important;
    }

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

@@ -1,14 +1,15 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
 
-const appMessages = {
+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",
@@ -16,12 +17,28 @@ const appMessages = {
          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(appMessages.fr, personMessages.fr);
+Object.assign(activityMessages.fr, personMessages.fr);
 
 export {
-   appMessages
+   activityMessages
 };

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

@@ -1,11 +1,11 @@
 import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './i18n'
+import { activityMessages } from './i18n'
 import store from './store'
 
 import App from './App.vue';
 
-const i18n = _createI18n(appMessages);
+const i18n = _createI18n(activityMessages);
 
 const app = createApp({
    template: `<app></app>`,

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

@@ -5,165 +5,185 @@ 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;
+  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;
+  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: [],
-   },
-   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;
-         };
+  strict: debug,
+  state: {
+    activity: window.activity,
+    socialIssuesOther: [],
+    socialActionsList: [],
+  },
+  getters: {
+    filterSuggestedPersons(state) {
+      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+        return [];
       }
-   },
-   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);
+      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);
+    }
   }
 });
 

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

@@ -5,17 +5,17 @@
 
 {% if context == 'person' %}
     {% set blocs = [
-        {   'title': 'Others persons'|trans, 
+        {   'title': 'Others persons'|trans,
             'items': entity.persons,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
         },
-        {   'title': 'Third parties'|trans, 
+        {   'title': 'Third parties'|trans,
             'items': entity.thirdParties,
             'path' : 'chill_3party_3party_show',
             'key'  : 'thirdparty_id'
         },
-        {   'title': 'Users concerned'|trans, 
+        {   'title': 'Users concerned'|trans,
             'items': entity.users,
             'path' : 'admin_user_show',
             'key'  : 'id'
@@ -23,22 +23,22 @@
     ] %}
 {% else %}
     {% set blocs = [
-        {   'title': 'Persons in accompanying course'|trans, 
+        {   'title': 'Persons in accompanying course'|trans,
             'items': entity.personsAssociated,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
         },
-        {   'title': 'Third persons'|trans, 
+        {   'title': 'Third persons'|trans,
             'items': entity.personsNotAssociated,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
         },
-        {   'title': 'Third parties'|trans, 
+        {   'title': 'Third parties'|trans,
             'items': entity.thirdParties,
             'path' : 'chill_3party_3party_show',
             'key'  : 'thirdparty_id'
         },
-        {   'title': 'Users concerned'|trans, 
+        {   'title': 'Users concerned'|trans,
             'items': entity.users,
             'path' : 'admin_user_show',
             'key'  : 'id'
@@ -59,8 +59,11 @@
                     {% for item in bloc.items %}
                     <li>
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="badge bg-primary">
-                                {{ item|chill_entity_render_box({'only_denomination': true}) }}
+                            <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>
@@ -72,7 +75,7 @@
     {% endfor %}
 </div>
 {% endif %}
-    
+
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
     {% for bloc in blocs %}
@@ -83,8 +86,11 @@
                 {% for item in bloc.items %}
                 <li>
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="badge bg-primary">
-                            {{ item|chill_entity_render_box({'only_denomination': true}) }}
+                        <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>
@@ -95,3 +101,31 @@
     {% 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/edit.html.twig

@@ -54,7 +54,10 @@
     {{ form_row(edit_form.date) }}
 {% endif %}
 
-.. location
+{%- 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) }}
@@ -65,7 +68,7 @@
 {% endif %}
 
 {%- if edit_form.comment is defined -%}
-    .. public and private
+    {# TODO .. public and private #}
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
@@ -77,7 +80,7 @@
     {{ form_row(edit_form.attendee) }}
 {% endif %}
 
-.. status
+{# TODO .. status #}
 
 {% set person_id = null %}
 {% if entity.person %}

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

@@ -6,32 +6,28 @@
 
 {% block content %}
 <div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-        </div>
-    </div>
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+
 </div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ 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 }}"]', 
+            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 }}; 
+        window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -22,22 +22,18 @@
 
 {% block personcontent %}
 <div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-        </div>
-    </div>
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ 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 }}"]', 
+            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 }};
@@ -46,6 +42,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -1,197 +1,66 @@
-{% set person_id = null %}
-{% if person %}
-    {% set person_id = person.id %}
-{% endif %}
+<div class="context-{{ context }}">
 
-{% set accompanying_course_id = null %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
+    {% 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, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
+        </p>
 
-<h2>{{ 'Activity list' |trans }}</h2>
-
-{% 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, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
-    </p>
-{% else %}
-
-<div class="flex-table list-records context-{{ context }}">
-    <!--
-    <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>
--->
-    {% for activity in activities %}
-        {% set t = activity.type %}
-        <div class="item-bloc">
-            <div class="item-row main">
-                <div class="item-col">
-                                        
-                    {% if activity.date %}
-                        <h3>{{ activity.date|format_date('long') }}</h3>
-                    {% endif %}
-                   
-                    <div class="duration">
-                      {% if t.durationTimeVisible > 0 %}
-                        <p>
-                            <i class="fa fa-fw fa-hourglass-end"></i>
-                            {{ activity.durationTime|date('H:i') }}
-                        </p>
-                      {% endif %}
-                        
-                        {% if activity.travelTime and t.travelTimeVisible %}
-                        <p>
-                            <i class="fa fa-fw fa-car"></i>
-                            {{ activity.travelTime|date('H:i') }}
-                        </p>
-                        {% endif %}
+    {% else %}
+        <div class="flex-table activity-list">
+            {% for activity in activities %}
+                {% set t = activity.type %}
+                <div class="item-bloc">
+                    <div class="item-row">
+                        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
                     </div>
 
-                    {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
-                        <a 
-                           href="{{ chill_path_add_return_path(
-                            "chill_person_accompanying_course_index",
-                            { 'accompanying_period_id': activity.accompanyingPeriod.id }
-                            ) }}"
-                           >
-                          <i class="fa fa-random"></i>
-                          {{ activity.accompanyingPeriod.id }}
-                        </a>
-                      </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({
+                                '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>
-                <div class="item-col">
-                    <ul class="list-content">
-                        {% if activity.user and t.userVisible %}
-                        <li>
-                            <b>{{ 'by'|trans }}{{ activity.user.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-                        
-                        <li>
-                            <b>{{ activity.type.name | localize_translatable_string }}</b>
-                            
-                            {% if activity.attendee is not null and t.attendeeVisible %}
-                                {% if activity.attendee %}
-                                    {{ '→ ' ~ 'present'|trans|capitalize }} 
-                                {% else %} 
-                                    {{ '→ ' ~ 'not present'|trans|capitalize }}
-                                {% endif %}
+
+                    <div class="item-row separator">
+                        <div class="updatedBy"></div>
+                        <ul class="record_actions">
+                            <li>
+                                <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 %}
-                        </li>
-                        
-                        <li>
-                            <b>{{ 'location'|trans ~ ': ' }}</b>
-                            Domicile de l'usager
-                            {#
-                                {% if activity.location %}{{ activity.location }}{% endif %}
-                            #}
-                        </li>
-                        
-                        {%- if t.reasonsVisible -%}
-                        <li>
-                            {%- if activity.reasons is empty -%}
-                                <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
-                            {%- else -%}
-                                {% for r in activity.reasons %}
-                                    {{ r|chill_entity_render_box }}
-                                {% endfor %}
-                            {%- endif -%}
-                        </li>
-                        {% endif %}
+                        </ul>
+                    </div>
 
-                        {%- if t.socialIssuesVisible %}
-                            <li class="social-issues">
-                                {%- if activity.socialIssues is empty -%}
-                                    <span class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</span>
-                                {%- else -%}
-                                    {% for r in activity.socialIssues %}
-                                      {{ r|chill_entity_render_box }}
-                                    {% endfor %}
-                                {%- endif -%}
-                            </li>
-                        {% endif %}
-                        
-                        {%- if t.socialActionsVisible -%}
-                            <li class="social-actions">
-                                {%- if activity.socialActions is empty -%}
-                                    <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
-                                {%- else -%}
-                                    {% for r in activity.socialActions %}
-                                        <span class="badge bg-primary">{{ r.title|localize_translatable_string }}</span>
-                                    {% endfor %}
-                                {%- endif -%}
-                            </li>
-                        {% endif %}
-
-                        
-                    </ul>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                        </li>
-                        {# TOOD
-                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                        </li>
-                        {# TOOD
-                        {% endif %}
-                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                        </li>
-                        {#
-                        {% endif %}
-                        #}
-                    </ul>
                 </div>
-            </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="item-row details">
-                <div class="item-col">
-
-                    {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
-                </div>
-                
-                {% if activity.comment.comment is not empty %}
-                <div class="item-col comment">
-                    {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                </div>
-                {% endif %}
-            </div>
-            {% endif %}
-            
+            {% endfor %}
         </div>
-    {% endfor %}
-</div>
-{% endif %}
+    {% endif %}
 
-{% if context != 'person' %}
-{# TODO set this condition in configuration #}
-  <ul class="record_actions">
-      <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>
-{% endif %}
+</div>

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

@@ -5,5 +5,27 @@
 {% 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

@@ -21,5 +21,27 @@
 {% 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

@@ -55,7 +55,10 @@
     {{ form_row(form.date) }}
 {% endif %}
 
-.. location
+{%- if form.location is defined -%}
+    {{ form_row(form.location) }}
+    <div id="location"></div>
+{% endif %}
 
 {%- if form.durationTime is defined -%}
     {{ form_row(form.durationTime) }}
@@ -66,7 +69,7 @@
 {% endif %}
 
 {%- if form.comment is defined -%}
-    .. public and private
+    {# TODO .. public and private #}
     {{ form_row(form.comment) }}
 {% endif %}
 
@@ -78,13 +81,13 @@
     {{ form_row(form.attendee) }}
 {% endif %}
 
-.. status
+{# TODO .. status #}
 
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
-    <a 
+    <a
       class="btn btn-cancel"
-      {%- if context == 'person' -%} 
+      {%- 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 } )}}"

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

@@ -6,32 +6,28 @@
 
 {% block content %}
 <div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div>            
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+
+</div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_script_tags('async_upload') }}
+    {{ 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 }}"]', 
+            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 }}; 
+        window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -6,22 +6,18 @@
 
 {% block personcontent %}
 <div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
-            
-        </div>
-    </div>
+
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ 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 }}"]', 
+            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 }};
@@ -30,6 +26,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -1,28 +1,35 @@
-<h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
+<div class="new-activity-select-type">
+    <h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
 
-{# TODO: refaire l'html css des tuilles #}
+    {# 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 %}
+    {% 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 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 %}
+                {% 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 }) }}">
+                <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 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/show.html.twig

@@ -62,18 +62,43 @@
     <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>{{ entity.durationTime|date('H:i') }}</dd>
+    <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>{{ entity.travelTime|date('H:i') }}</dd>
+    <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">{{ 'Comment'|trans }}</dt>
+    <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 -%}
@@ -120,17 +145,17 @@
             {{ '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, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-    
+
     {#
     {% endif %}
     #}

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

@@ -2,18 +2,14 @@
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Activity'|trans %}
+{% block title 'Show the activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
+
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div> 
+
+</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

@@ -2,18 +2,14 @@
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Activity'|trans %}
+{% block title 'Show the activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
 <div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
+
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-            
-        </div>
-    </div>
-</div>                
+
+</div>
 {% endblock personcontent %}

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

@@ -19,6 +19,11 @@
 
 namespace Chill\ActivityBundle\Security\Authorization;
 
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
@@ -28,11 +33,10 @@ use Chill\MainBundle\Entity\User;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Voter for Activity class
  */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -41,30 +45,37 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
     const UPDATE = 'CHILL_ACTIVITY_UPDATE';
     const DELETE = 'CHILL_ACTIVITY_DELETE';
+    const FULL = 'CHILL_ACTIVITY_FULL';
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
+    private const ALL = [
+        self::CREATE,
+        self::SEE,
+        self::UPDATE,
+        self::DELETE,
+        self::SEE_DETAILS,
+        self::FULL
+    ];
 
-    public function __construct(AuthorizationHelper $helper)
-    {
-        $this->helper = $helper;
+    protected VoterHelperInterface $voterHelper;
+
+    protected Security $security;
+
+    public function __construct(
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory->generate(self::class)
+            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+            ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
+            ->addCheckFor(Activity::class, self::ALL)
+            ->build();
     }
 
 
     protected function supports($attribute, $subject)
     {
-        if ($subject instanceof Activity) {
-            return \in_array($attribute, $this->getAttributes());
-        } elseif ($subject instanceof Person) {
-            return $attribute === self::SEE 
-                ||
-                $attribute === self::CREATE;
-        } else {
-            return false;
-        }
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
@@ -72,32 +83,34 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
-        if ($subject instanceof Person) {
-            $centers = $this->helper->getReachableCenters($token->getUser(), new Role($attribute));
-            
-            return \in_array($subject->getCenter(), $centers);
+
+        if ($subject instanceof Activity) {
+            if ($subject->getPerson() instanceof Person) {
+                // the context is person: we must have the right to see the person
+                if (!$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
+                    return false;
+                }
+            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
+                    return false;
+                }
+            } else {
+                throw new \RuntimeException("could not determine context of activity");
+            }
         }
-        
-        /* @var $subject Activity */
-        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
-    }
-    
-    private function getAttributes()
-    {
-        return [ self::CREATE, self::SEE, self::UPDATE, self::DELETE,
-                  self::SEE_DETAILS ];
+
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 
 
     public function getRoles()
     {
-        return $this->getAttributes();
+        return self::ALL;
     }
 
     public function getRolesWithoutScope()
     {
-        return array();
+        return [];
     }
 
 

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -35,35 +35,37 @@ class ActivityReasonRender extends AbstractChillEntityRender
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
+
     public function renderBox($entity, array $options): string
     {
         return
             $this->getDefaultOpeningBox('activity-reason').
+            '<span class="badge bg-chill-pink">'.
             '<i class="fa fa-question-circle"></i>&nbsp;'.
-            '<span class="activity-reason__category">'.
+            '<span class="category">'.
             $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
             ).
             '</span>'.
-            '<span class="activity-reason__separator">&nbsp;>&nbsp;</span>'.
-            '<span class="activity-reason__reason">'.
+            '<span class="separator">&nbsp;>&nbsp;</span>'.
+            '<span class="reason">'.
             $this->translatableStringHelper->localize(
                 $entity->getName()
             ).
             '</span>'.
+            '</span>'.
             $this->getDefaultClosingBox()
             ;
     }
 
     /**
-     * 
+     *
      * @param ActivityReason $entity
      * @param array $options
      * @return string
@@ -71,12 +73,12 @@ class ActivityReasonRender extends AbstractChillEntityRender
     public function renderString($entity, array $options): string
     {
         $category = '';
-        
+
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()). ' > ';
         }
-        
+
         return $category .
             $this->translatableStringHelper->localize(
                 $entity->getName()

src/Bundle/ChillActivityBundle/chill.webpack.config.js

@@ -1,10 +1,11 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-    
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'
     });
-    
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -1,21 +1,5 @@
-services:     
-    chill.activity.security.authorization.activity_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-            
-    chill.activity.security.authorization.activity_stats_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-            
-            
+services:
+
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
         arguments:
@@ -33,3 +17,13 @@ services:
         autoconfigure: true
         resource: '../Menu/'
         tags: ['chill.menu_builder']
+
+    Chill\ActivityBundle\Notification\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Notification'
+
+    Chill\ActivityBundle\Security\Authorization\:
+        resource: '../Security/Authorization/'
+        autowire: true
+        autoconfigure: true

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

@@ -0,0 +1,14 @@
+services:
+    accompanying_period_social_issue_consistency_for_activity:
+        class: 'Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener'
+        tags:
+            -
+                name: 'doctrine.orm.entity_listener'
+                event: 'prePersist'
+                entity: 'Chill\ActivityBundle\Entity\Activity'
+                lazy: true
+            -
+                name: 'doctrine.orm.entity_listener'
+                event: 'preUpdate'
+                entity: 'Chill\ActivityBundle\Entity\Activity'
+                lazy: true

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

@@ -1,8 +1,4 @@
 services:
     Chill\ActivityBundle\Controller\ActivityController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $logger: '@chill.main.logger'
-            $serializer: '@Symfony\Component\Serializer\SerializerInterface'
+        autowire: true
         tags: ['controller.service_arguments']

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

@@ -24,9 +24,7 @@ services:
             - '@Doctrine\Persistence\ManagerRegistry'
 
     Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+        autowire: true
+        autoconfigure: true
+    Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface: '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
 

src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php

@@ -4,7 +4,7 @@ namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Add an "active" column on activitytype table

src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php

@@ -22,7 +22,6 @@ final class Version20210401090853 extends AbstractMigration
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SEQUENCE activitytypecategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
         $this->addSql('CREATE TABLE activitytypecategory (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN activitytypecategory.name IS \'(DC2Type:json_array)\'');
         $this->addSql('INSERT INTO activitytypecategory VALUES(1, \'{"fr": "Défaut", "en": "Default"}\', true)');
 
     }

src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php

@@ -51,7 +51,6 @@ final class Version20210408122329 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD socialDataLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ALTER name SET NOT NULL');
         $this->addSql('ALTER TABLE activitytype ALTER active DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN activitytype.name IS \'(DC2Type:json_array)\'');
     }
 
     public function down(Schema $schema) : void

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

@@ -6,7 +6,6 @@ Duration time: Durée
 Duration Time: Durée
 durationTime:  durée
 Travel time: Durée de déplacement
-Reasons: Sujets
 Attendee: Présence de la personne
 attendee: présence de la personne
 list_reasons: liste des sujets
@@ -23,6 +22,7 @@ Update: Mettre à jour
 Update activity: Modifier l'activité
 Scope: Cercle
 Activity data: Données de l'activité
+Activity location: Localisation de l'activité
 No reason associated: Aucun sujet
 No social issues associated: Aucune problématique sociale
 No social actions associated: Aucune action d'accompagnement
@@ -81,9 +81,9 @@ activity:
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
 
 #controller
-'Success : activity created!': Bravo ! L'activité a été créée.
+'Success : activity created!': L'activité a été créée.
 'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
-'Success : activity updated!': Bravo ! L'activité a été mise à jour.
+'Success : activity updated!': L'activité a été mise à jour.
 'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.
 
 # ROLES
@@ -99,10 +99,13 @@ CHILL_ACTIVITY_LIST: Liste des activités
 Activities: Activités
 Activity configuration: Configuration des activités
 Activity configuration menu: Configuration des activités
-Activity Types: Types d'activité
+Activity types: Types d'activité
+Activity type configuration: Configuration des categories d'activités
 Activity Reasons: Sujets d'une activité
 Activity Reasons Category: Catégories de sujet d'activités
 Activity Types Categories: Catégories des types d'activité
+Activity Presences: Presences des activités
+
 
 # Crud
 crud:
@@ -210,3 +213,5 @@ Group by reasons: Sujet d'activité
 Aggregate by activity user: Aggréger par utilisateur lié à l'activité
 Aggregate by activity type: Aggréger par type d'activité
 Aggregate by activity reason: Aggréger par sujet de l'activité
+
+Last activities: Les dernières activités

src/Bundle/ChillAsideActivityBundle/LICENSE

@@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+   Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+        Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+
+b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under section
+7.  This requirement modifies the requirement in section 4 to
+"keep intact all notices".
+
+c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+
+e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+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>
+
+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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

src/Bundle/ChillAsideActivityBundle/README.md

@@ -0,0 +1,3 @@
+# Aside activities module
+
+This module offers the possibility to add extra curricular activities per user (eg. administrative tasks, formation, meetings) not immediately related to client support.

src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillAsideActivityBundle extends Bundle
+{
+}

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php

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

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Controller;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\Common\Collections\Criteria;
+
+final class AsideActivityController extends CRUDController
+{
+
+    private $categoryRepository;
+
+    public function __construct(AsideActivityCategoryRepository $categoryRepository)
+    {
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
+    {
+        $qb = parent::buildQueryEntities($action, $request, $filterOrder);
+
+        if ('index' === $action) {
+            $qb->where($qb->expr()->eq('e.agent', ':user'));
+            $qb->orWhere($qb->expr()->eq('e.createdBy', ':user'));
+            $qb->setParameter('user', $this->getUser());
+        }
+
+        return $qb;
+    }
+
+    protected function orderQuery(
+        string $action,
+        $query,
+        Request $request,
+        PaginatorInterface $paginator
+    ) {
+        if ('index' === $action) {
+           return $query->orderBy('e.date', 'DESC');
+        }
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+    public function createEntity(string $action, Request $request): object
+    {
+       $asideActivity = new AsideActivity();
+
+       $duration = $request->query->get('duration', '300');
+       $duration = \DateTime::createFromFormat('U', $duration);
+       $asideActivity->setDuration($duration);
+
+       $categoryId = $request->query->get('type', 7);
+       if($categoryId === null){
+           return $this->createNotFoundException('You must give a valid category id');
+       }
+       $category = $this->categoryRepository->find($categoryId);
+       $asideActivity->setType($category);
+
+       $note = $request->query->get('note', null);
+       $asideActivity->setNote($note);
+
+       return $asideActivity;
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Chill\AsideActivityBundle\DataFixtures\ORM;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Repository\UserRepository;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadAsideActivity extends Fixture implements DependentFixtureInterface
+{
+    private UserRepository $userRepository;
+
+    public function __construct(UserRepository $userRepository)
+    {
+        $this->userRepository = $userRepository;
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+            LoadUsers::class,
+            LoadAsideActivityCategory::class
+        ];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $user = $this->userRepository->findOneBy(['username' => 'center a_social']);
+
+        for ($i = 0; $i < 50; $i++) {
+            $activity = new AsideActivity();
+            $activity
+                ->setAgent($user)
+                ->setCreatedAt(new \DateTimeImmutable('now'))
+                ->setCreatedBy($user)
+                ->setUpdatedAt(new \DateTimeImmutable('now'))
+                ->setUpdatedBy($user)
+                ->setType(
+                    $this->getReference('aside_activity_category_0')
+                )
+                ->setDate((new \DateTimeImmutable('today'))
+                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')))
+            ;
+
+            $manager->persist($activity);
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Chill\AsideActivityBundle\DataFixtures\ORM;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
+{
+    public function load(ObjectManager $manager)
+    {
+        foreach ([
+            'Appel téléphonique',
+            'Formation'
+                 ] as $key => $label) {
+            $category = new AsideActivityCategory();
+            $category->setTitle(['fr' => $label]);
+            $manager->persist($category);
+            $this->setReference('aside_activity_category_'.$key, $category);
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php

@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+
+final class ChillAsideActivityExtension extends Extension implements PrependExtensionInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @phpstan-ignore-next-line
+     */
+    public function load(array $configs, ContainerBuilder $container): void
+    {
+
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+        $loader->load('services/form.yaml');
+        $loader->load('services/menu.yaml');
+    }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        $this->prependRoute($container);
+        $this->prependCruds($container);
+    }
+
+    protected function prependRoute(ContainerBuilder $container)
+    {
+        //declare routes for task bundle
+        $container->prependExtensionConfig('chill_main', array(
+           'routing' => array(
+              'resources' => array(
+                  '@ChillAsideActivityBundle/config/routes.yaml',
+              )
+           )
+        ));
+    }
+
+    protected function prependCruds(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => \Chill\AsideActivityBundle\Entity\AsideActivityCategory::class,
+                    'name' => 'aside_activity_category',
+                    'base_path' => '/admin/asideactivity/category',
+                    'form_class' => \Chill\AsideActivityBundle\Form\AsideActivityCategoryType::class,
+                    'controller' => \Chill\AsideActivityBundle\Controller\AsideActivityCategoryController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillAsideActivity/asideActivityCategory/index.html.twig',
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillAsideActivity/asideActivityCategory/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillAsideActivity/asideActivityCategory/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\AsideActivityBundle\Entity\AsideActivity::class,
+                    'name' => 'aside_activity',
+                    'base_path' => '/asideactivity',
+                    'form_class' => \Chill\AsideActivityBundle\Form\AsideActivityFormType::class,
+                    'controller' => \Chill\AsideActivityBundle\Controller\AsideActivityController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillAsideActivity/asideActivity/index.html.twig',
+                            'role' => 'ROLE_USER'
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/new.html.twig',
+                        ],
+                        'view' => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/view.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/edit.html.twig',
+                        ],
+                        'delete' => [
+                            'role' => 'ROLE_USER',
+                            'template' => '@ChillAsideActivity/asideActivity/delete.html.twig',
+                        ]
+                    ]
+                ],
+            ]
+        ]);
+    }
+}

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

@@ -0,0 +1,138 @@
+<?php
+
+namespace Chill\AsideActivityBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder('chill_aside_activity');
+
+        $treeBuilder->getRootNode('chill_aside_activity')
+            ->children()
+                ->arrayNode('form')
+                    ->canBeEnabled()
+                    ->children()
+                        ->arrayNode('time_duration')
+                        ->isRequired()
+                        ->defaultValue(
+                            [
+                                [ 'label' => '5 minutes',  'seconds' => 300], 
+                                [ 'label' => '10 minutes', 'seconds' => 600],
+                                [ 'label' => '15 minutes', 'seconds' => 900],
+                                [ 'label' => '20 minutes', 'seconds' => 1200],
+                                [ 'label' => '25 minutes', 'seconds' => 1500],
+                                [ 'label' => '30 minutes', 'seconds' => 1800],
+                                [ 'label' => '45 minutes', 'seconds' => 2700],
+                                [ 'label' => '1 hour',     'seconds' => 3600],
+                                [ 'label' => '1 hour 15',  'seconds' => 4500],
+                                [ 'label' => '1 hour 30',  'seconds' => 5400],
+                                [ 'label' => '1 hour 45',  'seconds' => 6300],
+                                [ 'label' => '2 hours',    'seconds' => 7200],
+                                [ 'label' => '2 hours 30', 'seconds' => 9000],
+                                [ 'label' => '3 hours',    'seconds' => 10800],
+                                [ 'label' => '3 hours 30', 'seconds' => 12600],
+                                [ 'label' => '4 hours',    'seconds' => 14400],
+                                [ 'label' => '4 hours 30', 'seconds' => 16200],
+                                [ 'label' => '5 hours',    'seconds' => 18000],
+                                [ 'label' => '5 hours 30', 'seconds' => 19800],
+                                [ 'label' => '6 hours',    'seconds' => 21600],
+                                [ 'label' => '6 hours 30', 'seconds' => 23400],
+                                [ 'label' => '7 hours',    'seconds' => 25200],
+                                [ 'label' => '7 hours 30', 'seconds' => 27000],
+                                [ 'label' => '8 hours',    'seconds' => 28800],
+                                [ 'label' => '8 hours 30', 'seconds' => 30600],
+                                [ 'label' => '9 hours',    'seconds' => 32400],
+                                [ 'label' => '9 hours 30', 'seconds' => 34200],
+                                [ 'label' => '10 hours',   'seconds' => 36000],
+                                [ 'label' => '1/2 day',    'seconds' => 14040],
+                                [ 'label' => '1 day',      'seconds' => 28080],
+                                [ 'label' => '1 1/2 days',   'seconds' => 42120],
+                                [ 'label' => '2 days',     'seconds' => 56160],
+                                [ 'label' => '2 1/2 days',   'seconds' => 70200],
+                                [ 'label' => '3 days',     'seconds' => 84240],
+                                [ 'label' => '3 1/2 days',   'seconds' => 98280],
+                                [ 'label' => '4 days',     'seconds' => 112320],
+                                [ 'label' => '4 1/2 days',   'seconds' => 126360],
+                                [ 'label' => '5 days',     'seconds' => 140400],
+                                [ 'label' => '5 1/2 days',   'seconds' => 154440],
+                                [ 'label' => '6 days',     'seconds' => 168480],
+                                [ 'label' => '6 1/2 days',   'seconds' => 182520],
+                                [ 'label' => '7 days',     'seconds' => 196560],
+                                [ 'label' => '7 1/2 days',   'seconds' => 210600],
+                                [ 'label' => '8 days',     'seconds' => 224640],
+                                [ 'label' => '8 1/2 days',   'seconds' => 238680],
+                                [ 'label' => '9 days',     'seconds' => 252720],
+                                [ 'label' => '9 1/2 days',   'seconds' => 266760],
+                                [ 'label' => '10 days',    'seconds' => 280800],
+                                [ 'label' => '10 1/2days',  'seconds' => 294840],
+                                [ 'label' => '11 days',    'seconds' => 308880],
+                                [ 'label' => '11 1/2 days',  'seconds' => 322920],
+                                [ 'label' => '12 days',    'seconds' => 336960],
+                                [ 'label' => '12 1/2 days',  'seconds' => 351000],
+                                [ 'label' => '13 days',    'seconds' => 365040],
+                                [ 'label' => '13 1/2 days',  'seconds' => 379080],
+                                [ 'label' => '14 days',    'seconds' => 393120],
+                                [ 'label' => '14 1/2 days',  'seconds' => 407160],
+                                [ 'label' => '15 days',    'seconds' => 421200],
+                                [ 'label' => '15 1/2 days',  'seconds' => 435240],
+                                [ 'label' => '16 days',    'seconds' => 449280],
+                                [ 'label' => '16 1/2 days',  'seconds' => 463320],
+                                [ 'label' => '17 days',    'seconds' => 477360],
+                                [ 'label' => '17 1/2 days',  'seconds' => 491400],
+                                [ 'label' => '18 days',    'seconds' => 505440],
+                                [ 'label' => '18 1/2 days',  'seconds' => 519480],
+                                [ 'label' => '19 days',    'seconds' => 533520],
+                                [ 'label' => '19 1/2 days',  'seconds' => 547560],
+                                [ 'label' => '20 days',    'seconds' => 561600],
+                                [ 'label' => '20 1/2 days',  'seconds' => 575640],
+                                [ 'label' => '21 days',    'seconds' => 580680],
+                                [ 'label' => '21 1/2 days',  'seconds' => 603720],
+                                [ 'label' => '22 days',    'seconds' => 617760],
+                                [ 'label' => '22 1/2 days',  'seconds' => 631800],
+                                [ 'label' => '23 days',    'seconds' => 645840],
+                                [ 'label' => '23 1/2 days',  'seconds' => 659880],
+                                [ 'label' => '24 days',    'seconds' => 673920],
+                                [ 'label' => '24 1/2 days',  'seconds' => 687960],
+                                [ 'label' => '25 days',    'seconds' => 702000],
+                                [ 'label' => '25 1/2 days',  'seconds' => 716040],
+                                [ 'label' => '26 days',    'seconds' => 730080],
+                                [ 'label' => '26 1/2 days',  'seconds' => 744120],
+                                [ 'label' => '27 days',    'seconds' => 758160],
+                                [ 'label' => '27 1/2 days',  'seconds' => 772200],
+                                [ 'label' => '28 days',    'seconds' => 786240],
+                                [ 'label' => '28 1/2 days',  'seconds' => 800280],
+                                [ 'label' => '29 days',    'seconds' => 814320],
+                                [ 'label' => '29 1/2 days',  'seconds' => 828360],
+                                [ 'label' => '30 days',    'seconds' => 842400],
+                            ]
+                        )
+                        ->info('The intervals of time to show in activity form')
+
+                        ->prototype('array')
+                            ->children()
+                                ->scalarNode('seconds')
+                                    ->info("The number of seconds of this duration. Must be an integer.")
+                                    ->cannotBeEmpty()
+                                    ->validate()
+                                        ->ifTrue(function($data) {
+                                            return !is_int($data);
+                                        })->thenInvalid("The value %s is not a valid integer")
+                                    ->end()
+                                ->end()
+                                ->scalarNode('label')
+                                    ->cannotBeEmpty()
+                                    ->info("The label to show into fields")
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end();
+
+            return $treeBuilder;
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -0,0 +1,203 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+/**
+ * @ORM\Entity
+ * @ORM\Table(schema="chill_asideactivity")
+ */
+class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $type;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private \Chill\MainBundle\Entity\User $createdBy;
+
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    private $createdAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private \Chill\MainBundle\Entity\User $updatedBy;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotBlank()
+     */
+    private \Chill\MainBundle\Entity\User $agent;
+
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    private $date;
+
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
+    private ?\DateTimeInterface $duration = null;
+
+    /**
+     * @ORM\Column(type="string", length=100, nullable=true)
+     */
+    private $location;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $note;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getType(): ?AsideActivityCategory
+    {
+        return $this->type;
+    }
+
+    public function setType(?AsideActivityCategory $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function getCreatedAt(): ?\DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): self
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
+
+    public function getUpdatedAt(): ?\DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function getAgent(): ?User
+    {
+        return $this->agent;
+    }
+
+    public function setAgent(?User $agent): self
+    {
+        $this->agent = $agent;
+
+        return $this;
+    }
+
+    public function getDate(): ?\DateTimeInterface
+    {
+        return $this->date;
+    }
+
+    public function setDate(\DateTimeInterface $date): self
+    {
+        $this->date = $date;
+
+        return $this;
+    }
+
+    public function getDuration(): ?\DateTimeInterface
+    {
+        return $this->duration;
+    }
+
+    public function setDuration(?\DateTimeInterface $duration): self
+    {
+        $this->duration = $duration;
+
+        return $this;
+    }
+
+    public function getLocation(): ?string
+    {
+        return $this->location;
+    }
+
+    public function setLocation(?string $location): self
+    {
+        $this->location = $location;
+
+        return $this;
+    }
+
+    public function getNote(): ?string
+    {
+        return $this->note;
+    }
+
+    public function setNote(?string $note): self
+    {
+        $this->note = $note;
+
+        return $this;
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php

@@ -0,0 +1,168 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(schema="chill_asideactivity")
+ */
+class AsideActivityCategory
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private int $id;
+
+    /**
+     * @ORM\Column(type="json", length=255)
+     */
+    private array $title;
+
+    /**
+     * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     * @ORM\Column(type="boolean")
+     */
+    private bool $isActive = true;
+
+    /**
+     * @var float
+     * @ORM\Column(type="float", options={"default": 0.00})
+     */
+    private float $ordering = 0.00;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="children")
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private $parent;
+
+    /**
+     * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     */
+    private $children;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTitle(): ?array
+    {
+        return $this->title;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    public function setIsActive(bool $isActive): self
+    {
+        $this->isActive = $isActive;
+
+        return $this;
+    }
+
+    public function getParent(): ?self
+    {
+        return $this->parent;
+    }
+
+    /**
+     *
+     * @Assert\Callback()
+     */
+    public function preventRecursiveParent(ExecutionContextInterface $context, $payload)
+    {
+        if (!$this->hasParent()) {
+            return;
+        }
+
+        if ($this->getParent() === $this) {
+            // replace parent with old parent. This prevent recursive loop
+            // when displaying form
+            $this->parent = $this->oldParent;
+            $context->buildViolation('You must not add twice the same category in the parent tree (previous result returned)')
+                ->atPath('parent')
+                ->addViolation()
+            ;
+        }
+    }
+
+    public function hasParent(): bool
+    {
+        return $this->parent !== null;
+    }
+
+    public function setParent(?self $parent): self
+    {
+        // cache the old result for changing it during validaiton
+        $this->oldParent = $this->parent;
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|self[]
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function addChild(self $child): self
+    {
+        if (!$this->children->contains($child)) {
+            $this->children[] = $child;
+            $child->setParent($this);
+        }
+
+        return $this;
+    }
+
+    public function removeChild(self $child): self
+    {
+        if ($this->children->removeElement($child)) {
+            // set the owning side to null (unless already changed)
+            if ($child->getParent() === $this) {
+                $child->setParent(null);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(float $ordering): AsideActivityCategory
+    {
+        $this->ordering = $ordering;
+        return $this;
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Form;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class AsideActivityCategoryType extends AbstractType
+{
+
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper, CategoryRender $categoryRender)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->categoryRender = $categoryRender;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('title', TranslatableStringFormType::class,
+        [
+           'label' => 'Nom',
+        ])
+        ->add('parent', EntityType::class, [
+            'class' => AsideActivityCategory::class,
+            'required' => false,
+            'label' => 'Parent',
+            'choice_label' => function (AsideActivityCategory $category){
+                $options = [];
+                return $this->categoryRender->renderString($category, $options);
+            }
+        ])
+        ->add('ordering', NumberType::class)
+        ->add('isActive', ChoiceType::class,
+        [
+            'choices' => [
+                'Yes' => true,
+                'No' => false
+            ],
+            'expanded' => true
+        ]);
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Form;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Templating\EngineInterface;
+
+final class AsideActivityFormType extends AbstractType
+{
+    protected array $timeChoices;
+    private TokenStorageInterface $storage;
+    private CategoryRender $categoryRender;
+
+    public function __construct (
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag,
+        TokenStorageInterface $storage,
+        CategoryRender $categoryRender
+    ){
+        $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->storage = $storage;
+        $this->categoryRender = $categoryRender;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $timeChoices = [];
+
+        foreach ($this->timeChoices as $e) {
+            $timeChoices[$e['label']] = $e['seconds'];
+        }
+
+        $durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
+        $durationTimeOptions = [
+            'choices' => $timeChoices,
+            'placeholder' => 'Choose the duration',
+        ];
+
+        $builder
+            ->add('agent', EntityType::class,
+            [
+                'label' => 'For agent',
+                'required' => true,
+                'class' => User::class,
+                'data' => $this->storage->getToken()->getUser(),
+                'query_builder' => function(EntityRepository $er){
+                    return $er->createQueryBuilder('u')->where('u.enabled = true');
+                },
+                'attr' => array('class' => 'select2 '),
+                'placeholder' => 'Choose the agent for whom this activity is created',
+                'choice_label' => 'username'
+            ])
+            ->add('date', ChillDateType::class,
+            [
+                'label' => 'date',
+                'data' => new \DateTime(),
+                'required' => true
+            ])
+            ->add('type', EntityType::class,
+            [
+                'label' => 'Type',
+                'required' => true,
+                'class' => AsideActivityCategory::class,
+                'placeholder' => 'Choose the activity category',
+                'query_builder' => function(EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('ac');
+                    $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
+                        ->addOrderBy('ac.ordering', 'ASC')
+                    ;
+
+                    return $qb;
+                },
+                'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
+                    $options = [];
+                    return $this->categoryRender->renderString($asideActivityCategory, $options);
+                },
+            ])
+            ->add('duration', ChoiceType::class, $durationTimeOptions)
+            ->add('note', ChillTextareaType::class, [
+                'label' => 'Note',
+                'required' => false,
+            ]);
+
+            foreach (['duration'] as $fieldName)
+            {
+                $builder->get($fieldName)
+                ->addModelTransformer($durationTimeTransformer);
+
+            $builder->get($fieldName)
+                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
+                    $timeChoices,
+                    $builder,
+                    $durationTimeTransformer,
+                    $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');
+                    /* @var $data \DateTimeImmutable */
+                    $data = $formEvent->getData() === NULL ?
+                        \DateTime::createFromFormat('U', 300) :
+                        $formEvent->getData();
+                    $seconds = $data->getTimezone()->getOffset($data);
+                    $data->setTimeZone($timezoneUTC);
+                    $data->add(new \DateInterval('PT'.$seconds.'S'));
+
+                    // test if the timestamp is in the choices.
+                    // If not, recreate the field with the new timestamp
+                    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($fieldName, ChoiceType::class, array_merge(
+                            $durationTimeOptions, [
+                                'choices' => $timeChoices,
+                                'auto_initialize' => false
+                            ]
+                        ));
+                        $form->addModelTransformer($durationTimeTransformer);
+                        $formEvent->getForm()->getParent()->add($form->getForm());
+                    }
+                });
+            }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => AsideActivity::class,
+        ]);
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'chill_asideactivitybundle_asideactivity';
+    }
+}

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Menu;
+
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+
+final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_aside_activity'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        // all the entries below must have ROLE_ADMIN permissions
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        if (in_array($menuId, ['admin_index', 'admin_section'])) {
+            $menu->addChild('Aside activities', [
+                'route' => 'chill_crud_aside_activity_category_index'
+            ])
+                ->setExtras([
+                    'order' => 900,
+                    'explain' => "Aside activity type configuration"
+                ]);
+        } else {
+            $menu
+                ->addChild('Aside activity categories', [
+                    'route' => 'chill_crud_aside_activity_category_index'
+                ])
+                ->setExtras([
+                    'order' => '50'
+                ]);
+        }
+
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Class SectionMenuBuilder
+ *
+ * @package Chill\AsideActivityBundle\Menu
+ */
+class SectionMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected TranslatorInterface $translator;
+    public AuthorizationCheckerInterface $authorizationChecker;
+
+    public function __construct(TranslatorInterface $translator, AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->translator = $translator;
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    /**
+     * @param $menuId
+     * @param MenuItem $menu
+     * @param array $parameters
+     */
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if ($this->authorizationChecker->isGranted('ROLE_USER')){
+            $menu->addChild($this->translator->trans('Create an aside activity'), [
+                    'route' => 'chill_crud_aside_activity_new'
+                ])
+                ->setExtras([
+                    'order' => 11,
+                    'icons' => [ 'plus' ]
+                ]);
+            $menu->addChild($this->translator->trans('Phonecall'), [
+                'route' => 'chill_crud_aside_activity_new',
+                'routeParameters' => [
+                    'type' => 1,
+                    'duration' => 900,
+                ]
+            ])
+            ->setExtras([
+                'order' => 12,
+                'icons' => ['plus']
+            ]);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public static function getMenuIds(): array
+    {
+        return [ 'section' ];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php

@@ -0,0 +1,92 @@
+<?php
+/*
+ * Copyright (C) 2018 Champs Libres Cooperative <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\AsideActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Chill\TaskBundle\Templating\UI\CountNotificationTask;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+
+/**
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class UserMenuBuilder implements LocalMenuBuilderInterface
+{
+
+    /**
+     *
+     * @var CountNotificationTask
+     */
+    public $counter;
+
+    /*
+     * @var TokenStorageInterface
+     */
+    public $tokenStorage;
+
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    public $translator;
+
+    /**
+     *
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
+
+    public function __construct(
+        CountNotificationTask $counter,
+        TokenStorageInterface $tokenStorage,
+        TranslatorInterface $translator,
+        AuthorizationCheckerInterface $authorizationChecker
+    ) {
+        $this->counter = $counter;
+        $this->tokenStorage = $tokenStorage;
+        $this->translator = $translator;
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if ($this->authorizationChecker->isGranted('ROLE_USER')){
+        $menu->addChild("My aside activities", [
+                'route' => 'chill_crud_aside_activity_index'
+            ])
+            ->setExtras([
+                'order' => 10,
+                'icon' => 'tasks'
+            ]);
+        }
+
+    }
+
+    public static function getMenuIds(): array
+    {
+        return [ 'user' ];
+    }
+    
+}

src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Repository;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+class AsideActivityCategoryRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+    
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(AsideActivityCategory::class);
+    }
+
+
+    public function find($id): ?AsideActivityCategory
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return AsideActivityCategory[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return AsideActivityCategory[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AsideActivityCategory
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return AsideActivityCategory::class;
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Repository;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+final class AsideActivityRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(AsideActivity::class);
+    }
+
+    public function find($id): ?AsideActivity
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return AsideActivity[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return AsideActivity[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AsideActivity
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return AsideActivity::class;
+    }
+
+}

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

@@ -0,0 +1,12 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+	{{ chill_menu('admin_aside_activity') }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+	{% block admin_content %}
+		<!-- block personcontent empty -->
+		<h1>{{ 'Aside activity configuration'|trans }}</h1>
+	{% endblock %}
+{% endblock  %}

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

@@ -0,0 +1,12 @@
+{% set reversed_parents = parents|reverse %}
+<span
+	class="chill-entity entity-aside_activity-category">
+	{%- for p in reversed_parents %}
+		<span class="parent-{{ loop.revindex0 }}">
+			{{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
+		</span>
+	{%- endfor -%}
+	<span class="child">
+		{{ asideActivityCategory.title|localize_translatable_string }}
+	</span>
+</span>

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig

@@ -0,0 +1,30 @@
+<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
+	{% block crud_content_header %}
+		<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
+	{% endblock crud_content_header %}
+
+	<p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</p>
+
+	{{ form_start(form) }}
+
+	<ul class="record_actions">
+		{% block content_form_actions_back %}
+			<li class="cancel">
+				<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+					{{ 'Cancel'|trans }}
+				</a>
+			</li>
+		{% endblock %}
+		{% block content_form_actions_before %}
+
+        {% endblock %}
+		{% block content_form_actions_confirm_delete %}
+			<li>
+				<button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
+			</li>
+		{% endblock content_form_actions_confirm_delete %}
+		{% block content_form_actions_after %}{% endblock %}
+	</ul>
+
+	{{ form_end(form) }}
+</div>

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig

@@ -0,0 +1,8 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{# {% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %} #}
+
+{% block content %}
+    {% embed '@ChillAsideActivity/asideActivity/_delete.html.twig' %}
+    {% endembed %}
+{% endblock content %}

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

@@ -0,0 +1,14 @@
+{% extends '@ChillMain/Admin/layout.html.twig' %}
+
+{% block title %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+{# {% as we are in the admin layout, we override the admin content with the CRUD content %} #}
+{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+    {# we do not have "view" page. We empty the corresponding block #}
+    {% block content_form_actions_view %}{% endblock %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
+{% endblock %}

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

@@ -0,0 +1,91 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title %}
+	{{ 'Aside activity list'|trans }}
+{% endblock title %}
+
+{% block content %}
+	<div class="col-md-10 asideactivity-list">
+		<h2>{{ 'My aside activities'|trans }}</h2>
+
+		{% if entities|length == 0 %}
+			<p class="chill-no-data-statement">
+				{{ "There aren't any aside activities."|trans }}
+				<a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create button-small"></a>
+			</p>
+		{% else %}
+
+			<div class="flex-table">
+
+				{% for entity in entities %}
+
+					<div class="item-bloc">
+						<div class="item-row wrap-header">
+
+							<div class="item-col">
+								<h3>
+									{{ entity.type|chill_entity_render_box }}
+								</h3>
+								<div>
+									{% if entity.date %}
+										<span>{{ entity.date|format_date('long') }}</span>
+									{% endif %}
+									{% if entity.date %}
+										<span class="duration">
+
+											<i class="fa fa-fw fa-hourglass-end"></i>
+											{{ entity.duration|date('H:i') }}
+
+										</span>
+									{% endif %}
+								</div>
+							</div>
+							<div class="item-col">
+								<div class="box">
+									<ul class="list-content fa-ul">
+										<li>
+											<span>
+												<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
+												<b>{{ entity.createdBy|chill_entity_render_box }}</b>
+											</span>
+										</li>
+										<li>
+											<span>
+												<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
+												<b>{{ entity.agent|chill_entity_render_box }}</b>
+
+											</span>
+										</li>
+									</ul>
+									<div class="action">
+										<ul class="record_actions">
+											<li>
+												<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_view', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
+											</li>
+											<li>
+												<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update btn-mini "></a>
+											</li>
+											<li>
+												<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete btn-mini"></a>
+											</li>
+										</ul>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				{% endfor %}
+			</div>
+
+			{{ chill_pagination(paginator) }}
+
+			<ul class="record_actions">
+				<li>
+					<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
+						{{ 'Create'|trans }}
+					</a>
+				</li>
+			</ul>
+		{% endif %}
+
+	{% endblock %}

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

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

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig

@@ -0,0 +1,52 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}
+	{% include('@ChillMain/CRUD/_view_title.html.twig') %}
+{% endblock %}
+
+{% block content %}
+	{% embed '@ChillMain/CRUD/_view_content.html.twig' %}
+		{% block crud_content_header %}
+			<h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}</h1>
+		{% endblock crud_content_header %}
+		{% block crud_content_view_details %}
+			<dl class="chill_view_data">
+
+				<dt class="inline">{{ 'Type'|trans }}</dt>
+				<dd>{{ entity.type|chill_entity_render_box }}</dd>
+
+				<dt class="inline">{{ 'Created by'|trans }}</dt>
+				<dd>{{ entity.createdBy }}</dd>
+
+				<dt class="inline">{{ 'Created for'|trans }}</dt>
+				<dd>{{ entity.agent }}</dd>
+
+				<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+				<dt class="inline">{{ 'Date'|trans }}</dt>
+				<dd>{{ entity.date|format_date('long') }}</dd>
+
+				<dt class="inline">{{ 'Duration'|trans }}</dt>
+				<dd>{{ entity.duration|date('H:i') }}</dd>
+
+				<dt class="inline">{{ 'Remark'|trans }}</dt>
+				{%- if entity.note is empty -%}
+					<dd>
+						<span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
+					</dd>
+				{%- else -%}
+					<dd>
+						<section class="chill-entity entity-comment-embeddable">
+							<blockquote class="chill-user-quote">
+								<p>{{ entity.note }}</p>
+							</blockquote>
+						</section>
+					</dd>
+				{%- endif -%}
+			</dl>
+
+		{% endblock %}
+	{% endembed %}
+{% endblock %}

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

@@ -0,0 +1,12 @@
+{% extends "@ChillAsideActivity/Admin/layout_asideactivity.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/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig

@@ -0,0 +1,46 @@
+{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+
+{% block admin_content %}
+	<h1>{{ 'Aside Activity Type List'|trans }}</h1>
+
+	<table class="records_list table table-bordered border-dark">
+		<thead>
+			<tr>
+                <th>{{ 'Ordering'|trans }}</th>
+				<th>{{ 'Name'|trans }}</th>
+				<th>{{ 'Active'|trans }}</th>
+				<th>{{ 'Actions'|trans }}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for entity in entities %}
+				<tr>
+                    <td>{{ entity.ordering }}</td>
+					<td>{{ entity|chill_entity_render_box }}</td>
+					<td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<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_aside_activity_category_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_aside_activity_category_new') }}" class="btn btn-create">
+				{{ 'Create a new aside activity type'|trans }}
+			</a>
+		</li>
+	</ul>
+{% endblock %}

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

@@ -0,0 +1,11 @@
+{% extends "@ChillAsideActivity/Admin/layout_asideactivity.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/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Templating\Entity;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Component\Templating\EngineInterface;
+
+final class CategoryRender implements ChillEntityRenderInterface
+{
+    private TranslatableStringHelper $translatableStringHelper;
+    private EngineInterface $engine;
+
+    public const SEPERATOR_KEY = 'default.separator';
+    public const DEFAULT_ARGS = [
+        self::SEPERATOR_KEY => ' > '
+    ];
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->engine = $engine;
+    }
+
+    /**
+     * @param AsideActivityCategory $asideActivityCategory
+     */
+    public function renderString($asideActivityCategory, array $options): string
+    {
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+
+        $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+
+        while ($asideActivityCategory->hasParent()) {
+            $asideActivityCategory = $asideActivityCategory->getParent();
+            $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+        }
+
+        $titles = array_reverse($titles);
+
+        return implode($options[self::SEPERATOR_KEY], $titles);
+
+    }
+
+    /**
+     * @param AsideActivityCategory $asideActivityCategory
+     */
+    public function supports($asideActivityCategory, array $options): bool
+    {
+        return $asideActivityCategory instanceof AsideActivityCategory;
+    }
+
+    public function buildParents(AsideActivityCategory $asideActivityCategory)
+    {
+        $parents = [];
+
+        while($asideActivityCategory->hasParent()) {
+            $asideActivityCategory = $parents[] = $asideActivityCategory->getParent();
+        }
+
+        return $parents;
+    }
+
+    /**
+     * @param AsideActivityCategory $asideActivityCategory
+     */
+    public function renderBox($asideActivityCategory, array $options): string
+    {
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $parents = $this->buildParents($asideActivityCategory);
+
+        return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
+        [
+            'asideActivityCategory' => $asideActivityCategory,
+            'parents' => $parents,
+            'options' => $options
+        ]);
+    }
+}