From 741043c1775cc9cd85d8e19e5d46282c35f22531 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 10:05:47 +0100
Subject: [PATCH 01/15] address: alter some address field to TEXT + add
 confidential field

---
 src/Bundle/ChillMainBundle/Entity/Address.php | 29 ++++++++++--
 .../migrations/Version20220124085957.php      | 44 +++++++++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220124085957.php

diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 070d40468..3a35abb94 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -42,10 +42,18 @@ class Address
      */
     private $buildingName;
 
+    /**
+     * @var bool
+     *
+     * @ORM\Column(type="boolean")
+     * @Groups({"write"})
+     */
+    private $confidential = false;
+
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $corridor;
@@ -78,7 +86,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $flat;
@@ -86,7 +94,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $floor;
@@ -143,7 +151,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $steps;
@@ -192,6 +200,7 @@ class Address
         return (new Address())
             ->setAddressReference($original->getAddressReference())
             ->setBuildingName($original->getBuildingName())
+            ->setConfidential($original->getConfidential())
             ->setCorridor($original->getCorridor())
             ->setCustoms($original->getCustoms())
             ->setDistribution($original->getDistribution())
@@ -234,6 +243,11 @@ class Address
         return $this->corridor;
     }
 
+    public function getConfidential(): bool
+    {
+        return $this->confidential;
+    }
+
     /**
      * Get customs informations in the address.
      */
@@ -369,6 +383,13 @@ class Address
         return $this;
     }
 
+    public function setConfidential(bool $confidential): self
+    {
+        $this->confidential = $confidential;
+
+        return $this;
+    }
+
     public function setCorridor(?string $corridor): self
     {
         $this->corridor = $corridor;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
new file mode 100644
index 000000000..d1b8d6739
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Alter some address fields + add confidential field on Address
+ */
+final class Version20220124085957 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Alter some address fields + add confidential field on Address';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address ADD confidential BOOLEAN DEFAULT FALSE');
+        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE TEXT');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP confidential');
+        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(16)');
+    }
+}

From 02d8ceba259d3cc320e338507d2634ba015c405f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 10:42:05 +0100
Subject: [PATCH 02/15] address: add confidential in normalizer + code style
 fix

---
 src/Bundle/ChillMainBundle/Entity/Address.php | 10 +++++-----
 .../Normalizer/AddressNormalizer.php          |  2 ++
 .../migrations/Version20220124085957.php      | 20 +++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 3a35abb94..ef965f062 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -238,16 +238,16 @@ class Address
         return $this->buildingName;
     }
 
-    public function getCorridor(): ?string
-    {
-        return $this->corridor;
-    }
-
     public function getConfidential(): bool
     {
         return $this->confidential;
     }
 
+    public function getCorridor(): ?string
+    {
+        return $this->corridor;
+    }
+
     /**
      * Get customs informations in the address.
      */
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 0b46127b6..10e889344 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -45,6 +45,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
         'extra',
         'validFrom' => DateTimeInterface::class,
         'validTo' => DateTimeInterface::class,
+        'confidential',
     ];
 
     private AddressRender $addressRender;
@@ -83,6 +84,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                 'buildingName' => $address->getBuildingName(),
                 'distribution' => $address->getDistribution(),
                 'extra' => $address->getExtra(),
+                'confidential' => $address->getConfidential(),
                 'lines' => $this->addressRender->renderLines($address),
             ];
 
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
index d1b8d6739..17b58825d 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220124085957.php
@@ -15,10 +15,19 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Alter some address fields + add confidential field on Address
+ * Alter some address fields + add confidential field on Address.
  */
 final class Version20220124085957 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP confidential');
+        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(16)');
+    }
+
     public function getDescription(): string
     {
         return 'Alter some address fields + add confidential field on Address';
@@ -32,13 +41,4 @@ final class Version20220124085957 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE TEXT');
         $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE TEXT');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_address DROP confidential');
-        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(16)');
-        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(16)');
-        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(16)');
-        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(16)');
-    }
 }

From b3edba3abe955bb000e8b7e74bb9b6ab9683ac30 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 11:04:17 +0100
Subject: [PATCH 03/15] address: add confidential in vuejs edit form

---
 .../vuejs/Address/components/AddAddress.vue   |  2 ++
 .../vuejs/Address/components/EditPane.vue     | 23 +++++++++++++++++--
 .../Resources/public/vuejs/Address/i18n.js    |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 1f62269de..2ca73b92c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -562,6 +562,7 @@ export default {
          this.entity.loaded.cities = [];
          this.entity.loaded.countries = [];
 
+         this.entity.selected.confidential = this.context.edit ? this.entity.address.confidential : false;
          this.entity.selected.isNoAddress = (this.context.edit && this.entity.address.text === '') ? true : false;
 
          this.entity.selected.country = this.context.edit ? this.entity.address.country : {};
@@ -593,6 +594,7 @@ export default {
       {
          console.log('apply changes');
          let newAddress = {
+            'confidential': this.entity.selected.confidential,
             'isNoAddress': this.entity.selected.isNoAddress,
             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
             'streetNumber': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.streetNumber,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 486d28e73..5279880bc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -17,12 +17,22 @@
       <div class="row my-3">
          <div class="col-lg-6">
 
+            <div class="form-check">
+               <input type="checkbox"
+                  class="form-check-input"
+                  id="isConfidential"
+                  v-model="isConfidential"
+                  :value="valueConfidential" />
+               <label class="form-check-label" for="isConfidential">
+                  {{ $t('isConfidential') }}
+               </label>
+            </div>
             <div class="form-check">
                <input type="checkbox"
                   class="form-check-input"
                   id="isNoAddress"
                   v-model="isNoAddress"
-                  v-bind:value="value" />
+                  :value="value" />
                <label class="form-check-label" for="isNoAddress">
                   {{ $t('isNoAddress') }}
                </label>
@@ -118,7 +128,8 @@ export default {
    emits: ['getCities', 'getReferenceAddresses'],
    data() {
       return {
-         value: false
+         value: false,
+         valueConfidential: false,
       }
    },
    computed: {
@@ -134,6 +145,14 @@ export default {
       addressMap() {
          return this.entity.addressMap;
       },
+      isConfidential: {
+         set(value) {
+            this.entity.selected.confidential = value;
+         },
+         get() {
+            return this.entity.selected.confidential;
+         }
+      },
       isNoAddress: {
          set(value) {
             console.log('isNoAddress value', value);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 98f31cbd3..28670f56c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -18,6 +18,7 @@ const addressMessages = {
         other_address: 'Autre adresse',
         create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
         isNoAddress: 'Pas d\'adresse complète',
+        isConfidential: 'Adresse confidentielle',
         street: 'Nom de rue',
         streetNumber: 'Numéro',
         floor: 'Étage',

From d087f051f0afd562752dd35c148e018dc36634d3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 11:08:25 +0100
Subject: [PATCH 04/15] address: remove maxlenght constraint in vuejs form for
 corridor, flat, steps, floor

---
 .../vuejs/Address/components/AddAddress/AddressMore.vue       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index 1216871ab..93a64ad19 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -6,7 +6,6 @@
             <input class="form-control"
             type="text"
             name="floor"
-            maxlength=16
             :placeholder="$t('floor')"
             v-model="floor"/>
             <label for="floor">{{ $t('floor') }}</label>
@@ -15,7 +14,6 @@
             <input class="form-control"
             type="text"
             name="corridor"
-            maxlength=16
             :placeholder="$t('corridor')"
             v-model="corridor"/>
             <label for="corridor">{{ $t('corridor') }}</label>
@@ -24,7 +22,6 @@
             <input class="form-control"
             type="text"
             name="steps"
-            maxlength=16
             :placeholder="$t('steps')"
             v-model="steps"/>
             <label for="steps">{{ $t('steps') }}</label>
@@ -33,7 +30,6 @@
             <input class="form-control"
             type="text"
             name="flat"
-            maxlength=16
             :placeholder="$t('flat')"
             v-model="flat"/>
             <label for="flat">{{ $t('flat') }}</label>

From 6b78c06dfb1ab7b89a96a90b5987817623f4c8ee Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 12:04:23 +0100
Subject: [PATCH 05/15] address: use address.confidential in
 AddressRenderBox.vue

---
 .../_components/Entity/AddressRenderBox.vue   | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 8a069298a..385f7aa3d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -1,26 +1,58 @@
 <template>
+
    <component :is="component" class="chill-entity entity-address my-3">
 
       <component :is="component" class="address" :class="multiline">
-         <div v-if="isMultiline === true">
-            <p v-for="(l, i) in address.lines" :key="`line-${i}`">
-               {{ l }}
-            </p>
+
+         <div v-if="isConfidential">
+            <confidential>
+               <template v-slot:confidential-content>
+                  <div v-if="isMultiline === true">
+                     <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+                        {{ l }}
+                     </p>
+                  </div>
+                  <div v-else>
+                     <p v-if="address.text"
+                        class="street">
+                        {{ address.text }}
+                     </p>
+                     <p v-if="address.postcode"
+                        class="postcode">
+                        {{ address.postcode.code }} {{ address.postcode.name }}
+                     </p>
+                     <p v-if="address.country"
+                        class="country">
+                        {{ address.country.name.fr }}
+                     </p>
+                  </div>
+               </template>
+
+            </confidential>
          </div>
-         <div v-else>
-            <p v-if="address.text"
-               class="street">
-               {{ address.text }}
-            </p>
-            <p v-if="address.postcode"
-               class="postcode">
-               {{ address.postcode.code }} {{ address.postcode.name }}
-            </p>
-            <p v-if="address.country"
-               class="country">
-               {{ address.country.name.fr }}
-            </p>
+
+         <div v-if="!isConfidential">
+            <div v-if="isMultiline === true">
+               <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+                  {{ l }}
+               </p>
+            </div>
+            <div v-else>
+               <p v-if="address.text"
+                  class="street">
+                  {{ address.text }}
+               </p>
+               <p v-if="address.postcode"
+                  class="postcode">
+                  {{ address.postcode.code }} {{ address.postcode.name }}
+               </p>
+               <p v-if="address.country"
+                  class="country">
+                  {{ address.country.name.fr }}
+               </p>
+            </div>
          </div>
+
       </component>
 
       <!-- <div v-if="isMultiline === true" class="address-more">
@@ -78,8 +110,14 @@
 </template>
 
 <script>
+
+import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
+
 export default {
    name: 'AddressRenderBox',
+   components: {
+      Confidential
+   },
    props: {
       address: {
          type: Object
@@ -100,6 +138,9 @@ export default {
       multiline() {
          //console.log(this.isMultiline, typeof this.isMultiline);
          return this.isMultiline === true ? "multiline" : "";
+      },
+      isConfidential() {
+         return this.address.confidential;
       }
    }
 };

From df661fc7c45d3c89abc5e48056f5cc57f3f57fa2 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 12:13:34 +0100
Subject: [PATCH 06/15] address: render blur address if confidential in address
 render box (twig)

---
 .../Resources/views/Entity/address.html.twig                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index ea8f18fc0..c265ca7e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address">
+    <li class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address">
+    <span class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address">
+    <div class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">

From 25ee11e4ff47a8c00d4b33253839319899a77f88 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 24 Jan 2022 13:48:47 +0100
Subject: [PATCH 07/15] upd CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 549276554..54fd4f5db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
+* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
+
 * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
 * [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
 

From ad8d40cb1c9384f710d7ad618cc92b956dcb677a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 27 Jan 2022 16:52:41 +0100
Subject: [PATCH 08/15] work on confidential / blur module

---
 src/Bundle/ChillMainBundle/Entity/Address.php |  2 +-
 .../Resources/public/module/blur/index.js     | 36 +++++++++----------
 .../public/vuejs/_components/Confidential.vue | 24 +++++++------
 .../Resources/views/Entity/address.html.twig  |  6 ++--
 .../views/AccompanyingCourse/index.html.twig  |  4 +--
 .../views/Entity/thirdparty.html.twig         |  2 +-
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index ef965f062..b717b33eb 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -48,7 +48,7 @@ class Address
      * @ORM\Column(type="boolean")
      * @Groups({"write"})
      */
-    private $confidential = false;
+    private bool $confidential = false;
 
     /**
      * @var string|null
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
index 6e3b75f2b..1d66d25e6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
@@ -1,21 +1,19 @@
 require('./blur.scss');
 
-var toggleBlur =  function(e){
-
-    var btn = e.target;
-
-    btn.previousElementSibling.classList.toggle("blur");
-    btn.classList.toggle("fa-eye");
-    btn.classList.toggle("fa-eye-slash");
-
-}
-
-var infos = document.getElementsByClassName("confidential");
-for(var i=0; i < infos.length; i++){
-    infos[i].insertAdjacentHTML('beforeend', '<i class="fa fa-eye toggle" aria-hidden="true"></i>');
-}
-
-var toggles = document.getElementsByClassName("toggle");
-for(var i=0; i < toggles.length; i++){
-    toggles[i].addEventListener("click", toggleBlur);
-}
\ No newline at end of file
+document.querySelectorAll('.confidential').forEach(function (el) {
+    let i = document.createElement('i');
+    const classes = ['fa', 'fa-eye', 'toggle'];
+    i.classList.add(...classes);
+    el.appendChild(i);
+    const toggleBlur = function(e) {
+        for (let child of el.children) {
+            if (!child.classList.contains('toggle')) {
+                child.classList.toggle('blur');
+            }
+        }
+        i.classList.toggle('fa-eye');
+        i.classList.toggle('fa-eye-slash');
+    }
+    i.addEventListener('click', toggleBlur);
+    toggleBlur();
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index efdf62926..0a34c4123 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -1,22 +1,26 @@
 <template>
-    <div class="confidential" v-on:click="toggleBlur">
-        <div class="confidential-content blur">
+    <div :class="classes">
+        <div class="confidential-content" :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <i class="fa fa-eye toggle" aria-hidden="true"></i>
+        <div>
+            <i class="fa fa-eye toggle" aria-hidden="true" @click="toggleBlur"></i>
+        </div>
     </div>
 </template>
 
 <script>
 export default {
     name: "Confidential",
+    data() {
+        return {
+            isBlurred: true,
+        };
+    },
     methods : {
-        toggleBlur: function(e){
-            if(e.target.matches('.toggle')){
-                e.target.previousElementSibling.classList.toggle("blur");
-                e.target.classList.toggle("fa-eye");
-                e.target.classList.toggle("fa-eye-slash");
-            }
+        toggleBlur() {
+            console.log('toggle blur');
+            this.isBlurred = !this.isBlurred;
         },
     }
 }
@@ -39,4 +43,4 @@ export default {
         -moz-filter: blur(5px);
         filter: blur(5px);
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index c265ca7e2..cccebabf5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
+    <li class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
+    <span class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address {% if address.confidential %}blur{% endif %}">
+    <div class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index ce95b8401..1aed45550 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -151,14 +151,14 @@
                     {% if accompanyingCourse.requestorPerson is not null %}
                         <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
                         {% if accompanyingCourse.requestorAnonymous %}
-                            <div class="confidential"><p class="blur">{{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}</p></div>
+                            <div class="confidential"><p>{{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}</p></div>
                         {% else %}
                             {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}
                         {% endif %}
                     {% elseif accompanyingCourse.requestorThirdParty is not null %}
                         <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
                         {% if accompanyingCourse.requestorAnonymous %}
-                            <div class="confidential"><p class="blur">{{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}</p></div>
+                            <div class="confidential"><p>{{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}</p></div>
                         {% else %}
                             {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}
                         {% endif %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
index 4f1e739a8..79aa7be6c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -99,7 +99,7 @@
         <div class="item-col">
         {% if options['isConfidential'] %}
             <div class="confidential">
-                <div class="confidential-content blur">
+                <div class="confidential-content">
                     <ul class="list-content fa-ul">
                         <li>
                             {{ thirdparty.getAddress|chill_entity_render_box({

From 0378df42b6b57cc31af2f1c26dcca55869c3ec6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 27 Jan 2022 17:08:00 +0100
Subject: [PATCH 09/15] fix cs

---
 .../Security/Authorization/ActivityVoterTest.php      |  4 ++++
 src/Bundle/ChillMainBundle/Entity/Address.php         |  2 --
 .../Entity/Embeddable/CommentEmbeddable.php           | 11 ++---------
 .../Entity/Workflow/EntityWorkflow.php                |  1 +
 .../Entity/Workflow/EntityWorkflowComment.php         |  1 +
 .../Tests/Export/ExportManagerTest.php                |  2 ++
 .../Authorization/AuthorizationHelperTest.php         |  3 +++
 .../Entity/Household/HouseholdComposition.php         |  1 +
 .../Entity/Person/PersonResource.php                  |  1 +
 .../AccompanyingPeriodResourceNormalizer.php          |  1 +
 .../Normalizer/AccompanyingPeriodWorkDenormalizer.php |  1 +
 .../Serializer/Normalizer/PersonJsonNormalizer.php    |  2 ++
 .../Tests/Security/Authorization/PersonVoterTest.php  |  2 ++
 .../Tests/Security/Authorization/ReportVoterTest.php  |  2 ++
 14 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
index b3d8472c6..3ca5aab45 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -29,9 +29,13 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class ActivityVoterTest extends KernelTestCase
 {
     use PrepareActivityTrait;
+
     use PrepareCenterTrait;
+
     use PreparePersonTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index b717b33eb..0e6cd549b 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -43,8 +43,6 @@ class Address
     private $buildingName;
 
     /**
-     * @var bool
-     *
      * @ORM\Column(type="boolean")
      * @Groups({"write"})
      */
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index 51b8978a0..3d5176860 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -20,10 +20,9 @@ use Doctrine\ORM\Mapping as ORM;
 class CommentEmbeddable
 {
     /**
-     * @var string
      * @ORM\Column(type="text", nullable=true)
      */
-    private $comment;
+    private ?string $comment;
 
     /**
      * @var DateTime
@@ -39,10 +38,7 @@ class CommentEmbeddable
      */
     private $userId;
 
-    /**
-     * @return string
-     */
-    public function getComment()
+    public function getComment(): ?string
     {
         return $this->comment;
     }
@@ -68,9 +64,6 @@ class CommentEmbeddable
         return empty($this->getComment());
     }
 
-    /**
-     * @param string $comment
-     */
     public function setComment(?string $comment)
     {
         $this->comment = $comment;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index b56435f5d..0d7142e9f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -37,6 +37,7 @@ use function count;
 class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
index b041a5aa3..9f4e7f096 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
@@ -24,6 +24,7 @@ use Doctrine\ORM\Mapping as ORM;
 class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 94266077a..82693b9c1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -44,7 +44,9 @@ use function count;
 final class ExportManagerTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     private Prophet $prophet;
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index f4984167f..32382713a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -34,8 +34,11 @@ use function in_array;
 final class AuthorizationHelperTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
+
     use ProphecyTrait;
 
     protected function setUp(): void
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
index a381fafd8..8aef3a0fa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
@@ -33,6 +33,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index cdd928598..3cd82680e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -34,6 +34,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
index 7ab284e44..472fa6d9b 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
@@ -29,6 +29,7 @@ use function count;
 class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
+
     use ObjectToPopulateTrait;
 
     private ResourceRepository $repository;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
index edbe07e47..e76c9cb55 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
@@ -33,6 +33,7 @@ use function is_array;
 class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInterface, DenormalizerAwareInterface
 {
     use DenormalizerAwareTrait;
+
     use ObjectToPopulateTrait;
 
     public const GROUP_CREATE = 'accompanying_period_work:create';
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index d6f9ced53..568926f79 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -40,7 +40,9 @@ class PersonJsonNormalizer implements
     NormalizerInterface
 {
     use DenormalizerAwareTrait;
+
     use NormalizerAwareTrait;
+
     use ObjectToPopulateTrait;
 
     private CenterResolverManagerInterface $centerResolverManager;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
index 43cf00452..f3caf6d36 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
@@ -29,7 +29,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class PersonVoterTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     /**
diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
index 9a78934db..8a312fb89 100644
--- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
@@ -28,7 +28,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class ReportVoterTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     /**

From 445fe0cee4b35d4224aec1182d1a423c9b1eeaa9 Mon Sep 17 00:00:00 2001
From: juminet <juminet@gmail.com>
Date: Thu, 27 Jan 2022 16:12:07 +0000
Subject: [PATCH 10/15] activity: order activities by date and by id

---
 CHANGELOG.md                                                  | 2 ++
 .../ChillActivityBundle/Controller/ActivityController.php     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ae9f3e9c..fb0ba2fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,12 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
 * [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
 * [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
 * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
 
+
 ## Test releases
 
 ### test release 2021-01-26
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 2947fda38..3e32edfce 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -256,7 +256,7 @@ final class ActivityController extends AbstractController
         if ($person instanceof Person) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
             $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null);
+                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
 
             $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
@@ -269,7 +269,7 @@ final class ActivityController extends AbstractController
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
             $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }

From 87e1f8f077c3ba236b217f0a1ea0058d406c6261 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 28 Jan 2022 09:47:36 +0100
Subject: [PATCH 11/15] hot fix: initialize typed comment in CommentEmbeddable

---
 .../ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index 3d5176860..61ebce10b 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -22,7 +22,7 @@ class CommentEmbeddable
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private ?string $comment;
+    private ?string $comment = null;
 
     /**
      * @var DateTime

From 8432c215a3d992131db34c8cf25de9450b73d5b3 Mon Sep 17 00:00:00 2001
From: juminet <juminet@gmail.com>
Date: Fri, 28 Jan 2022 08:49:59 +0000
Subject: [PATCH 12/15] filiations: small adjustments (colors, labels, ...)

---
 CHANGELOG.md                                  |  1 +
 .../Resources/public/vuejs/VisGraph/colors.js |  6 +++++
 .../Resources/public/vuejs/VisGraph/store.js  | 19 ++++++-------
 .../public/vuejs/VisGraph/vis-network.js      | 27 ++++++++++---------
 4 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/colors.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0ba2fef..a983ac15b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
 * [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
 * [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
 * [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/colors.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/colors.js
new file mode 100644
index 000000000..4f2cb2469
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/colors.js
@@ -0,0 +1,6 @@
+export const lightGreen = '#43b29d';
+export const darkGreen = '#368e7e';
+export const lightBrown = '#a2ac80';
+export const darkBrown = '#929d69';
+export const lightBlue = '#8d9dab';
+export const darkBlue = '#718596';
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index b5b1b56da..023faa679 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -2,6 +2,7 @@ import { createStore } from 'vuex'
 import { getHouseholdByPerson, getCoursesByPerson, getRelationshipsByPerson } from './api'
 import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getGender, getAge } from './vis-network'
 import {visMessages} from "./i18n";
+import { darkBlue, darkBrown, darkGreen, lightBlue, lightBrown, lightGreen } from './colors';
 
 const debug = process.env.NODE_ENV !== 'production'
 
@@ -172,8 +173,8 @@ const store = createStore({
                 id: 'relationship_' + splitId(link.id,'id')
                     + '-person_' + link.fromPerson.id + '-person_' + link.toPerson.id,
                 arrows: getRelationshipDirection(link),
-                color: 'lightblue',
-                font: { color: '#33839d' },
+                color: lightGreen,
+                font: { color: darkGreen },
                 dashes: true,
                 label: getRelationshipLabel(link),
                 title: getRelationshipTitle(link),
@@ -316,10 +317,10 @@ const store = createStore({
                     to: `${household.id}`,
                     id: `${household.id}-person_${m.person.id}`,
                     arrows: 'from',
-                    color: 'pink',
-                    font: { color: '#D04A60' },
+                    color: lightBrown,
+                    font: { color: darkBrown },
                     dashes: (getHouseholdWidth(m) === 1)? [0,4] : false,  //edge style:  [dash, gap, dash, gap]
-                    label: getHouseholdLabel(m),
+                    //label: getHouseholdLabel(m),
                     width: getHouseholdWidth(m),
                 })
                 if (!getters.isPersonLoaded(m.person.id)) {
@@ -375,8 +376,8 @@ const store = createStore({
                     to: `${course.id}`,
                     id: `accompanying_period_${splitId(course.id,'id')}-person_${p.person.id}`,
                     arrows: 'from',
-                    color: 'orange',
-                    font: { color: 'darkorange' },
+                    color: lightBlue,
+                    font: { color: darkBlue },
                 })
                 if (!getters.isPersonLoaded(p.person.id)) {
                     dispatch('addMissingPerson', [p.person, course])
@@ -428,8 +429,8 @@ const store = createStore({
                 id: 'relationship_' + splitId(relationship.id,'id')
                     + '-person_' + relationship.fromPerson.id + '-person_' + relationship.toPerson.id,
                 arrows: getRelationshipDirection(relationship),
-                color: 'lightblue',
-                font: { color: '#33839d' },
+                color: lightGreen,
+                font: { color: darkGreen },
                 dashes: true,
                 label: getRelationshipLabel(relationship),
                 title: getRelationshipTitle(relationship),
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
index 675ce63e9..ef87cb779 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -1,4 +1,5 @@
-import { visMessages } from './i18n'
+import { darkGreen, lightBlue, lightBrown, lightGreen } from './colors';
+import { visMessages } from './i18n';
 
 /**
  * Vis-network initial data/configuration script
@@ -15,12 +16,12 @@ window.options = {
     /*
     */
     configure: {
-        enabled: true,
+        enabled: false,
         filter: 'physics',
         showButton: true
     },
     physics: {
-        enabled: true,
+        enabled: false,
         barnesHut: {
             theta: 0.5,
             gravitationalConstant: -2000,
@@ -89,7 +90,7 @@ window.options = {
     edges: {
         font: {
             color: '#b0b0b0',
-            size: 9,
+            size: 14,
             face: 'arial',
             background: 'none',
             strokeWidth: 2, // px
@@ -112,30 +113,30 @@ window.options = {
             },
             color: {
                 border: '#b0b0b0',
-                background: 'rgb(193,229,222)',
+                background: lightGreen,
                 highlight: {
-                    border: '#89c9a9',
-                    background: 'rgb(156,213,203)'
+                    border: '#216458',
+                    background: darkGreen,
                 },
                 hover: {
-                    border: '#89c9a9',
-                    background: 'rgb(156,213,203)'
+                    border: '#216458',
+                    background: darkGreen,
                 }
             },
-            opacity: 0.85,
+            opacity: 0.9,
             shadow:{
                 enabled: true,
                 color: 'rgba(0,0,0,0.5)',
                 size:10,
                 x:5,
-                y:5
+                y:5,
             },
         },
         household: {
-            color: 'pink'
+            color: lightBrown,
         },
         accompanying_period: {
-            color: 'orange',
+            color: lightBlue,
         },
     }
 }

From 21edc74ada6e31541eab73b9d2b15f67314650eb Mon Sep 17 00:00:00 2001
From: juminet <juminet@gmail.com>
Date: Fri, 28 Jan 2022 09:48:00 +0000
Subject: [PATCH 13/15] residentialAddress

---
 CHANGELOG.md                                  |   3 +-
 .../Entity/ResidentialAddress.php             | 166 ++++++++++++++++++
 .../Form/Type/ResidentialAddressType.php      |  73 ++++++++
 .../ResidentialAddressRepository.php          |  59 +++++++
 .../migrations/Version20220125134253.php      |  48 +++++
 .../translations/messages.fr.yml              |   2 +
 .../ResidentialAddressController.php          | 161 +++++++++++++++++
 .../ChillPersonBundle/Entity/Person.php       |  14 +-
 .../Menu/PersonMenuBuilder.php                |  10 ++
 .../views/ResidentialAddress/_form.html.twig  |  37 ++++
 .../views/ResidentialAddress/delete.html.twig |  58 ++++++
 .../views/ResidentialAddress/edit.html.twig   |  51 ++++++
 .../views/ResidentialAddress/list.html.twig   | 116 ++++++++++++
 .../views/ResidentialAddress/new.html.twig    |  29 +++
 .../new_pick_kind.html.twig                   |  49 ++++++
 .../translations/messages.fr.yml              |  27 ++-
 16 files changed, 899 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php
 create mode 100644 src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/_form.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new_pick_kind.html.twig

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a983ac15b..78cc7e038 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,7 @@ and this project adheres to
 * [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
 * [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
 * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
-
-
+* [person] Add residential address entity, form and list for each person
 ## Test releases
 
 ### test release 2021-01-26
diff --git a/src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php b/src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php
new file mode 100644
index 000000000..7763ea9d5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity;
+
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
+ * @ORM\Table(name="chill_main_residential_address")
+ */
+class ResidentialAddress
+{
+    /**
+     * @ORM\ManyToOne(targetEntity=Address::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Address $address = null;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="residentialAddressComment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Person $hostPerson = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?ThirdParty $hostThirdParty = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private Person $person;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    public function __construct()
+    {
+        $this->comment = new CommentEmbeddable();
+    }
+
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getHostPerson(): ?Person
+    {
+        return $this->hostPerson;
+    }
+
+    public function getHostThirdParty(): ?ThirdParty
+    {
+        return $this->hostThirdParty;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setAddress(?Address $address): self
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setHostPerson(?Person $hostPerson): self
+    {
+        $this->hostPerson = $hostPerson;
+
+        return $this;
+    }
+
+    public function setHostThirdParty(?ThirdParty $hostThirdParty): self
+    {
+        $this->hostThirdParty = $hostThirdParty;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php b/src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php
new file mode 100644
index 000000000..0ebe47fef
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class ResidentialAddressType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('startDate', DateType::class, [
+                'required' => true,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('endDate', DateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('comment', CommentType::class, [
+                'required' => false,
+            ]);
+
+        if ('person' === $options['kind']) {
+            $builder
+                ->add('hostPerson', PickPersonDynamicType::class, [
+                    'label' => 'Person',
+                ]);
+        }
+
+        if ('thirdparty' === $options['kind']) {
+            $builder
+                ->add('hostThirdParty', PickThirdpartyDynamicType::class, [
+                    'label' => 'Third party',
+                ]);
+        }
+
+        if ('address' === $options['kind']) {
+            $builder
+                ->add('address', PickAddressType::class, [
+                    'required' => false,
+                    'label' => 'Address',
+                    'use_valid_from' => false,
+                    'use_valid_to' => false,
+                ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ResidentialAddress::class,
+            'kind' => null,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php
new file mode 100644
index 000000000..05cdfdf6c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ResidentialAddress|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ResidentialAddress|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ResidentialAddress[]    findAll()
+ * @method ResidentialAddress[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ResidentialAddressRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ResidentialAddress::class);
+    }
+
+    // /**
+    //  * @return ResidentialAddress[] Returns an array of ResidentialAddress objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('r')
+            ->andWhere('r.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('r.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+     */
+
+    /*
+    public function findOneBySomeField($value): ?ResidentialAddress
+    {
+        return $this->createQueryBuilder('r')
+            ->andWhere('r.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+     */
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php b/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
new file mode 100644
index 000000000..7bcf003f9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220125134253.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create a new entity ResidentialAddress.
+ */
+final class Version20220125134253 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_residential_address_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_residential_address');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Create a new entity ResidentialAddress';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_residential_address_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_residential_address (id INT NOT NULL, person_id INT NOT NULL, address_id INT DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, residentialAddressComment_comment TEXT DEFAULT NULL, residentialAddressComment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, residentialAddressComment_userId INT DEFAULT NULL, hostPerson_id INT DEFAULT NULL, hostThirdParty_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50217BBB47 ON chill_main_residential_address (person_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50DCA38092 ON chill_main_residential_address (hostPerson_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD508DFC48DC ON chill_main_residential_address (hostThirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50F5B7AF75 ON chill_main_residential_address (address_id)');
+        $this->addSql('COMMENT ON COLUMN chill_main_residential_address.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_residential_address.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50DCA38092 FOREIGN KEY (hostPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD508DFC48DC FOREIGN KEY (hostThirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50F5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 5c214367c..e8bd44dc5 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -52,6 +52,8 @@ Since %date%: Depuis le %date%
 since %date%: depuis le %date%
 Until %date%: Jusqu'au %date%
 until %date%: jusqu'au %date%
+Since: Depuis le
+Until: Jusqu'au
 #elements used in software
 centers: centres
 Centers: Centres
diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
new file mode 100644
index 000000000..8b266208a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Chill\MainBundle\Form\Type\ResidentialAddressType;
+use Chill\MainBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class ResidentialAddressController extends AbstractController
+{
+    private UrlGeneratorInterface $generator;
+
+    private ResidentialAddressRepository $residentialAddressRepository;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        UrlGeneratorInterface $generator,
+        TranslatorInterface $translator,
+        ResidentialAddressRepository $residentialAddressRepository
+    ) {
+        $this->generator = $generator;
+        $this->translator = $translator;
+        $this->residentialAddressRepository = $residentialAddressRepository;
+    }
+
+    /**
+     * @Route("/{_locale}/person/residential-address/{id}/delete", name="chill_person_residential_address_delete")
+     */
+    public function deleteAction(Request $request, ResidentialAddress $residentialAddress): Response
+    {
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $residentialAddress->getPerson());
+
+        $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'Delete']);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->remove($residentialAddress);
+            $em->flush();
+
+            $this->addFlash('success', $this->translator->trans('Residential address had been deleted'));
+
+            return $this->redirectToRoute('chill_person_residential_address_list', ['id' => $residentialAddress->getPerson()->getId()]);
+        }
+
+        return $this->render('@ChillPerson/ResidentialAddress/delete.html.twig', [
+            'person' => $residentialAddress->getPerson(),
+            'residentialAddress' => $residentialAddress,
+            'delete_form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @Route("/{_locale}/person/residential-address/{id}/edit", name="chill_person_residential_address_edit")
+     */
+    public function editAction(Request $request, ResidentialAddress $residentialAddress): Response
+    {
+        if ($request->query->has('kind')) {
+            $kind = $request->query->getAlpha('kind', '');
+        } else {
+            $kind = null;
+        }
+
+        $person = $residentialAddress->getPerson();
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person);
+
+        $form = $this->createForm(ResidentialAddressType::class, $residentialAddress, ['kind' => $kind]);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator
+                ->trans('The residential address was updated successfully'));
+
+            return $this->redirect(
+                $request->get('returnPath', null) ??
+                $this->generator->generate('chill_person_residential_address_list', ['id' => $person->getId()])
+            );
+        }
+
+        return $this->render('@ChillPerson/ResidentialAddress/edit.html.twig', [
+            'residentialAddress' => $residentialAddress,
+            'person' => $person,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @Route("/{_locale}/person/{id}/residential-address/list", name="chill_person_residential_address_list")
+     */
+    public function listAction(Request $request, Person $person): Response
+    {
+        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
+
+        $residentialAddresses = $this->residentialAddressRepository->findBy(['person' => $person], ['startDate' => 'DESC']);
+
+        return $this->render('@ChillPerson/ResidentialAddress/list.html.twig', [
+            'person' => $person,
+            'addresses' => $residentialAddresses,
+        ]);
+    }
+
+    /**
+     * @Route("/{_locale}/person/{id}/residential-address/new", name="chill_person_residential_address_new")
+     */
+    public function newAction(Request $request, Person $person): Response
+    {
+        $residentialAddress = new ResidentialAddress();
+        $residentialAddress->setPerson($person);
+
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person);
+
+        if (!$request->query->has('kind')) {
+            return $this->render('@ChillPerson/ResidentialAddress/new_pick_kind.html.twig', ['person' => $person]);
+        }
+        $kind = $request->query->getAlpha('kind', '');
+
+        $form = $this->createForm(ResidentialAddressType::class, $residentialAddress, ['kind' => $kind]);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->persist($residentialAddress);
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator
+                ->trans('The new residential address was created successfully'));
+
+            return $this->redirect(
+                $request->get('returnPath', null) ??
+                $this->generator->generate('chill_person_residential_address_list', ['id' => $residentialAddress->getPerson()->getId()])
+            );
+        }
+
+        return $this->render('@ChillPerson/ResidentialAddress/new.html.twig', [
+            'person' => $person,
+            'form' => $form->createView(),
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index c588b70a3..e908dc489 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -784,12 +784,18 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * If the `$at` parameter is now, use the method `getCurrentPersonAddress`, which is optimized
      * on database side.
      *
+     * @deprecated since chill2.0, address is linked to the household. Use @see{Person::getCurrentHouseholdAddress}
+     *
      * @throws Exception
      */
-    public function getAddressAt(?DateTime $at = null): ?Address
+    public function getAddressAt(?DateTimeInterface $at = null): ?Address
     {
         $at ??= new DateTime('now');
 
+        if ($at instanceof DateTimeImmutable) {
+            $at = DateTime::createFromImmutable($at);
+        }
+
         /** @var ArrayIterator $addressesIterator */
         $addressesIterator = $this->getAddresses()
             ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
@@ -950,6 +956,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             : null;
     }
 
+    /**
+     * Get the household address at the given date.
+     *
+     * if the given date is 'now', use instead @see{getCurrentPersonAddress}, which is optimized on
+     * database side.
+     */
     public function getCurrentHouseholdAddress(?DateTimeImmutable $at = null): ?Address
     {
         if (
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 229b2d373..16422f47c 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -62,6 +62,16 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 50,
             ]);
 
+        $menu->addChild($this->translator->trans('Residential addresses'), [
+            'route' => 'chill_person_residential_address_list',
+            'routeParameters' => [
+                'id' => $parameters['person']->getId(),
+            ],
+        ])
+            ->setExtras([
+                'order' => 60,
+            ]);
+
         $menu->addChild($this->translator->trans('household.person history'), [
             'route' => 'chill_person_household_person_history',
             'routeParameters' => [
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/_form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/_form.html.twig
new file mode 100644
index 000000000..22add892d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/_form.html.twig
@@ -0,0 +1,37 @@
+
+
+{{ form_start(form) }}
+
+{{ form_row(form.startDate) }}
+{{ form_row(form.endDate) }}
+
+{% if form.hostPerson is defined %}
+    {{ form_row(form.hostPerson) }}
+{% endif %}
+
+{% if form.hostThirdParty is defined %}
+    {{ form_row(form.hostThirdParty) }}
+{% endif %}
+
+{% if form.address is defined %}
+    {{ form_row(form.address) }}
+
+    {% block js %}
+    {{ encore_entry_script_tags('mod_input_address') }}
+    {% endblock %}
+
+    {% block css %}
+        {{ encore_entry_link_tags('mod_input_address') }}
+    {% endblock %}
+{% endif %}
+
+{{ form_row(form.comment) }}
+
+
+<ul class="record_actions sticky-form-buttons">
+    <li>
+        <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+    </li>
+</ul>
+
+{{ form_end(form) }}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
new file mode 100644
index 000000000..3171af58d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig
@@ -0,0 +1,58 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete residential address'|trans }}{% endblock %}
+
+{% block personcontent %}
+<div class="address-new">
+
+    <h1>{{ block('title') }}</h1>
+    {% set a = residentialAddress %}
+    <ul class="list-content fa-ul">
+        {% if a.hostPerson is not null %}
+        <li>
+            <i class="fa fa-li fa-home"></i>
+            <span class="item-key">{{ "Address of"|trans}} </span>
+            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+        </li>
+        <li>
+            {% set address_date = date(a.startDate|date("m/d/Y")) %}
+            {% if a.hostPerson.getCurrentHouseholdAddress(a.endDate) is not null %}
+                <i class="fa fa-li fa-map-marker"></i>
+                {{ a.hostPerson.getCurrentHouseholdAddress(a.endDate)|chill_entity_render_box }}
+            {% endif %}
+        </li>
+        {% elseif a.hostThirdParty is not null %}
+        <li>
+            <i class="fa fa-li fa-home"></i>
+            <span class="item-key">{{ "Address of"|trans}}</span>
+            <span class="chill-entity entity-person badge-person">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+        </li>
+        <li>
+            {% if a.hostThirdParty.address is not null %}
+                <i class="fa fa-li fa-map-marker"></i>
+                {{ a.hostThirdParty.address|chill_entity_render_box }}
+            {% endif %}
+        </li>
+        {% else %}
+        <li>
+            {% if a.address is not null %}
+                <i class="fa fa-li fa-map-marker"></i>
+                {{ a.address|chill_entity_render_box }}
+            {% endif %}
+            {% endif %}
+        </li>
+    </ul>
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Delete residential address ?'|trans,
+            'confirm_question'  : 'Are you sure you want to remove this residential address for %name% ?'|trans({'%name%': person|chill_entity_render_string }),
+            'cancel_route'      : 'chill_person_residential_address_list',
+            'cancel_parameters' : {'id' : person.Id},
+            'form'              : delete_form
+        } ) }}
+
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
new file mode 100644
index 000000000..b84bd2543
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
@@ -0,0 +1,51 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = '' %}
+
+{% block title 'Edit a residential address'|trans %}
+
+{% block personcontent %}
+<div class="address-edit">
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {{ form_start(form) }}
+
+        {{ form_row(form.startDate) }}
+        {{ form_row(form.endDate) }}
+
+        {% if residentialAddress.address is not null %}
+
+            {% if form.address is defined %}
+                {{ form_row(form.address) }}
+
+                {% block js %}
+                {{ encore_entry_script_tags('mod_input_address') }}
+                {% endblock %}
+
+                {% block css %}
+                    {{ encore_entry_link_tags('mod_input_address') }}
+                {% endblock %}
+            {% endif %}
+        {% endif %}
+
+        {{ form_row(form.comment) }}
+
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ chill_path_add_return_path('chill_person_residential_address_list', {'id': person.id}) }}" class="btn btn-cancel">
+                    {{ 'Cancel'|trans|chill_return_path_label }}
+                </a>
+            </li>
+            <li>
+                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+
+        {{ form_end(form) }}
+
+    {% endblock %}
+
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
new file mode 100644
index 000000000..0eebf7e5d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -0,0 +1,116 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Residential addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
+
+{% block personcontent %}
+<div class="person-address">
+
+    <h1>{{ 'Residential addresses history'|trans }}</h1>
+
+    {% if is_granted('CHILL_PERSON_SEE', person) %}
+
+        {% if addresses|length == 0 %}
+            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+
+        {% else %}
+            <div class="flex-table">
+            {% for a in addresses %}
+
+                {% if a.address is not null %}
+                    {% set kind = 'address' %}
+                {% else %}
+                    {% set kind = null %}
+                {% endif %}
+
+                <div class="item-bloc">
+                    <div class="item-row">
+
+                        <div class="item-col" style="width: 33%;">
+                            <ul class="list-unstyled h3">
+                                {% if a.endDate is not null %}
+                                <li><span class="item-key">{{'Since'|trans}} : </span>{{ a.startDate|format_date('long') }}</li>
+                                {% endif %}
+                                <li><span class="item-key">{{'Until'|trans}} : </span><b>{{ a.endDate|format_date('long') }}</b></li>
+                            </ul>
+                        </div>
+                        <div class="item-col flex-column justify-content-start">
+                            <div class="float-button top">
+                                <div class="box">
+                                    <div class="action">
+                                        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+                                            <a href="{{ path('chill_person_residential_address_edit', { 'id' : a.id, 'kind' : kind } ) }}" class="btn btn-update" title="{{ 'Update'|trans|e('html_attr') }}"></a>
+                                            <a href="{{ path('chill_person_residential_address_delete', { 'id' : a.id, 'kind' : kind } ) }}" class="btn btn-delete" title="{{ 'Delete'|trans|e('html_attr') }}"></a>
+                                        {% endif %}
+                                    </div>
+                                    <ul class="list-content fa-ul">
+                                        {% if a.hostPerson is not null %}
+                                        <li>
+                                            <i class="fa fa-li fa-home"></i>
+                                            <span class="item-key">{{ "Address of"|trans}} </span>
+                                            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+                                        </li>
+                                        <li>
+                                            {% set address_date = date(a.startDate|date("m/d/Y")) %}
+                                            {% if a.hostPerson.getCurrentHouseholdAddress(a.endDate) is not null %}
+                                                <i class="fa fa-li fa-map-marker"></i>
+                                                {{ a.hostPerson.getCurrentHouseholdAddress(a.endDate)|chill_entity_render_box }}
+                                            {% endif %}
+                                        </li>
+                                        {% elseif a.hostThirdParty is not null %}
+                                        <li>
+                                            <i class="fa fa-li fa-home"></i>
+                                            <span class="item-key">{{ "Address of"|trans}}</span>
+                                            <span class="chill-entity entity-person badge-person">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+                                        </li>
+                                        <li>
+                                            {% if a.hostThirdParty.address is not null %}
+                                            <i class="fa fa-li fa-map-marker"></i>
+                                            {{ a.hostThirdParty.address|chill_entity_render_box }}
+                                            {% endif %}
+                                        </li>
+                                        {% else %}
+                                        <li>
+                                            {% if a.address is not null %}
+                                                <i class="fa fa-li fa-map-marker"></i>
+                                                {{ a.address|chill_entity_render_box }}
+                                            {% endif %}
+                                        {% endif %}
+                                        </li>
+                                    </ul>
+                                    <div class="item-row">
+                                        {% if not a.comment.isEmpty %}
+                                            {{ a.comment|chill_entity_render_box }}
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            {% endfor %}
+            </div>
+        {% endif %}
+
+
+    {% endif %}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_view', { 'person_id' : person.id } ) }}" class="btn btn-cancel">
+                {{ 'Back to the person details'|trans }}
+            </a>
+        </li>
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+        <li>
+            <a class="btn btn-create"
+                href="{{ path('chill_person_residential_address_new', { 'id' : person.id } ) }}">
+                {{ 'Add a residential address'|trans }}
+            </a>
+        </li>
+        {% endif %}
+    </ul>
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
new file mode 100644
index 000000000..dd4b1cbe0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'New residential address'|trans }}{% endblock %}
+
+{% block personcontent %}
+<div class="address-new">
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {# TODO #}
+        {% block form %}
+            {% include '@ChillPerson/ResidentialAddress/_form.html.twig' %}
+        {% endblock %}
+
+    {% endblock %}
+
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new_pick_kind.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new_pick_kind.html.twig
new file mode 100644
index 000000000..3cc4af6c9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new_pick_kind.html.twig
@@ -0,0 +1,49 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title 'Which kind of residential address would you create ?'|trans %}
+
+{% block content %}
+<div class="col-10 centered">
+    <h1>{{ block('title') }}</h1>
+
+    <div class="container" style="margin-top: 2rem;">
+        <div class="row">
+           <div class="col-md-4 mb-4">
+               <a
+                   href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'person'}) }}"
+                   class="btn btn-outline-chill-green-dark">
+                   {{ 'The address of another person'|trans }}
+               </a>
+           </div>
+           <div class="col-md-8">
+               <p>{{ 'residential_address_person_explanation'|trans  }}</p>
+           </div>
+        </div>
+        <div class="row">
+            <div class="col-md-4 mb-4">
+                <a
+                    href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'thirdparty'}) }}"
+                    class="btn btn-outline-chill-green-dark">
+                    {{ 'The address of a third party'|trans }}
+                </a>
+            </div>
+            <div class="col-md-8">
+                <p>{{ 'residential_address_third_party_explanation'|trans  }}</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-4 mb-4">
+                <a
+                    href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'address'}) }}"
+                    class="btn btn-outline-chill-green-dark">
+                    {{ 'A new address'|trans }}
+                </a>
+            </div>
+            <div class="col-md-8">
+                <p>{{ 'residential_address_new_address_explanation'|trans  }}</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2d6ff4c1e..37c5afb93 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -121,7 +121,6 @@ address_postcode_code: Code postal
 address_country_name: Pays
 address_country_code: Code pays
 
-
 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
 'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement"
@@ -243,6 +242,7 @@ Select a thirdparty: "Choisissez un tiers"
 # pickAPersonType
 Pick a person: Choisir une personne
 
+# Address
 No address given: Pas d'adresse renseignée
 The address has been successfully updated: L'adresse a été mise à jour avec succès
 Update address for %name%: Mettre à jour une adresse pour %name%
@@ -257,6 +257,31 @@ The new address was created successfully: La nouvelle adresse a été créée
 Add an address: Ajouter une adresse
 Back to the person details: Retour aux détails de la personne
 
+# Residential address
+Residential addresses history for %name%: Historique des adresses de résidence de %name%
+Residential addresses history: Historique des adresses de résidence
+Add a residential address: Ajouter une adresse de résidence
+Which kind of residential address would you create ?: Quel type d'adresse de résidence voulez-vous créer?
+The address of another person: L'adresse d'une autre personne
+The address of a third party: L'adresse d'un tiers
+A new address: Une nouvelle adresse
+residential_address_person_explanation: L'adresse sera positionnée auprès d'un usager. Lorsque l'usager déménage, l'adresse de résidence suivra également cet usager
+residential_address_third_party_explanation: L'adresse sera associée à celle d'un tiers.
+residential_address_new_address_explanation: Créer une nouvelle adresse. L'adresse sera fixe.
+New residential address: Nouvelle adresse de résidence
+Host person: Choisir l'adresse d'un usager
+Host third party: Choisir l'adresse d'un tiers
+The new residential address was created successfully: La nouvelle adresse de résidence a été créée
+Edit a residential address: Modifier l'addresse de résidence
+The residential address was updated successfully: L'adresse de résidence a été mise à jour
+Residential addresses: Adresses de résidence
+Address of: Adresse de
+Delete residential address: Supprimer l'adresse de résidence
+Delete residential address ?: Supprimer l'adresse de résidence ?
+Are you sure you want to remove this residential address for %name% ?: Êtes-vous sûr de vouloir supprimer l'adresse de résidence pour %name% ?
+Residential address had been deleted: L'adresse de résidence a été supprimée
+
+
 #timeline
 Timeline: Historique
 Closing the accompanying period: Fermeture de la période d'accompagnement

From 792eafce72f10e39716793b4b286f47627ee86f9 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 28 Jan 2022 09:55:26 +0000
Subject: [PATCH 14/15] dynamic picker aside activity

---
 CHANGELOG.md                                  |  3 ++-
 .../Controller/AsideActivityController.php    |  2 ++
 .../src/Form/AsideActivityFormType.php        | 22 +++++--------------
 .../views/asideActivity/new.html.twig         | 13 ++++++++++-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78cc7e038..1833bd89c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to
 * [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
 * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
 * [person] Add residential address entity, form and list for each person
+* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
+
 ## Test releases
 
 ### test release 2021-01-26
@@ -28,7 +30,6 @@ and this project adheres to
 * dispatching list
 
 
-
 ### test release 2022-01-24
 
 * [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index eee8c7dc8..e5244009e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -32,6 +32,8 @@ final class AsideActivityController extends CRUDController
     {
         $asideActivity = new AsideActivity();
 
+        $asideActivity->setAgent($this->getUser());
+
         $duration = $request->query->get('duration', '300');
         $duration = DateTime::createFromFormat('U', $duration);
         $asideActivity->setDuration($duration);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 5a4eec9e0..6ade55d07 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -14,9 +14,9 @@ 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\Form\Type\PickUserDynamicType;
 use DateInterval;
 use DateTime;
 use DateTimeImmutable;
@@ -68,22 +68,10 @@ final class AsideActivityFormType extends AbstractType
         ];
 
         $builder
-            ->add(
-                'agent',
-                EntityType::class,
-                [
-                    'label' => 'For agent',
-                    'required' => true,
-                    'class' => User::class,
-                    'data' => $this->storage->getToken()->getUser(),
-                    'query_builder' => static function (EntityRepository $er) {
-                        return $er->createQueryBuilder('u')->where('u.enabled = true');
-                    },
-                    'attr' => ['class' => 'select2 '],
-                    'placeholder' => 'Choose the agent for whom this activity is created',
-                    'choice_label' => 'username',
-                ]
-            )
+            ->add('agent', PickUserDynamicType::class, [
+                'label' => 'For agent',
+                'required' => true,
+            ])
             ->add(
                 'date',
                 ChillDateType::class,
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
index 0781272a1..09acf9859 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
@@ -1,5 +1,15 @@
 {% extends '@ChillMain/Admin/layout.html.twig' %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block title %}
 {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
@@ -8,4 +18,5 @@
 {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
     {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+

From ae33392ad09e25450cf9b0e80091c070b831a4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 28 Jan 2022 10:58:24 +0100
Subject: [PATCH 15/15] update changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1833bd89c..f60770f36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+
+## Test releases
+
+### test release 2021-01-28
+
 * [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
 * [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
 * [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
@@ -19,7 +24,6 @@ and this project adheres to
 * [person] Add residential address entity, form and list for each person
 * [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
 
-## Test releases
 
 ### test release 2021-01-26