From 88362bd284a1c77e8ab00b1a1b0d9625e8d7f386 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Aug 2021 17:46:51 +0200
Subject: [PATCH 001/217] start of updating personrenderbox to display age.
 only one scenario done

---
 .../Resources/public/vuejs/_js/i18n.js        |  3 ++-
 .../_components/Entity/PersonRenderBox.vue    | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 84db72236..9c28c9fdb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -76,7 +76,8 @@ const messages = {
          birthday: {
             man: "Né le",
             woman: "Née le"
-         } ,
+         },
+         years_old: "ans",
          no_data: "Aucune information renseignée",
          type: {
             thirdparty: "Tiers",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 464e2190e..0a8a8da9f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -27,7 +27,7 @@
 
                 </div>
 
-                <p v-if="this.options.addInfo == true" class="moreinfo">
+                <p v-if="options.addInfo == true" class="moreinfo">
                     <i :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
                     <time v-if="person.birthdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
                         {{ $t(getGender) + ' ' + $d(birthdate, 'text') }}
@@ -35,7 +35,7 @@
                     <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <!-- <span class="age">{{ person.age }}</span> -->
+                    <span v-if="options.addAge" class="age">{{ getAge }} {{ $t('renderbox.years_old')}}</span>
                 </p>
             </div>
         </div>
@@ -114,12 +114,14 @@ export default {
             return this.person.gender == 'woman' ? 'fa-venus' : this.person.gender == 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
-            var date = new Date(this.person.birthdate.datetime);
+            const date = new Date(this.person.birthdate.datetime);
             return dateToISO(date);
         },
         deathdate: function(){
-            var date = new Date(this.person.deathdate.datetime);
+            if(this.person.deathdate){
+            const date = new Date(this.person.deathdate.datetime);
             return dateToISO(date);
+            }
         },
         altNameLabel: function(){
             for(let i = 0; i < this.person.altNames.length; i++){
@@ -131,6 +133,12 @@ export default {
                 return this.person.altNames[i].key
             }
         },
+        getAge: function(){
+            if(this.person.birthdate && !this.person.deathdate){
+                const birthday = new Date(this.person.birthdate.datetime)
+                const now = new Date()
+                return (now.getFullYear() - birthday.getFullYear())
+        }
     }
 }
 </script>
@@ -153,6 +161,12 @@ div.flex-table {
       }
    }
 }
+
+.age{
+    margin-left: 0.5em;
+    &:before { content: '('; }
+    &:after { content: ')'; }
+}
 </style>
 
 

From 5194cad354ebb8873d66c362399a8e289f7d35cb Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 26 Aug 2021 14:53:04 +0200
Subject: [PATCH 002/217] Adaptations for display of age and deathdate
 (different scenarios not all finished)

---
 .../Resources/public/vuejs/_js/i18n.js        |  1 +
 .../_components/Entity/PersonRenderBox.vue    | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 9c28c9fdb..593d76f7d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -77,6 +77,7 @@ const messages = {
             man: "Né le",
             woman: "Née le"
          },
+         deathdate: "Date de décès",
          years_old: "ans",
          no_data: "Aucune information renseignée",
          type: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 0a8a8da9f..f886a3d29 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -28,12 +28,16 @@
                 </div>
 
                 <p v-if="options.addInfo == true" class="moreinfo">
+                    {{ person.deathdate }}
                     <i :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
-                    <time v-if="person.birthdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
-                        {{ $t(getGender) + ' ' + $d(birthdate, 'text') }}
+                    <time v-if="person.birthdate && !person.deathdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
+                        {{ $t(getGenderTranslation) + ' ' + $d(birthdate, 'text') }}
+                    </time>
+                    <time v-else-if="person.birthdate && person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
+                        {{ birthdate }} - {{ deathdate }}
                     </time>
                     <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
-                        {{ birthdate }} - {{ deathdate }}
+                        {{ $t('renderbox.deathdate') + ' ' + deathdate }}
                     </time>
                     <span v-if="options.addAge" class="age">{{ getAge }} {{ $t('renderbox.years_old')}}</span>
                 </p>
@@ -100,7 +104,7 @@ export default {
     },
     props: ['person', 'options'],
     computed: {
-        getGender: function() {
+        getGenderTranslation: function() {
             return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
         },
         isMultiline: function() {
@@ -138,6 +142,17 @@ export default {
                 const birthday = new Date(this.person.birthdate.datetime)
                 const now = new Date()
                 return (now.getFullYear() - birthday.getFullYear())
+            } else if(this.person.birthdate && this.person.deathdate){
+                    const birthday = new Date(this.person.birthdate.datetime)
+                    const deathdate = new Date(this.person.deathdate.datetime)
+                    return (deathdate.getFullYear() - birthday.getFullYear())
+            } else if(!this.person.birthdate && this.person.deathdate.datetime) {
+                // todo: change this
+                    return "Age unknown"
+            } else {
+                // todo: change this
+                    return "Age unknown"
+            }
         }
     }
 }

From c5f40c53ea258e8dd982ed43f87816ddb2e71993 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 26 Aug 2021 16:42:33 +0200
Subject: [PATCH 003/217] further adaptations to display deathdate. deathdate
 added to what API returns

---
 .../PersonsAssociated/ParticipationItem.vue   |   2 +-
 .../_components/Entity/PersonRenderBox.vue    |   9 +-
 .../Normalizer/PersonNormalizer.php           |   2 +
 .../ChillPersonBundle/chill.api.specs.yaml    | 138 ++++++++----------
 4 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 04c6b73a9..704f66be3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -6,7 +6,7 @@
                addEntity: false,
                addLink: false,
                addAltNames: true,
-               addAge : false,
+               addAge : true,
                hLevel : 3,
             }"
       :person="participation.person">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index f886a3d29..82948a37a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -28,7 +28,6 @@
                 </div>
 
                 <p v-if="options.addInfo == true" class="moreinfo">
-                    {{ person.deathdate }}
                     <i :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
                     <time v-if="person.birthdate && !person.deathdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
                         {{ $t(getGenderTranslation) + ' ' + $d(birthdate, 'text') }}
@@ -39,7 +38,7 @@
                     <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
                         {{ $t('renderbox.deathdate') + ' ' + deathdate }}
                     </time>
-                    <span v-if="options.addAge" class="age">{{ getAge }} {{ $t('renderbox.years_old')}}</span>
+                    <span v-if="options.addAge && person.birthdate" class="age">{{ getAge }} {{ $t('renderbox.years_old')}}</span>
                 </p>
             </div>
         </div>
@@ -118,13 +117,15 @@ export default {
             return this.person.gender == 'woman' ? 'fa-venus' : this.person.gender == 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
+            if(this.person.birthdate){
             const date = new Date(this.person.birthdate.datetime);
-            return dateToISO(date);
+            return dateToISO(date)
+            }
         },
         deathdate: function(){
             if(this.person.deathdate){
             const date = new Date(this.person.deathdate.datetime);
-            return dateToISO(date);
+            return date.toLocaleDateString("fr-FR");
             }
         },
         altNameLabel: function(){
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
index cde495f52..3dabb43cb 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
@@ -69,6 +69,7 @@ class PersonNormalizer implements
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
             'birthdate' => $this->normalizer->normalize($person->getBirthdate()),
+            'deathdate' => $this->normalizer->normalize($person->getDeathdate()),
             'center' => $this->normalizer->normalize($person->getCenter()),
             'phonenumber' => $person->getPhonenumber(),
             'mobilenumber' => $person->getMobilenumber(),
@@ -125,6 +126,7 @@ class PersonNormalizer implements
 
         foreach ([
             'birthdate' => \DateTime::class,
+            'deathdate' => \DateTime::class,
             'center' => Center::class
         ] as $item => $class) {
             if (\array_key_exists($item, $data)) {
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index 1b2c9cd85..020fa409f 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -45,7 +45,7 @@ components:
         type:
           type: string
           enum:
-            - 'person'
+            - "person"
         firstName:
           type: string
         lastName:
@@ -55,7 +55,9 @@ components:
           description: a canonical representation for the person name
           readOnly: true
         birthdate:
-          $ref: '#/components/schemas/Date'
+          $ref: "#/components/schemas/Date"
+        deathdate:
+          $ref: "#/components/schemas/Date"
         phonenumber:
           type: string
         mobilenumber:
@@ -78,7 +80,7 @@ components:
         type:
           type: string
           enum:
-            - 'person'
+            - "person"
       required:
         - id
         - type
@@ -96,7 +98,7 @@ components:
         type:
           type: string
           enum:
-            - 'thirdparty'
+            - "thirdparty"
       required:
         - id
         - type
@@ -119,15 +121,15 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_resource'
+            - "accompanying_period_resource"
           readOnly: true
         id:
           type: integer
           readOnly: true
         resource:
           anyOf:
-            - $ref: '#/components/schemas/PersonById'
-            - $ref: '#/components/schemas/ThirdPartyById'
+            - $ref: "#/components/schemas/PersonById"
+            - $ref: "#/components/schemas/ThirdPartyById"
     ResourceById:
       type: object
       properties:
@@ -136,7 +138,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_resource'
+            - "accompanying_period_resource"
       required:
         - id
         - type
@@ -146,7 +148,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_comment'
+            - "accompanying_period_comment"
           readOnly: true
         id:
           type: integer
@@ -161,7 +163,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_comment'
+            - "accompanying_period_comment"
       required:
         - id
         - type
@@ -173,7 +175,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_issue'
+            - "social_issue"
         parent_id:
           type: integer
           readOnly: true
@@ -195,12 +197,12 @@ components:
     Household:
       type: object
       properties:
-          id:
-            type: integer
-          type:
-            type: string
-            enum:
-              - 'household'
+        id:
+          type: integer
+        type:
+          type: string
+          enum:
+            - "household"
     HouseholdPosition:
       type: object
       properties:
@@ -209,7 +211,7 @@ components:
         type:
           type: string
           enum:
-            - 'household_position'
+            - "household_position"
     AccompanyingCourseWork:
       type: object
       properties:
@@ -218,7 +220,7 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_work'
+            - "accompanying_period_work"
         note:
           type: string
         startDate:
@@ -243,15 +245,15 @@ components:
         type:
           type: string
           enum:
-            - 'accompanying_period_work_goal'
+            - "accompanying_period_work_goal"
         note:
           type: string
         goal:
-          $ref: '#/components/schemas/SocialWorkGoalById'
+          $ref: "#/components/schemas/SocialWorkGoalById"
         results:
           type: array
           items:
-            $ref: '#/components/schemas/SocialWorkGoalById'
+            $ref: "#/components/schemas/SocialWorkGoalById"
 
     SocialWorkResultById:
       type: object
@@ -261,7 +263,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_work_result'
+            - "social_work_result"
     SocialWorkGoalById:
       type: object
       properties:
@@ -270,7 +272,7 @@ components:
         type:
           type: string
           enum:
-            - 'social_work_goal'
+            - "social_work_goal"
 
 paths:
   /1.0/person/person/{id}.json:
@@ -308,7 +310,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Person'
+              $ref: "#/components/schemas/Person"
       responses:
         200:
           description: "OK"
@@ -355,18 +357,17 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
 
-
   /1.0/person/address/suggest/by-person/{id}.json:
     get:
       tags:
         - address
       summary: get a list of suggested address for a person
       description: >
-          The address are computed from various source. Currently:
+        The address are computed from various source. Currently:
 
-          - the address of course to which the person is participating
+        - the address of course to which the person is participating
 
-          The current person's address is always ignored.
+        The current person's address is always ignored.
       parameters:
         - name: id
           in: path
@@ -390,11 +391,11 @@ paths:
         - address
       summary: get a list of suggested address for a household
       description: >
-          The address are computed from various source. Currently:
+        The address are computed from various source. Currently:
 
-          - the address of course to which the members is participating
+        - the address of course to which the members is participating
 
-          The current household address is always ignored.
+        The current household address is always ignored.
       parameters:
         - name: id
           in: path
@@ -452,7 +453,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/AccompanyingPeriod'
+              $ref: "#/components/schemas/AccompanyingPeriod"
             examples:
               Set the requestor as anonymous:
                 value:
@@ -488,7 +489,7 @@ paths:
                   id: 0
                   personLocation: null
                   addressLocation:
-                      id: 7960
+                    id: 7960
       responses:
         401:
           description: "Unauthorized"
@@ -520,8 +521,8 @@ paths:
           application/json:
             schema:
               oneOf:
-                - $ref: '#/components/schemas/PersonById'
-                - $ref: '#/components/schemas/ThirdPartyById'
+                - $ref: "#/components/schemas/PersonById"
+                - $ref: "#/components/schemas/ThirdPartyById"
             examples:
               add person with id 50:
                 summary: "a person with id 50"
@@ -585,7 +586,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PersonById'
+              $ref: "#/components/schemas/PersonById"
       responses:
         401:
           description: "Unauthorized"
@@ -614,7 +615,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PersonById'
+              $ref: "#/components/schemas/PersonById"
       responses:
         401:
           description: "Unauthorized"
@@ -645,7 +646,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Resource'
+              $ref: "#/components/schemas/Resource"
             examples:
               add person with id 50:
                 summary: "a person with id 50"
@@ -690,7 +691,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ResourceById'
+              $ref: "#/components/schemas/ResourceById"
       responses:
         401:
           description: "Unauthorized"
@@ -721,7 +722,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Comment'
+              $ref: "#/components/schemas/Comment"
             examples:
               a single comment:
                 summary: "a simple comment"
@@ -759,7 +760,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/CommentById'
+              $ref: "#/components/schemas/CommentById"
       responses:
         401:
           description: "Unauthorized"
@@ -790,7 +791,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Scope'
+              $ref: "#/components/schemas/Scope"
             examples:
               add a scope:
                 value:
@@ -824,7 +825,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ScopeById'
+              $ref: "#/components/schemas/ScopeById"
       responses:
         401:
           description: "Unauthorized"
@@ -855,7 +856,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/SocialIssue'
+              $ref: "#/components/schemas/SocialIssue"
             examples:
               add a social issue:
                 value:
@@ -889,7 +890,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/SocialIssue'
+              $ref: "#/components/schemas/SocialIssue"
       responses:
         401:
           description: "Unauthorized"
@@ -926,11 +927,11 @@ paths:
                 type:
                   type: string
                   enum:
-                    - 'accompanying_period_work'
+                    - "accompanying_period_work"
                 startDate:
-                  $ref: '#/components/schemas/Date'
+                  $ref: "#/components/schemas/Date"
                 endDate:
-                  $ref: '#/components/schemas/Date'
+                  $ref: "#/components/schemas/Date"
             examples:
               create a work:
                 value:
@@ -992,7 +993,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/AccompanyingCourseWork'
+              $ref: "#/components/schemas/AccompanyingCourseWork"
       responses:
         401:
           description: "Unauthorized"
@@ -1029,8 +1030,6 @@ paths:
         400:
           description: "transition cannot be applyed"
 
-
-
   /1.0/person/accompanying-period/origin.json:
     get:
       tags:
@@ -1064,8 +1063,6 @@ paths:
         404:
           description: "Not found"
 
-
-
   /1.0/person/household.json:
     get:
       tags:
@@ -1095,7 +1092,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Household'
+                $ref: "#/components/schemas/Household"
         404:
           description: "not found"
         401:
@@ -1107,9 +1104,9 @@ paths:
         - household
       summary: Return households associated with the given person through accompanying periods
       description: |
-          Return households associated with the given person throught accompanying periods participation.
+        Return households associated with the given person throught accompanying periods participation.
 
-          The current household of the given person is excluded.
+        The current household of the given person is excluded.
       parameters:
         - name: person_id
           in: path
@@ -1125,7 +1122,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Household'
+                $ref: "#/components/schemas/Household"
         404:
           description: "not found"
         401:
@@ -1149,23 +1146,22 @@ paths:
                     type: object
                     properties:
                       person:
-                        $ref: '#/components/schemas/PersonById'
+                        $ref: "#/components/schemas/PersonById"
                       start_date:
-                        $ref: '#/components/schemas/Date'
+                        $ref: "#/components/schemas/Date"
                       position:
-                        $ref: '#/components/schemas/HouseholdPosition'
+                        $ref: "#/components/schemas/HouseholdPosition"
                       holder:
                         type: boolean
                       comment:
                         type: string
                 destination:
-                  $ref: '#/components/schemas/Household'
+                  $ref: "#/components/schemas/Household"
             examples:
               Moving person to a new household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1180,8 +1176,7 @@ paths:
               Moving person to a new household and set an address to this household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1198,8 +1193,7 @@ paths:
               Moving person to an existing household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       position:
@@ -1215,8 +1209,7 @@ paths:
               Removing a person from any household:
                 value:
                   concerned:
-                    -
-                      person:
+                    - person:
                         id: 0
                         type: person
                       start_date:
@@ -1270,8 +1263,6 @@ paths:
         400:
           description: "transition cannot be applyed"
 
-
-
   /1.0/person/social/social-action.json:
     get:
       tags:
@@ -1349,7 +1340,6 @@ paths:
         404:
           description: not found
 
-
   /1.0/person/social-work/social-issue.json:
     get:
       tags:
@@ -1379,7 +1369,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/SocialIssue'
+                $ref: "#/components/schemas/SocialIssue"
         404:
           description: "not found"
         401:

From 52a0c0e95bd81dc005fbd52553a690ea13a873f4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 09:30:15 +0200
Subject: [PATCH 004/217] create new person: add an action and put action
 buttons in a dropdown

---
 .../Controller/PersonController.php           |  4 ++-
 .../Resources/views/Person/create.html.twig   | 26 +++++++++++++++----
 .../translations/messages.fr.yml              |  3 ++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index c390565b5..759f892b2 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -244,7 +244,9 @@ final class PersonController extends AbstractController
             'label' => 'Add the person'
         ])->add('createPeriod', SubmitType::class, [
             'label' => 'Add the person and create an accompanying period'
-        ]);
+        ])->add('createHousehold', SubmitType::class, [
+            'label' => 'Add the person and create an household'
+        ]); // TODO createHousehold form action
 
         $form->handleRequest($request);
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 9718308ed..eddcfd676 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -76,12 +76,28 @@
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
+    <div style="display: none">
+        {# TODO remove this field (vendee) #}
+        {{ form_row(form.center, { 'label' : 'Center'|trans }) }}
+    </div>
+
     <ul class="record_actions sticky-form-buttons">
-        <li>
-            {{ form_widget(form.editPerson, { 'attr': { 'class': 'btn btn-create' }}) }}
-        </li>
-        <li>
-            {{ form_widget(form.createPeriod, { 'attr': { 'class': 'btn btn-create' }}) }}
+        <li class="dropdown">
+            <a class="btn btn-create dropdown-toggle"
+               href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
+                {{ 'Add the person'|trans }}
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="newPersonMore">
+                <li>
+                    {{ form_widget(form.editPerson, { 'attr': { 'class': 'dropdown-item' }}) }}
+                </li>
+                <li>
+                    {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
+                </li>
+                <li>
+                    {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
+                </li>
+            </ul>
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 54c1f3818..852f3256b 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -119,7 +119,8 @@ 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': "Ajouter la personne et créer une période d'accompagnement"
+'Add the person and create an accompanying period': "Créer la personne ET créer une période d'accompagnement"
+'Add the person and create an household': "Créer la personne ET créer un ménage"
 Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'

From a302f0fdbfe6c1272d623e9e02576213d229793f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 09:35:28 +0200
Subject: [PATCH 005/217] invert firstname lastname when creating new person
 (TO BE CONFIRMED)

---
 .../ChillPersonBundle/Resources/views/Person/create.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index eddcfd676..7056f25a3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -64,10 +64,10 @@
     {{ form_start(form) }}
 
 
-    {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}
-
     {{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }}
 
+    {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}
+
     {% if form.altNames is defined %}
         {{ form_widget(form.altNames) }}
     {% endif %}

From 2333b5c6b467d354ff6a63cccb054dc4677c52c3 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 09:55:13 +0200
Subject: [PATCH 006/217] rename some translations

---
 .../Resources/views/Activity/show.html.twig      |  8 ++++----
 .../Resources/public/vuejs/Address/i18n.js       |  2 +-
 .../Resources/public/vuejs/_js/i18n.js           |  4 ++--
 .../Controller/AccompanyingCourseController.php  |  2 +-
 .../Menu/AccompanyingCourseMenuBuilder.php       |  2 +-
 .../views/AccompanyingCourse/history.html.twig   | 16 ++++++++--------
 .../translations/messages.fr.yml                 |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index f46e80cd2..81ebddc05 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -73,7 +73,7 @@
     {% endif %}
 
     {% if t.commentVisible %}
-    <dt class="inline">{{ 'Comment'|trans }}</dt>
+    <dt class="inline">{{ 'activity.comment'|trans }}</dt>
       {%- if entity.comment.empty -%}
           <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
       {%- else -%}
@@ -120,17 +120,17 @@
             {{ 'Edit'|trans }}
         </a>
     </li>
-    
+
     {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     #}
-    
+
     <li>
         <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-    
+
     {#
     {% endif %}
     #}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 9cfd05a3e..2b4b4a9ea 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -24,7 +24,7 @@ const addressMessages = {
         flat: 'Appartement',
         buildingName: 'Nom du bâtiment',
         extra: 'Complément d\'adresse',
-        distribution: 'Service particulier de distribution',
+        distribution: 'Cedex',
         create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
         postalCode_name: 'Nom',
         postalCode_code: 'Code postal',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index f15dd6143..63e0da95a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -43,7 +43,7 @@ const messages = {
          check_all: "cocher tout",
          reset: "réinitialiser",
          redirect: {
-            person: "Quitter la page et ouvrir le dossier",
+            person: "Quitter la page et ouvrir la fiche de l'usager",
             thirdparty: "Quitter la page et voir le tiers",
          }
       },
@@ -57,7 +57,7 @@ const messages = {
          show: {
             person: "Détails de l'usager",
             thirdparty: "Détails du tiers",
-            file_person: "Ouvrir le dossier",
+            file_person: "Ouvrir la fiche de l'usager",
             file_thirdparty: "Voir le Tiers",
          },
          edit: {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index de67602b4..2f086c9f5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -139,7 +139,7 @@ class AccompanyingCourseController extends Controller
     /**
      * History page of Accompanying Course section
      *
-     * the page show anti chronologic history with all actions, title of page is 'accompanying course details'
+     * the page show anti chronologic history with all actions, title of page is 'Accompanying Course History'
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/history", name="chill_person_accompanying_course_history")
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 744e5dbbe..df70b9e64 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -54,7 +54,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild($this->translator->trans('Accompanying Course Details'), [
+        $menu->addChild($this->translator->trans('Accompanying Course History'), [
             'route' => 'chill_person_accompanying_course_history',
             'routeParameters' => [
                 'accompanying_period_id' => $period->getId()
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
index 5b0ada868..488dc3df9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
@@ -1,7 +1,7 @@
 {% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% block title %}
-    {{ 'Accompanying Course Details'|trans }}
+    {{ 'Accompanying Course History'|trans }}
 {% endblock %}
 
 {% block content %}
@@ -15,8 +15,8 @@
         Il faudrait peut-être modifier son adresse comme ceci: `/fr/parcours/{id}/timeline`
     </p>
 
-    {# start test flex-table 
-    
+    {# start test flex-table
+
     <div class="flex-table">
         {% for p in accompanyingCourse.participations %}
         <div class="item-bloc">
@@ -52,16 +52,16 @@
                         <li><button type="button" class="btn btn-edit"></button></li>
                     </ul>
                 </div>
-                
+
             </div>
             <div class="item-row">
-                Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua. 
+                Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua.
             </div>
             <div class="item-row">
-                Rhoncus est pellentesque elit eu ultrices vitae auctor. 
+                Rhoncus est pellentesque elit eu ultrices vitae auctor.
             </div>
             <div class="item-row">
-                Facilisis gravida neque convallis a cras semper auctor neque.  
+                Facilisis gravida neque convallis a cras semper auctor neque.
             </div>
         </div>
         {% endfor %}
@@ -70,5 +70,5 @@
     {# end test flex-table #}
 
     {#  ==> insert accompanyingCourse vue component  #}
-    <div id="accompanying-course"></div> 
+    <div id="accompanying-course"></div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 852f3256b..8b6b6db58 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -373,7 +373,7 @@ Confirmed: en file active
 
 # Accompanying Course
 Accompanying Course: Parcours d'accompagnement
-Accompanying Course Details: Détails du parcours
+Accompanying Course History: Historique du parcours
 Resume Accompanying Course: Résumé du parcours
 Show Accompanying Course: Voir le parcours
 Edit Accompanying Course: Modifier le parcours

From c258179017fbcc4d1720959dd179b12cd841edff Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 11:02:35 +0200
Subject: [PATCH 007/217] move and rename vue HouseholdRenderBox

---
 .../components/Household.vue                  |  8 +--
 .../HouseholdRenderBox.vue}                   | 61 ++++++++-----------
 2 files changed, 30 insertions(+), 39 deletions(-)
 rename src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/{Household/Household.vue => Entity/HouseholdRenderBox.vue} (82%)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 05746429c..23334a0f9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -3,7 +3,7 @@
 
   <div v-if="hasHousehold">
     <div>
-      <household-viewer :household="household"></household-viewer>
+      <household-render-box :household="household"></household-render-box>
     </div>
     <div v-if="isHouseholdNew && !hasHouseholdAddress">
 
@@ -101,7 +101,7 @@
           v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
           class="item"
         >
-          <household-viewer :household="h"></household-viewer>
+          <household-render-box :household="h"></household-render-box>
 
           <ul class="record_actions">
             <li>
@@ -155,14 +155,14 @@ div.householdAddressSuggestionList {
 <script>
 
 import { mapGetters, mapState } from 'vuex';
-import HouseholdViewer from 'ChillPersonAssets/vuejs/_components/Household/Household.vue';
+import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 
 export default {
   name: 'Household',
   components: {
-    HouseholdViewer,
+    HouseholdRenderBox,
     ShowAddress,
     AddAddress,
   },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
similarity index 82%
rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 9e6ee90a1..21734e7e8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -1,5 +1,5 @@
-<template>
-  <div class="chill-entity chill-entity__household">
+<template>A
+  <section class="chill-entity entity-household">
     <!-- identifier -->
     <div v-if="isHouseholdNew()" class="identifier">
       <i class="fa fa-home"></i>
@@ -34,45 +34,36 @@
       <i class="fa fa-where"></i>
       <p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
     </div>
-  </div>
+  </section>B
 </template>
 
 <style lang="scss">
-.chill-entity__household {
-  display: grid;
-  grid-template-areas:
-    "identifier identifier where"
-    "who        who        where"
-    ;
-  grid-template-columns:
-    auto        auto       30%
-    ;
-
-  .identifier {
-    grid-area: identifier;
-
-    font-size: 1.3em;
-    font-weight: 700;
-    color: var(--chill-blue);
-
-  }
-  .members {
-    grid-area: who;
-
-    .current-members {
-      font-weight: 700;
-    }
-  }
-  .where {
-    grid-area: where
-  }
-
-
+section.chill-entity {
+   &.entity-household {
+      display: grid;
+      grid-template-columns: auto auto 30%;
+      grid-template-areas:
+         "iden iden where"
+         "who  who  where";
+      .identifier {
+         grid-area: iden;
+         font-size: 1.3em;
+         font-weight: 700;
+         color: var(--chill-blue);
+      }
+      .members {
+         grid-area: who;
+         .current-members {
+            font-weight: 700;
+         }
+      }
+      .where {
+         grid-area: where
+      }
+   }
 }
 </style>
 
-
-
 <script>
 
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';

From 8182e35c9c424475bb1e0218764d48677d3e51a1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Aug 2021 15:13:21 +0200
Subject: [PATCH 008/217] renderbox options changed to not display age for
 thirdparties, but yes in person modal

---
 .../public/vuejs/AccompanyingCourse/components/Requestor.vue    | 2 +-
 .../AccompanyingCourse/components/Resources/ResourceItem.vue    | 2 +-
 .../Resources/public/vuejs/_components/OnTheFly/Person.vue      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 1cb96bc69..6097d6d46 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -16,7 +16,7 @@
             addLink: false,
             addId: false,
             addEntity: true,
-            addInfo: true,
+            addInfo: false,
             hLevel: 3,
             isMultiline: true
             }"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index d37a4b84f..a1e2b3b10 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -17,7 +17,7 @@
    <third-party-render-box
       v-if="resource.resource.type === 'thirdparty'"
       :thirdparty="resource.resource"
-      :options="{ addLink : false, addId : false, addEntity: true, addInfo: true, hLevel: 3 }"
+      :options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }"
       >
       <template v-slot:record-actions>
          <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 84c5e1a57..ebc6db5dd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -7,6 +7,7 @@
             addInfo: true,
             addEntity: false,
             addAltNames: true,
+            addAge: true,
             addId: true,
             addLink: false,
             hLevel: 3,

From d4430246f766bf87133fb952b76f589f2058574f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 11:17:30 +0200
Subject: [PATCH 009/217] hop

---
 .../components/Household.vue                  |  71 ++++-----
 .../_components/Entity/HouseholdRenderBox.vue | 144 ++++++++++--------
 2 files changed, 108 insertions(+), 107 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 23334a0f9..ca5447a29 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -96,11 +96,10 @@
   <div class="householdSuggestions">
     <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
       <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
-      <div class="householdSuggestionList">
-        <div
-          v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
-          class="item"
-        >
+      <div class="flex-table householdSuggestionList">
+        <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
+          class="item-bloc">
+
           <household-render-box :household="h"></household-render-box>
 
           <ul class="record_actions">
@@ -117,43 +116,7 @@
 
 </template>
 
-<style lang="scss">
-
-div.householdAddressSuggestionList {
-  /*
-  display: flex;
-  list-style-type: none;
-  padding: 0;
-
-   */
-
-  & > li {
-
-  }
-}
-
-.householdSuggestionList {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-between;
-
-  & > .item {
-    margin-bottom: 0.8rem;
-    width: calc(50% - 1rem);
-    border: 1px solid var(--chill-light-gray);
-    padding: 0.5rem 0.5rem 0 0.5rem;
-
-    ul.record_actions {
-      margin-bottom: 0;
-    }
-  }
-}
-
-</style>
-
 <script>
-
 import { mapGetters, mapState } from 'vuex';
 import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
@@ -272,3 +235,29 @@ export default {
 };
 
 </script>
+
+<style lang="scss">
+/*
+div.householdAddressSuggestionList {
+  display: flex;
+  list-style-type: none;
+  padding: 0;
+  & > li {}
+}
+.householdSuggestionList {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  & > .item {
+    margin-bottom: 0.8rem;
+    width: calc(50% - 1rem);
+    border: 1px solid var(--chill-light-gray);
+    padding: 0.5rem 0.5rem 0 0.5rem;
+    ul.record_actions {
+      margin-bottom: 0;
+    }
+  }
+}
+*/
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 21734e7e8..741470b81 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -1,71 +1,56 @@
-<template>A
-  <section class="chill-entity entity-household">
-    <!-- identifier -->
-    <div v-if="isHouseholdNew()" class="identifier">
-      <i class="fa fa-home"></i>
-      {{ $t('new_household') }}
-    </div>
-    <div v-else class="identifier">
-      <i class="fa fa-home"></i>
-      {{ $t('household_number', { number: household.id } ) }}
-    </div>
+<template>
+   <section class="chill-entity entity-household">
+      <div class="item-row">
+         <div class="item-col">
 
-    <!-- member part -->
-    <div v-if="hasCurrentMembers" class="members">
-      <span class="current-members">{{ $t('current_members') }}: </span>
-      <template v-for="(m, index) in currentMembers()" :key="m.id">
-        <person :person="m.person"></person>
-        <span v-if="m.holder">
-          &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
-        </span>
-        <span v-if="index != (currentMembersLength() - 1)">, </span>
-      </template>
-    </div>
-    <div v-else class="members">
-      <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
-    </div>
+            <!-- identifier -->
+            <div v-if="isHouseholdNew()" class="identifier">
+               <i class="fa fa-home"></i>
+               {{ $t('new_household') }}
+            </div>
+            <div v-else class="identifier">
+               <i class="fa fa-home"></i>
+               {{ $t('household_number', { number: household.id } ) }}
+            </div>
 
-    <!-- address part -->
-    <div v-if="hasAddress()" class="where">
-      <i class="fa fa-where"></i>
-      <show-address :address="household.current_address"></show-address>
-    </div>
-    <div v-else class="where">
-      <i class="fa fa-where"></i>
-      <p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
-    </div>
-  </section>B
+         </div>
+         <div class="item-col">
+            <ul class="list-content fa-ul">
+
+               <!-- member part -->
+               <li v-if="hasCurrentMembers" class="members">
+                  <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
+                  <template v-for="(m, index) in currentMembers()" :key="m.id">
+                     <person :person="m.person"></person>
+                     <span v-if="m.holder">
+                    &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
+                  </span>
+                     <span v-if="index != (currentMembersLength() - 1)">, </span>
+                  </template>
+               </li>
+               <li v-else class="members">
+                  <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
+                  <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
+               </li>
+
+               <!-- address part -->
+               <li v-if="hasAddress()" class="where">
+                  <i class="fa fa-li fa-map-marker"></i>
+                  <show-address :address="household.current_address"></show-address>
+               </li>
+               <li v-else class="where">
+                  <i class="fa fa-li fa-map-marker"></i>
+                  <p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
+               </li>
+
+
+            </ul>
+         </div>
+      </div>
+   </section>
 </template>
 
-<style lang="scss">
-section.chill-entity {
-   &.entity-household {
-      display: grid;
-      grid-template-columns: auto auto 30%;
-      grid-template-areas:
-         "iden iden where"
-         "who  who  where";
-      .identifier {
-         grid-area: iden;
-         font-size: 1.3em;
-         font-weight: 700;
-         color: var(--chill-blue);
-      }
-      .members {
-         grid-area: who;
-         .current-members {
-            font-weight: 700;
-         }
-      }
-      .where {
-         grid-area: where
-      }
-   }
-}
-</style>
-
 <script>
-
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
@@ -82,8 +67,7 @@ const i18n = {
         "holder": "titulaire",
       }
   }
-}
-;
+};
 
 export default {
   name: 'Household',
@@ -126,5 +110,33 @@ export default {
     }
   }
 };
-
 </script>
+
+<style lang="scss">
+section.chill-entity {
+   &.entity-household {
+      .identifier {
+         //grid-area: iden;
+         font-size: 1.3em;
+         font-weight: 700;
+         color: var(--chill-blue);
+      }
+      /*
+      display: grid;
+      grid-template-columns: auto auto 30%;
+      grid-template-areas:
+         "iden iden where"
+         "who  who  where";
+      .members {
+         //grid-area: who;
+         .current-members {
+            font-weight: 700;
+         }
+      }
+      .where {
+         //grid-area: where
+      }
+      */
+   }
+}
+</style>

From 4f6011348dd5c53f7d3da8d650fe736f318679a5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 15:36:38 +0200
Subject: [PATCH 010/217] merge 2 subcomponent to use only
 Entity/PersonRenderBox.vue

---
 .../PersonsAssociated/ParticipationItem.vue      |  2 +-
 .../AccompanyingCourse/components/Requestor.vue  |  2 +-
 .../components/Resources/ResourceItem.vue        |  2 +-
 .../vuejs/AccompanyingCourseWorkCreate/App.vue   |  6 +++---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue     |  6 +++---
 .../components/Concerned.vue                     |  6 +++---
 .../components/MemberDetails.vue                 |  6 +++---
 .../_components/Entity/HouseholdRenderBox.vue    | 10 +++++++---
 .../vuejs/_components/Entity/PersonRenderBox.vue |  7 ++++---
 .../public/vuejs/_components/OnTheFly/Person.vue |  2 +-
 .../public/vuejs/_components/Person/Person.vue   | 16 ----------------
 11 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 04c6b73a9..117206d28 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box
+   <person-render-box :render="bloc"
       :options="{
                addInfo : true,
                addId : false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 97ba5ba10..6c26b00cd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -30,7 +30,7 @@
       </template>
       </third-party-render-box>
 
-      <person-render-box v-else-if="accompanyingCourse.requestor.type == 'person'"
+      <person-render-box :render="bloc" v-else-if="accompanyingCourse.requestor.type == 'person'"
          :person="accompanyingCourse.requestor"
          :options="{
             addLink: false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index d37a4b84f..483c27de8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box
+   <person-render-box :render="bloc"
       v-if="resource.resource.type === 'person'"
       :person="resource.resource"
       :options="{ addInfo : true, addId : false, addEntity: true, addLink: false, addAltNames: true, addAge : false, hLevel : 3 }"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 134b35353..2623509a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -35,7 +35,7 @@
         <ul>
           <li v-for="p in personsReachables" :key="p.id">
             <input type="checkbox" :value="p.id" v-model="personsPicked">
-            <person :person="p"></person>
+            <person-render-box render="badge" :person="p"></person-render-box>
           </li>
         </ul>
       </div>
@@ -124,7 +124,7 @@
 import { mapState, mapActions, mapGetters } from 'vuex';
 import VueMultiselect from 'vue-multiselect';
 import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 
 const i18n = {
   messages: {
@@ -145,7 +145,7 @@ export default {
   name: 'App',
   components: {
     VueMultiselect,
-    Person,
+     PersonRenderBox,
   },
   methods: {
     submit() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index ec99d1478..647ab4adb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,7 @@
          <ul>
             <li v-for="p in personsReachables" :key="p.id">
                <input v-model="personsPicked" :value="p.id" type="checkbox">
-               <person :person="p"></person>
+               <person-render-box render="badge" :person="p"></person-render-box>
             </li>
          </ul>
       </div>
@@ -229,7 +229,7 @@ import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
@@ -274,7 +274,7 @@ export default {
       AddResult,
       AddEvaluation,
       AddPersons,
-      Person,
+      PersonRenderBox,
       ShowAddress,
    },
    i18n,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index 9399f9245..5ae594c8d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -25,7 +25,7 @@
         <div class="item-row">
           <div class="item-col">
             <div>
-              <person :person="conc.person"></person>
+              <person-render-box render="badge" :person="conc.person"></person-render-box>
             </div>
             <div v-if="conc.person.birthdate !== null">
               {{ $t('person.born', {'gender': conc.person.gender} ) }}
@@ -126,7 +126,7 @@ div.person {
 <script>
 import { mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import MemberDetails from './MemberDetails.vue';
 import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 
@@ -135,7 +135,7 @@ export default {
   components: {
     AddPersons,
     MemberDetails,
-    Person,
+    PersonRenderBox,
   },
   computed: {
     ...mapGetters([
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index e153373a1..99f92aaf1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -3,7 +3,7 @@
     <div class="item-row">
       <div class="item-col">
         <div>
-          <person :person="conc.person"></person>
+          <person-render-box render="badge" :person="conc.person"></person-render-box>
           <span v-if="isHolder" class="badge bg-primary holder">
             {{ $t('household_members_editor.holder') }}
           </span>
@@ -73,14 +73,14 @@ div.participation-details {
 
 <script>
 import { mapGetters } from 'vuex';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 
 export default {
   name: 'MemberDetails',
   components: {
-    Person,
+    PersonRenderBox,
     ckeditor: CKEditor.component,
   },
   props: [
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 741470b81..021f0976f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -21,11 +21,15 @@
                <li v-if="hasCurrentMembers" class="members">
                   <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
                   <template v-for="(m, index) in currentMembers()" :key="m.id">
-                     <person :person="m.person"></person>
                      <span v-if="m.holder">
                     &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
                   </span>
                      <span v-if="index != (currentMembersLength() - 1)">, </span>
+                     <person-render-box render="badge"
+                       :person="m.person"
+                       :options="{
+                       }">
+                     </person-render-box>
                   </template>
                </li>
                <li v-else class="members">
@@ -51,7 +55,7 @@
 </template>
 
 <script>
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
@@ -73,7 +77,7 @@ export default {
   name: 'Household',
   props: ['household'],
   components: {
-    Person,
+    PersonRenderBox,
     ShowAddress,
   },
   i18n,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 4a53f0bb5..9ee13b322 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -1,5 +1,6 @@
 <template>
- <div class="item-bloc">
+  <div v-if="render === 'bloc'"
+    class="item-bloc">
     <section class="chill-entity entity-person">
     <div class="item-row entity-bloc">
 
@@ -86,7 +87,7 @@
 
     </div>
     </section>
- </div>
+  </div>
 </template>
 
 <script>
@@ -98,7 +99,7 @@ export default {
     components: {
         ShowAddress
     },
-    props: ['person', 'options'],
+    props: ['person', 'options', 'render'],
     computed: {
         getGender: function() {
             return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 1a9fffb45..3e6062cc1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-if="action === 'show'">
    <div class="flex-table">
-      <person-render-box
+      <person-render-box :render="bloc"
          :person="person"
          :options="{
             addInfo: true,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue
deleted file mode 100644
index 886a00683..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <span class="chill-entity chill-entity__person">
-    <span class="chill-entity__person__text chill_denomination">
-      {{ person.text }}
-    </span>
-  </span>
-</template>
-
-<script>
-
-export default {
-  name: 'Person',
-  props: ['person']
-}
-
-</script>

From 5fd7d869bf61c92e0507c433d8fe78237f724854 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 15:49:49 +0200
Subject: [PATCH 011/217] Entity/PersonRenderBox.vue with render=badge

---
 .../Resources/public/vuejs/_js/i18n.js        |  3 +-
 .../components/Household.vue                  | 14 +++++-
 .../_components/Entity/HouseholdRenderBox.vue | 45 +++++++++----------
 .../_components/Entity/PersonRenderBox.vue    | 38 +++++++++++++++-
 4 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 63e0da95a..39bbd4cb1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -81,7 +81,8 @@ const messages = {
          type: {
             thirdparty: "Tiers",
             person: "Usager"
-         }
+         },
+         holder: "Titulaire"
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index ca5447a29..4f093cf53 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -104,7 +104,7 @@
 
           <ul class="record_actions">
             <li>
-              <button class="btn btn-misc" @click="selectHousehold(h)">
+              <button class="btn btn-sm btn-misc" @click="selectHousehold(h)">
                 {{ $t('household_members_editor.select_household') }}
               </button>
             </li>
@@ -237,6 +237,18 @@ export default {
 </script>
 
 <style lang="scss">
+
+div.householdSuggestionList {
+   &.flex-table div.item-bloc div.item-row div.item-col {
+      &:first-child {
+         width: 25%;
+      }
+      &:last-child {
+         display: initial;
+      }
+   }
+}
+
 /*
 div.householdAddressSuggestionList {
   display: flex;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 021f0976f..7207634b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -4,51 +4,44 @@
          <div class="item-col">
 
             <!-- identifier -->
-            <div v-if="isHouseholdNew()" class="identifier">
+            <div v-if="isHouseholdNew()" class="h4">
                <i class="fa fa-home"></i>
                {{ $t('new_household') }}
             </div>
-            <div v-else class="identifier">
+            <div v-else class="h4">
                <i class="fa fa-home"></i>
                {{ $t('household_number', { number: household.id } ) }}
             </div>
 
          </div>
          <div class="item-col">
-            <ul class="list-content fa-ul">
 
                <!-- member part -->
-               <li v-if="hasCurrentMembers" class="members">
-                  <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
-                  <template v-for="(m, index) in currentMembers()" :key="m.id">
-                     <span v-if="m.holder">
-                    &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
-                  </span>
-                     <span v-if="index != (currentMembersLength() - 1)">, </span>
+               <div v-if="hasCurrentMembers" class="members" :title="$t('current_members')">
+                  <template v-for="m in currentMembers()" :key="m.id">
                      <person-render-box render="badge"
                        :person="m.person"
                        :options="{
+                          isHolder: m.holder,
+                          addLink: true
                        }">
                      </person-render-box>
                   </template>
-               </li>
-               <li v-else class="members">
-                  <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
+               </div>
+               <div v-else class="members" :title="$t('current_members')">
                   <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
-               </li>
+               </div>
 
                <!-- address part -->
-               <li v-if="hasAddress()" class="where">
-                  <i class="fa fa-li fa-map-marker"></i>
-                  <show-address :address="household.current_address"></show-address>
-               </li>
-               <li v-else class="where">
-                  <i class="fa fa-li fa-map-marker"></i>
-                  <p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
-               </li>
+               <div v-if="hasAddress()" class="where">
+                  <i class="fa fa-fw fa-map-marker"></i>
+                  <show-address :address="household.current_address" isMultiline="false"></show-address>
+               </div>
+               <div v-else class="where">
+                  <i class="fa fa-fw fa-map-marker"></i>
+                  <span class="chill-no-data-statement">{{ $t('no_current_address') }}</span>
+               </div>
 
-
-            </ul>
          </div>
       </div>
    </section>
@@ -117,15 +110,17 @@ export default {
 </script>
 
 <style lang="scss">
+
 section.chill-entity {
    &.entity-household {
+
+      /*
       .identifier {
          //grid-area: iden;
          font-size: 1.3em;
          font-weight: 700;
          color: var(--chill-blue);
       }
-      /*
       display: grid;
       grid-template-columns: auto auto 30%;
       grid-template-areas:
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 9ee13b322..38d528d8b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -9,7 +9,7 @@
 
                 <div :class="'denomination h' + options.hLevel">
 
-                   <a v-if="this.options.addLink ==  true" href="#">
+                   <a v-if="this.options.addLink === true" :href="getUrl">
                         <span class="firstname">{{ person.firstName }}</span>
                         <span class="lastname">{{ person.lastName }}</span>
                         <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
@@ -88,6 +88,27 @@
     </div>
     </section>
   </div>
+
+  <span v-if="render === 'badge'"
+    class="chill-entity entity-person badge-person">
+
+     <a v-if="this.options.addLink === true" :href="getUrl">
+      <span v-if="options.isHolder" class="fa-stack fa-holder" :title="$t('renderbox.holder')">
+        <i class="fa fa-circle fa-stack-1x text-success"></i>
+        <i class="fa fa-stack-1x">T</i>
+      </span>
+      {{ person.text }}
+    </a>
+
+    <span v-else>
+       <span v-if="options.isHolder" class="fa-stack fa-holder" :title="$t('renderbox.holder')">
+        <i class="fa fa-circle fa-stack-1x text-success"></i>
+        <i class="fa fa-stack-1x">T</i>
+      </span>
+      {{ person.text }}
+    </span>
+
+  </span>
 </template>
 
 <script>
@@ -132,12 +153,26 @@ export default {
                 return this.person.altNames[i].key
             }
         },
+        getUrl() {
+           return `/fr/person/${this.person.id}/general`;
+        }
     }
 }
 </script>
 
 <style lang='scss'>
 
+span.fa-holder {
+   width: 1em;
+   margin: -10px 0.3em -8px 0;
+   i:last-child {
+      font-weight: 900;
+      color: white;
+      font-size: 70%;
+      font-family: "Open Sans Extrabold";
+   }
+}
+
 .lastname:before{
     content: " "
 }
@@ -150,6 +185,7 @@ div.flex-table {
          }
          div.item-col:last-child {
             justify-content: flex-start;
+
          }
       }
    }

From c1d19640a9384bc45f930fd424a1eff89c01481c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 15:50:34 +0200
Subject: [PATCH 012/217] fix content position for household-members

---
 .../Resources/views/Household/members_editor.html.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
index cdea2dee2..a65867fb9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
@@ -4,7 +4,7 @@
 {% block title 'household.Edit household members'|trans  %}
 
 {% block content %}
-<div class="col-md-10 col-xxl household-members">
+<div class="household-members">
 
     <h1>{{ block('title') }}</h1>
     <div id="household_members_editor"></div>

From 983bca97ac95300ee2955841978ca7df64e87a47 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 15:51:17 +0200
Subject: [PATCH 013/217] fix vue Address duplicate details

---
 .../vuejs/Address/components/ShowAddress.vue  | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index 044a619fc..300a83930 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -16,7 +16,7 @@
          </p>
       </component>
 
-      <div v-if="isMultiline">
+      <div v-if="isMultiline === true">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}
@@ -37,42 +37,20 @@
                <b>{{ $t('flat') }}</b>: {{ address.flat }}
             </span>
          </div>
-         <div>
-            <div v-if="address.floor">
-               <span class="floor">
-                  <b>{{ $t('floor') }}</b>: {{ address.floor }}
-               </span>
-            </div>
-            <div v-if="address.corridor">
-               <span class="corridor">
-                  <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-               </span>
-            </div>
-            <div v-if="address.steps">
-               <span class="steps">
-                  <b>{{ $t('steps') }}</b>: {{ address.steps }}
-               </span>
-            </div>
-            <div v-if="address.flat">
-               <span class="flat">
-                  <b>{{ $t('flat') }}</b>: {{ address.flat }}
-               </span>
-            </div>
-            <div v-if="address.buildingName">
+         <div v-if="address.buildingName">
                <span class="buildingName">
                   <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
                </span>
-            </div>
-            <div v-if="address.extra">
+         </div>
+         <div v-if="address.extra">
                <span class="extra">
                   <b>{{ $t('extra') }}</b>: {{ address.extra }}
                </span>
-            </div>
-            <div v-if="address.distribution">
+         </div>
+         <div v-if="address.distribution">
                <span class="distribution">
                   <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
                </span>
-            </div>
          </div>
       </div>
 

From 219a41e0344785d17d132962cbbbe1b7a8621340 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 16:12:26 +0200
Subject: [PATCH 014/217] rename/move vue AddressRenderBox

---
 .../Entity/AddressRenderBox.vue}                               | 0
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue     | 2 +-
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue  | 2 +-
 .../vuejs/HouseholdMembersEditor/components/Household.vue      | 3 +--
 .../public/vuejs/_components/Entity/HouseholdRenderBox.vue     | 2 +-
 .../public/vuejs/_components/Entity/PersonRenderBox.vue        | 2 +-
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue    | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename src/Bundle/ChillMainBundle/Resources/public/vuejs/{Address/components/ShowAddress.vue => _components/Entity/AddressRenderBox.vue} (100%)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 59852263a..790af303d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -63,7 +63,7 @@
 <script>
 import { mapState } from "vuex";
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
    name: "CourseLocation",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 647ab4adb..1dbc9e6d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -231,7 +231,7 @@ import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
    messages: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 4f093cf53..4c008d9d0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -115,11 +115,10 @@
   </div>
 
 </template>
-
 <script>
 import { mapGetters, mapState } from 'vuex';
 import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 
 export default {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 7207634b2..c94de21c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -49,7 +49,7 @@
 
 <script>
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
   "messages":
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 38d528d8b..44dc8566d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -113,7 +113,7 @@
 
 <script>
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
     name: "PersonRenderBox",
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 8db40f9ec..1564b54a0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 
 export default {

From b9602aa7206db18e14ce43d1ccabdc8d99f1367c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 16:12:26 +0200
Subject: [PATCH 015/217] rename/move vue AddressRenderBox

---
 .../public/vuejs/Address/components/ShowAddressPane.vue        | 2 +-
 .../Entity/AddressRenderBox.vue}                               | 0
 .../vuejs/AccompanyingCourse/components/ButtonLocation.vue     | 2 +-
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue     | 2 +-
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue  | 2 +-
 .../vuejs/HouseholdMembersEditor/components/Household.vue      | 3 +--
 .../public/vuejs/_components/Entity/HouseholdRenderBox.vue     | 2 +-
 .../public/vuejs/_components/Entity/PersonRenderBox.vue        | 2 +-
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue    | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)
 rename src/Bundle/ChillMainBundle/Resources/public/vuejs/{Address/components/ShowAddress.vue => _components/Entity/AddressRenderBox.vue} (100%)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index 14ca059c0..738c1ab08 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -48,7 +48,7 @@
 
 <script>
 import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
-import ShowAddress from './ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
    name: 'ShowAddressPane',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index 08b608d89..34a240f2e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -28,7 +28,7 @@
 <script>
 import {mapState} from "vuex";
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
-import ShowAddress from "ChillMainAssets/vuejs/Address/components/ShowAddress";
+import ShowAddress from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 
 export default {
    name: "ButtonLocation",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 59852263a..790af303d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -63,7 +63,7 @@
 <script>
 import { mapState } from "vuex";
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
    name: "CourseLocation",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 647ab4adb..1dbc9e6d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -231,7 +231,7 @@ import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
    messages: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 4f093cf53..4c008d9d0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -115,11 +115,10 @@
   </div>
 
 </template>
-
 <script>
 import { mapGetters, mapState } from 'vuex';
 import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 
 export default {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 7207634b2..c94de21c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -49,7 +49,7 @@
 
 <script>
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
   "messages":
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 38d528d8b..44dc8566d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -113,7 +113,7 @@
 
 <script>
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
     name: "PersonRenderBox",
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 8db40f9ec..1564b54a0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 
 export default {

From c0d2454473599106013536ad28ec11c2a00f26bf Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 18:03:21 +0200
Subject: [PATCH 016/217] household render box flex table

---
 .../PersonsAssociated/ParticipationItem.vue     |  2 +-
 .../AccompanyingCourse/components/Requestor.vue |  2 +-
 .../components/Resources/ResourceItem.vue       |  2 +-
 .../components/Household.vue                    | 17 +++++++++++++----
 .../_components/Entity/HouseholdRenderBox.vue   |  8 +++-----
 .../vuejs/_components/OnTheFly/Person.vue       |  2 +-
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 117206d28..ce6a20bb6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box :render="bloc"
+   <person-render-box render="bloc"
       :options="{
                addInfo : true,
                addId : false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 6c26b00cd..1933bfa42 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -30,7 +30,7 @@
       </template>
       </third-party-render-box>
 
-      <person-render-box :render="bloc" v-else-if="accompanyingCourse.requestor.type == 'person'"
+      <person-render-box render="bloc" v-else-if="accompanyingCourse.requestor.type == 'person'"
          :person="accompanyingCourse.requestor"
          :options="{
             addLink: false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 483c27de8..943666ef4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box :render="bloc"
+   <person-render-box render="bloc"
       v-if="resource.resource.type === 'person'"
       :person="resource.resource"
       :options="{ addInfo : true, addId : false, addEntity: true, addLink: false, addAltNames: true, addAge : false, hLevel : 3 }"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 4c008d9d0..ff7705291 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -2,8 +2,12 @@
   <h2>{{ $t('household_members_editor.household_part') }}</h2>
 
   <div v-if="hasHousehold">
-    <div>
-      <household-render-box :household="household"></household-render-box>
+    <div class="flex-table">
+       <div class="item-bloc">
+
+          <household-render-box :household="household" isMultiline="true">
+          </household-render-box>
+       </div>
     </div>
     <div v-if="isHouseholdNew && !hasHouseholdAddress">
 
@@ -95,9 +99,12 @@
 
   <div class="householdSuggestions">
     <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
+
+      <h2 >Suggestions</h2>
       <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
       <div class="flex-table householdSuggestionList">
-        <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
+
+         <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
           class="item-bloc">
 
           <household-render-box :household="h"></household-render-box>
@@ -109,7 +116,8 @@
               </button>
             </li>
           </ul>
-        </div >
+        </div>
+
       </div>
     </div>
   </div>
@@ -237,6 +245,7 @@ export default {
 
 <style lang="scss">
 
+div#household_members_editor div,
 div.householdSuggestionList {
    &.flex-table div.item-bloc div.item-row div.item-col {
       &:first-child {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index c94de21c6..f2117cefc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -52,11 +52,9 @@ import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRe
 import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
-  "messages":
-    {
-      "fr":
-      {
-        "household_number": "Ménage #{number}",
+  "messages": {
+      "fr": {
+        "household_number": "Ménage n°{number}",
         "current_members": "Membres actuels",
         "no_current_address": "Sans adresse actuellement",
         "new_household": "Nouveau ménage",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 3e6062cc1..9fd1fbb64 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-if="action === 'show'">
    <div class="flex-table">
-      <person-render-box :render="bloc"
+      <person-render-box render="bloc"
          :person="person"
          :options="{
             addInfo: true,

From 3fa4f1b28bb00e25659d88083a2549fae094f445 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 31 Aug 2021 11:06:44 +0200
Subject: [PATCH 017/217] address multiline as option in householdrenderbox

---
 .../_components/Entity/AddressRenderBox.vue   |  9 +++--
 .../components/Household.vue                  |  4 +-
 .../_components/Entity/HouseholdRenderBox.vue | 37 +++++++++++++------
 3 files changed, 31 insertions(+), 19 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 300a83930..d7a11e14f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -70,11 +70,12 @@ export default {
       }
    },
    computed: {
-      component(){
-         return this.isMultiline == true ? "div" : "span";
+      component() {
+         return this.isMultiline === true ? "div" : "span";
       },
-      multiline(){
-         return this.isMultiline == true ? "multiline" : "";
+      multiline() {
+         console.log(this.isMultiline, typeof this.isMultiline);
+         return this.isMultiline === true ? "multiline" : "";
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index ff7705291..67fb68141 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -4,9 +4,7 @@
   <div v-if="hasHousehold">
     <div class="flex-table">
        <div class="item-bloc">
-
-          <household-render-box :household="household" isMultiline="true">
-          </household-render-box>
+          <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
        </div>
     </div>
     <div v-if="isHouseholdNew && !hasHouseholdAddress">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index f2117cefc..b9f6f9d66 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -15,9 +15,11 @@
 
          </div>
          <div class="item-col">
+            <ul class="list-content fa-ul">
 
                <!-- member part -->
-               <div v-if="hasCurrentMembers" class="members" :title="$t('current_members')">
+               <li v-if="hasCurrentMembers" class="members">
+                  <i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
                   <template v-for="m in currentMembers()" :key="m.id">
                      <person-render-box render="badge"
                        :person="m.person"
@@ -27,21 +29,23 @@
                        }">
                      </person-render-box>
                   </template>
-               </div>
-               <div v-else class="members" :title="$t('current_members')">
+               </li>
+               <li v-else class="members">
+                  <i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
                   <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
-               </div>
+               </li>
 
                <!-- address part -->
-               <div v-if="hasAddress()" class="where">
-                  <i class="fa fa-fw fa-map-marker"></i>
-                  <show-address :address="household.current_address" isMultiline="false"></show-address>
-               </div>
-               <div v-else class="where">
-                  <i class="fa fa-fw fa-map-marker"></i>
+               <li v-if="hasAddress()">
+                  <i class="fa fa-li fa-map-marker"></i>
+                  <show-address :address="household.current_address" :isMultiline="isMultiline"></show-address>
+               </li>
+               <li v-else>
+                  <i class="fa fa-li fa-map-marker"></i>
                   <span class="chill-no-data-statement">{{ $t('no_current_address') }}</span>
-               </div>
+               </li>
 
+            </ul>
          </div>
       </div>
    </section>
@@ -66,12 +70,17 @@ const i18n = {
 
 export default {
   name: 'Household',
-  props: ['household'],
+  props: ['household', 'isAddressMultiline'],
   components: {
     PersonRenderBox,
     ShowAddress,
   },
   i18n,
+   computed: {
+      isMultiline() {
+         return (typeof this.isAddressMultiline !== 'undefined') ? this.isAddressMultiline : false;
+      }
+   },
   methods: {
     hasCurrentMembers() {
       return this.household.current_members_id.length > 0;
@@ -112,6 +121,10 @@ export default {
 section.chill-entity {
    &.entity-household {
 
+      .fa-hop::marker {
+         content: '::';
+      }
+
       /*
       .identifier {
          //grid-area: iden;

From 1a2cb22b5bb70ddd8fc1e446446f316b48834227 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 31 Aug 2021 12:41:19 +0200
Subject: [PATCH 018/217] household, wip

---
 .../_components/Entity/AddressRenderBox.vue   |  2 +-
 .../components/Household.vue                  | 37 ++++++++++---------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  9 ++++-
 .../_components/Entity/PersonRenderBox.vue    | 24 ++++++------
 4 files changed, 38 insertions(+), 34 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 d7a11e14f..c5e2f2d62 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -74,7 +74,7 @@ export default {
          return this.isMultiline === true ? "div" : "span";
       },
       multiline() {
-         console.log(this.isMultiline, typeof this.isMultiline);
+         //console.log(this.isMultiline, typeof this.isMultiline);
          return this.isMultiline === true ? "multiline" : "";
       }
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 67fb68141..729ad06c7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -9,18 +9,22 @@
     </div>
     <div v-if="isHouseholdNew && !hasHouseholdAddress">
 
-      <h3 >À quelle adresse habite ce ménage ?</h3>
+      <h3>{{ $t('household_members_editor.household.where_live_the_household') }}</h3>
 
       <div v-if="filterAddressesSuggestion.length > 0" class="flex-table householdAddressSuggestionList">
         <div v-for="a in filterAddressesSuggestion" class="item-bloc">
           <show-address :address="a"></show-address>
-          <button class="btn btn-action" @click="setHouseholdAddress(a)">
-            Le ménage habite cette adresse
-          </button>
+           <ul class="record_actions">
+              <li>
+                  <button class="btn btn-action" @click="setHouseholdAddress(a)">
+                     {{ $t('household_members_editor.household.household_live_to_this_address') }}
+                  </button>
+               </li>
+           </ul>
         </div>
       </div>
-        <div v-else>
-          <span class="chill-no-data-statement">Aucune adresse à suggérer</span>
+      <div v-else>
+        <span class="chill-no-data-statement">{{ $t('household_members_editor.household.no_suggestions') }}</span>
       </div>
 
       <ul class="record_actions">
@@ -41,7 +45,7 @@
       <ul class="record_actions">
         <li >
           <button class="btn btn-misc" @click="removeHouseholdAddress">
-            Supprimer cette adresse
+             {{ $t('household_members_editor.household.delete_this_address') }}
           </button>
         </li>
       </ul>
@@ -56,20 +60,20 @@
   </div>
 
   <ul v-if="allowChangeHousehold" class="record_actions">
-    <li v-if="!showHouseholdSuggestion">
+    <li v-if="!showHouseholdSuggestion" class="cancel">
       <button
         class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
-      >
+      ><i class="fa fa-fw fa-caret-right"></i>
         {{ $tc('household_members_editor.show_household_suggestion',
           countHouseholdSuggestion) }}
       </button>
     </li>
-    <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
+    <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion" class="cancel">
       <button
         class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
-      >
+      ><i class="fa fa-fw fa-caret-down"></i>
         {{ $t('household_members_editor.hide_household_suggestion') }}
       </button>
     </li>
@@ -98,15 +102,12 @@
   <div class="householdSuggestions">
     <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
 
-      <h2 >Suggestions</h2>
+      <h3>{{ $t('household_members_editor.suggestions') }}</h3>
       <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
+
       <div class="flex-table householdSuggestionList">
-
-         <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
-          class="item-bloc">
-
+         <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod" class="item-bloc">
           <household-render-box :household="h"></household-render-box>
-
           <ul class="record_actions">
             <li>
               <button class="btn btn-sm btn-misc" @click="selectHousehold(h)">
@@ -115,8 +116,8 @@
             </li>
           </ul>
         </div>
-
       </div>
+
     </div>
   </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index fa0121157..6be5392ce 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -7,10 +7,14 @@ const appMessages = {
       household: {
         no_household_choose_one: "Aucun ménage de destination. Choisissez un ménage. Les usagers concernés par la modification apparaitront ensuite.",
         new_household: "Nouveau ménage",
-        create_household: "Créer un ménage",
+        create_household: "Créer un ménage de destination",
         search_household: "Chercher un ménage",
         will_leave_any_household: "Ne rejoignent pas de ménage",
-        leave_without_household: "Sans nouveau ménage"
+        leave_without_household: "Sans nouveau ménage",
+        where_live_the_household: "À quelle adresse habite ce ménage ?",
+        household_live_to_this_address: "Le ménage habite cette adresse",
+        no_suggestions: "Aucune adresse à suggérer",
+        delete_this_address: "Supprimer cette adresse",
       },
       concerned: {
         title: "Nouveaux membres du ménage",
@@ -29,6 +33,7 @@ const appMessages = {
       remove_position: "Retirer des {position}",
       remove_concerned: "Ne plus transférer",
       household_part: "Ménage de destination",
+      suggestions: "Suggestions",
       hide_household_suggestion: "Masquer les suggestions",
       show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
       household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 44dc8566d..bc0757574 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -1,15 +1,14 @@
 <template>
-  <div v-if="render === 'bloc'"
-    class="item-bloc">
+  <div v-if="render === 'bloc'" class="item-bloc">
     <section class="chill-entity entity-person">
-    <div class="item-row entity-bloc">
+      <div class="item-row entity-bloc">
 
         <div  class="item-col">
             <div class="entity-label">
 
                 <div :class="'denomination h' + options.hLevel">
 
-                   <a v-if="this.options.addLink === true" :href="getUrl">
+                   <a v-if="options.addLink === true" :href="getUrl">
                         <span class="firstname">{{ person.firstName }}</span>
                         <span class="lastname">{{ person.lastName }}</span>
                         <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
@@ -85,21 +84,18 @@
             <slot name="record-actions"></slot>
         </div>
 
-    </div>
+      </div>
     </section>
   </div>
 
-  <span v-if="render === 'badge'"
-    class="chill-entity entity-person badge-person">
-
-     <a v-if="this.options.addLink === true" :href="getUrl">
+  <span v-if="render === 'badge'" class="chill-entity entity-person badge-person">
+     <a v-if="options.addLink === true" :href="getUrl">
       <span v-if="options.isHolder" class="fa-stack fa-holder" :title="$t('renderbox.holder')">
         <i class="fa fa-circle fa-stack-1x text-success"></i>
         <i class="fa fa-stack-1x">T</i>
       </span>
       {{ person.text }}
     </a>
-
     <span v-else>
        <span v-if="options.isHolder" class="fa-stack fa-holder" :title="$t('renderbox.holder')">
         <i class="fa fa-circle fa-stack-1x text-success"></i>
@@ -107,8 +103,8 @@
       </span>
       {{ person.text }}
     </span>
-
   </span>
+
 </template>
 
 <script>
@@ -140,8 +136,10 @@ export default {
             return dateToISO(date);
         },
         deathdate: function(){
-            var date = new Date(this.person.deathdate.datetime);
-            return dateToISO(date);
+            if (typeof this.person.deathdate !== 'undefined') {
+               var date = new Date(this.person.deathdate.datetime);
+               return dateToISO(date);
+            }
         },
         altNameLabel: function(){
             for(let i = 0; i < this.person.altNames.length; i++){

From b69fdd459aa8a73a079880773de717853501aa19 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 31 Aug 2021 15:26:00 +0200
Subject: [PATCH 019/217] fix vue renderbox component name

---
 .../public/vuejs/_components/Entity/AddressRenderBox.vue        | 2 +-
 .../public/vuejs/_components/Entity/HouseholdRenderBox.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 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 c5e2f2d62..997774190 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -59,7 +59,7 @@
 
 <script>
 export default {
-   name: 'ShowAddress',
+   name: 'AddressRenderBox',
    props: {
       address: {
          type: Object
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index b9f6f9d66..5851a0230 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -69,7 +69,7 @@ const i18n = {
 };
 
 export default {
-  name: 'Household',
+  name: 'HouseholdRenderBox',
   props: ['household', 'isAddressMultiline'],
   components: {
     PersonRenderBox,

From 3927fd738c4e48d7fad45ecbe0ae9d4cc0528d18 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 31 Aug 2021 16:02:18 +0200
Subject: [PATCH 020/217] new choose button, improve household renderbox

---
 .../Resources/public/chill/scss/buttons.scss  |  3 ++
 .../components/Household.vue                  |  2 +-
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  2 +-
 .../_components/Entity/HouseholdRenderBox.vue | 36 +++----------------
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index ebcb04f11..6b54172c7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -19,6 +19,7 @@ $chill-theme-buttons: (
    "view":          $chill-blue,
    "misc":          $gray-300,
    "cancel":        $gray-300,
+   "choose":        $gray-300
 );
 
 @each $button, $color in $chill-theme-buttons {
@@ -68,6 +69,7 @@ $chill-theme-buttons: (
       // &.btn-action::before,
    &.btn-delete::before,
    &.btn-remove::before,
+   &.btn-choose::before,
    &.btn-cancel::before {
       font: normal normal normal 14px/1 ForkAwesome;
       margin-right: 0.5em;
@@ -91,6 +93,7 @@ $chill-theme-buttons: (
    &.btn-delete::before    { content: "\f1f8"; } // fa-trash
    &.btn-remove::before    { content: "\f00d"; } // fa-times
    &.btn-cancel::before    { content: "\f060"; } // fa-arrow-left
+   &.btn-choose::before    { content: "\f00c"; } // fa-check  // f046 fa-check-square-o
 }
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 729ad06c7..cf6d8adeb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -110,7 +110,7 @@
           <household-render-box :household="h"></household-render-box>
           <ul class="record_actions">
             <li>
-              <button class="btn btn-sm btn-misc" @click="selectHousehold(h)">
+              <button class="btn btn-sm btn-choose" @click="selectHousehold(h)">
                 {{ $t('household_members_editor.select_household') }}
               </button>
             </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 6be5392ce..794d664ca 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -37,7 +37,7 @@ const appMessages = {
       hide_household_suggestion: "Masquer les suggestions",
       show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
       household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
-      select_household: "Choisir ce ménage",
+      select_household: "Sélectionner",
       dates_title: "Période de validité",
       dates: {
         start_date: "Début de validité",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 5851a0230..694dc8440 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -15,11 +15,10 @@
 
          </div>
          <div class="item-col">
-            <ul class="list-content fa-ul">
+            <ul class="list-content">
 
                <!-- member part -->
-               <li v-if="hasCurrentMembers" class="members">
-                  <i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
+               <li v-if="hasCurrentMembers" class="members" :title="$t('current_members')">
                   <template v-for="m in currentMembers()" :key="m.id">
                      <person-render-box render="badge"
                        :person="m.person"
@@ -30,18 +29,15 @@
                      </person-render-box>
                   </template>
                </li>
-               <li v-else class="members">
-                  <i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
+               <li v-else class="members" :title="$t('current_members')">
                   <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
                </li>
 
                <!-- address part -->
                <li v-if="hasAddress()">
-                  <i class="fa fa-li fa-map-marker"></i>
                   <show-address :address="household.current_address" :isMultiline="isMultiline"></show-address>
                </li>
                <li v-else>
-                  <i class="fa fa-li fa-map-marker"></i>
                   <span class="chill-no-data-statement">{{ $t('no_current_address') }}</span>
                </li>
 
@@ -121,32 +117,10 @@ export default {
 section.chill-entity {
    &.entity-household {
 
-      .fa-hop::marker {
-         content: '::';
+      ul.list-content li::marker {
+         content: '';
       }
 
-      /*
-      .identifier {
-         //grid-area: iden;
-         font-size: 1.3em;
-         font-weight: 700;
-         color: var(--chill-blue);
-      }
-      display: grid;
-      grid-template-columns: auto auto 30%;
-      grid-template-areas:
-         "iden iden where"
-         "who  who  where";
-      .members {
-         //grid-area: who;
-         .current-members {
-            font-weight: 700;
-         }
-      }
-      .where {
-         //grid-area: where
-      }
-      */
    }
 }
 </style>

From f41997e6da595d60dd8f1cc68501a552545f8756 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 1 Sep 2021 14:33:31 +0200
Subject: [PATCH 021/217] creation api endpoint. Route found, but ajax call
 still needs to be tested

---
 .../ChillThirdPartyExtension.php              | 28 ++++++++++++-
 .../Entity/ThirdParty.php                     |  5 +++
 .../chill.api.specs.yaml                      | 41 +++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 7ada8db8e..fb3770f02 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -8,6 +8,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -47,11 +48,34 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
     {
         //declare routes for 3party bundle
         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
+           'routing' => [
               'resources' => array(
                  '@ChillThirdPartyBundle/config/routes.yaml'
               )
-           )
+              ],
+            'apis' => [
+                [
+                    'class' => \Chill\ThirdPartyBundle\Entity\ThirdParty::class,
+                    'name' => 'thirdparty',
+                    'base_path' => '/api/1.0/thirdparty/thirdparty',
+                    'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::class,
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST=> true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
+
+                            ],
+                        ]
+                    ]
+                ]
+            ],
         ));
     }
     
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 277202324..45a446443 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -30,6 +30,7 @@ use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Validator\Constraints as Assert;
 use Chill\MainBundle\Entity\Address;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * ThirdParty is a party recorded in the database.
@@ -59,6 +60,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
+     * @Groups({"read", "write"})
      */
     private $name;
 
@@ -128,6 +130,7 @@ class ThirdParty
      * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
      *   message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
      * )
+     * @Groups({"read", "write"})
      */
     private $telephone;
 
@@ -135,6 +138,7 @@ class ThirdParty
      * @var string|null
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
      * @Assert\Email(checkMX=false)
+     * @Groups({"read", "write"})
      */
     private $email;
 
@@ -143,6 +147,7 @@ class ThirdParty
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      *   cascade={"persist", "remove"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     * @Groups({"read", "write"})
      */
     private $address;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
new file mode 100644
index 000000000..32b23a747
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -0,0 +1,41 @@
+---
+openapi: "3.0.0"
+info:
+  version: "1.0.0"
+  title: "Chill api"
+  description: "Api documentation for chill. Currently, work in progress"
+servers:
+  - url: "/api"
+    description: "Your current dev server"
+
+paths:
+  /1.0/thirdparty/thirdparty.json:
+    get:
+      tags:
+        - thirdparty
+      summary: Return a list of all thirdparty items
+      responses:
+        200:
+          description: "ok"
+
+  /1.0/thirdparty/thirdparty/{id}.json:
+    get:
+      tags:
+        - thirdparty
+      summary: Return a thirdparty item by id
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The thirdparty id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "ok"
+        404:
+          description: "not found"
+        401:
+          description: "Unauthorized"

From 9961c38b3ce1a2c6f5bd204fd9b7e6019f1ab451 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 1 Sep 2021 14:36:18 +0200
Subject: [PATCH 022/217] thirdparty onthefly, still with hardcoded data

---
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 71 ++++++++++++++++---
 1 file changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index b8dced534..a681952a7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -1,23 +1,78 @@
 <template>
-   <div v-if="action === 'show'">
-      show
-      thirdparty
-      {{ id }}
+  <div v-if="action === 'show'">
+      <div class="flex-table">
+         <third-party-render-box
+            :thirdparty="thirdparty"
+            :options="{
+               addInfo: true,
+               addEntity: false,
+               addAltNames: true,
+               addId: true,
+               addLink: false,
+               hLevel: 3,
+               addCenter: true,
+               addNoData: true,
+               isMultiline: true
+            }"
+         ></third-party-render-box>
+      </div>
    </div>
    <div v-else-if="action === 'edit' || action === 'create'">
-      {{ action }}
-      thirdparty 
-      {{ id }}
+      <div class="form-floating mb-3">
+         <input class="form-control form-control-lg" id="firstname" v-model="thirdparty.firstName" v-bind:placeholder="$t('thirdparty.firstname')" />
+         <label for="firstname">{{ $t('thirdparty.firstname') }}</label>
+      </div>
+
+      <div class="form-floating mb-3">
+         <input class="form-control form-control-lg" id="lastname" v-model="thirdparty.lastName" v-bind:placeholder="$t('thirdparty.lastname')" />
+         <label for="lastname">{{ $t('thirdparty.lastname') }}</label>
+      </div>
+
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="email"><i class="fa fa-fw fa-envelope"></i></span>
+         <input class="form-control form-control-lg"
+            v-model="thirdparty.email"
+            v-bind:placeholder="$t('thirdparty.email')"
+            v-bind:aria-label="$t('thirdparty.email')"
+            aria-describedby="email" />
+      </div>
+
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
+         <input class="form-control form-control-lg"
+            v-model="thirdparty.telephone"
+            v-bind:placeholder="$t('thirdparty.phonenumber')"
+            v-bind:aria-label="$t('thirdparty.phonenumber')"
+            aria-describedby="phonenumber" />
+      </div>
+
    </div>
 </template>
 
 <script>
+import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
+
 export default {
    name: "OnTheFlyThirdParty",
-   props: ['id', 'type', 'action']
+   props: ['id', 'type', 'action'],
+   components: {
+      ThirdPartyRenderBox,
+   },
+   data: function() {
+      return {
+         thirdparty: {
+            text : "Bart Maes",
+            firstName : "Bart",
+            lastName : "Maes",
+            email : "bartmaes@gmail.com",
+            telephone : "0475 94 66 15",
+         }
+      }
+   }
 }
 // TODO move in ChillThirdpartyAssets
 </script>
 
 <style lang="css" scoped>
 </style>
+

From 19a4542e2b38fc11b494f038216d63bc72b5e4cc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 1 Sep 2021 17:34:30 +0200
Subject: [PATCH 023/217] creation of API endpoint thirdparty

---
 .../DependencyInjection/ChillThirdPartyExtension.php     | 9 +++++++++
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php   | 8 ++++----
 .../Serializer/Normalizer/ThirdPartyNormalizer.php       | 2 ++
 src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml    | 2 ++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index fb3770f02..0331e007d 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -10,6 +10,7 @@ use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Symfony\Component\HttpFoundation\Request;
 
+
 /**
  * This is the class that loads and manages your bundle configuration.
  *
@@ -59,7 +60,15 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     'name' => 'thirdparty',
                     'base_path' => '/api/1.0/thirdparty/thirdparty',
                     'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::class,
+                    'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST => true,
+                            ],
+                        ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 45a446443..75da7ad78 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -60,7 +60,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
-     * @Groups({"read", "write"})
+     * @Groups({"read"})
      */
     private $name;
 
@@ -130,7 +130,7 @@ class ThirdParty
      * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
      *   message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
      * )
-     * @Groups({"read", "write"})
+     * @Groups({"read"})
      */
     private $telephone;
 
@@ -138,7 +138,7 @@ class ThirdParty
      * @var string|null
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
      * @Assert\Email(checkMX=false)
-     * @Groups({"read", "write"})
+     * @Groups({"read"})
      */
     private $email;
 
@@ -147,7 +147,7 @@ class ThirdParty
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      *   cascade={"persist", "remove"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     * @Groups({"read", "write"})
+     * @Groups({"read"})
      */
     private $address;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 203331cb7..b8c3e2827 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -21,6 +21,8 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
         $data['id'] = $thirdParty->getId();
         $data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
             [ 'address_rendering' => 'short' ]);
+        $data['phonenumber'] = $thirdParty->getTelephone();
+        $data['email'] = $thirdParty->getEmail();
 
         return $data;
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index 32b23a747..957bf9324 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -17,6 +17,8 @@ paths:
       responses:
         200:
           description: "ok"
+        401:
+          description: "Unauthorized"
 
   /1.0/thirdparty/thirdparty/{id}.json:
     get:

From 820def6294073f09bfd7b49ad49787d0935ed9ca Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 1 Sep 2021 17:35:11 +0200
Subject: [PATCH 024/217] make onTheFly with API call

---
 .../Resources/public/vuejs/_api/OnTheFly.js   | 36 ++++++++++++++
 .../Entity/ThirdPartyRenderBox.vue            |  6 +--
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 49 +++++++++++++++----
 3 files changed, 79 insertions(+), 12 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
new file mode 100644
index 000000000..ed91ef415
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -0,0 +1,36 @@
+/*
+* GET a thirdparty by id
+*/
+const getThirdparty = (id) => {
+   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { 
+             return response.json(); 
+            }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+* POST a new person
+*/
+const postThirdparty = (body) => {
+   const url = `/api/1.0/thirdparty/thirdparty.json`;
+   return fetch(url, {
+         method: 'POST',
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+   
+export { 
+   getThirdparty, 
+   postThirdparty 
+};
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 7f21e3379..a5142b9e6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -26,7 +26,7 @@
                     <time v-else-if="thirdparty.deathdate" datetime="{{ thirdparty.deathdate.datetime }}" title="{{ thirdparty.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <span class="age">{{ thirdparty.age }}</span>
+                    <span v-if="options.addAge == true" class="age">{{ thirdparty.age }}</span>
                 </p>
             </div>
         </div>
@@ -37,9 +37,9 @@
                     <i class="fa fa-li fa-map-marker"></i>
                     <show-address :address="thirdparty.address" :isMultiline="isMultiline"></show-address>
                 </li>
-                <li v-if="thirdparty.telephone">
+                <li v-if="thirdparty.phonenumber">
                     <i class="fa fa-li fa-mobile"></i>
-                    <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
+                    <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
                 </li>
                 <li v-if="thirdparty.email">
                     <i class="fa fa-li fa-envelope-o"></i>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index a681952a7..b23121c56 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -9,6 +9,7 @@
                addAltNames: true,
                addId: true,
                addLink: false,
+               addAge: false,
                hLevel: 3,
                addCenter: true,
                addNoData: true,
@@ -40,7 +41,7 @@
       <div class="input-group mb-3">
          <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
          <input class="form-control form-control-lg"
-            v-model="thirdparty.telephone"
+            v-model="thirdparty.phonenumber"
             v-bind:placeholder="$t('thirdparty.phonenumber')"
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />
@@ -50,7 +51,8 @@
 </template>
 
 <script>
-import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
+import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
+import { getThirdparty, postThirdparty } from '../../_api/OnTheFly';
 
 export default {
    name: "OnTheFlyThirdParty",
@@ -61,18 +63,47 @@ export default {
    data: function() {
       return {
          thirdparty: {
-            text : "Bart Maes",
-            firstName : "Bart",
-            lastName : "Maes",
-            email : "bartmaes@gmail.com",
-            telephone : "0475 94 66 15",
+            type: 'thirdparty'
          }
       }
-   }
+   },
+   methods: {
+      loadThirdparty(){
+         getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
+            this.thirdparty = thirdparty;
+            resolve();
+         }));
+      },
+      postData() {
+         postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
+            this.thirdparty = thirdparty;
+            resolve();
+         }))
+      }
+   },
+   mounted() {
+      if (this.action !== 'create'){
+         this.loadThirdparty();
+      }
+   },
 }
 // TODO move in ChillThirdpartyAssets
 </script>
 
-<style lang="css" scoped>
+<style lang="scss" scoped>
+div.flex-table {
+   div.item-bloc {
+      div.item-row {
+         div.item-col:last-child {
+            justify-content: flex-start;
+         }
+      }
+   }
+}
+dl {
+   dd {
+      margin-left: 1em;
+   }
+}
 </style>
 

From 903d57ea9dfc1b349dda7cdd9b62fb48b7a43bee Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 1 Sep 2021 17:36:17 +0200
Subject: [PATCH 025/217] person_renderbox fix if there is no birthdate

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 82948a37a..38039501d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -117,15 +117,19 @@ export default {
             return this.person.gender == 'woman' ? 'fa-venus' : this.person.gender == 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
-            if(this.person.birthdate){
+            if(this.person.birthdate !== null){
             const date = new Date(this.person.birthdate.datetime);
             return dateToISO(date)
+            } else {
+                return "";
             }
         },
         deathdate: function(){
-            if(this.person.deathdate){
+            if(this.person.deathdate !== null){
             const date = new Date(this.person.deathdate.datetime);
             return date.toLocaleDateString("fr-FR");
+            } else {
+                return "";
             }
         },
         altNameLabel: function(){

From 90faa27461ea2316888ced1550e3538638e8ee64 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 2 Sep 2021 19:15:40 +0200
Subject: [PATCH 026/217] vue Address: listen to adresssSelector to
 automatically fill street/number fields

---
 .../AddAddress/AddressSelection.vue           | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 97fd495ab..e8b856f57 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -4,6 +4,8 @@
       <VueMultiselect
          id="addressSelector"
          v-model="value"
+         @search-change="listenInputSearch"
+         ref="addressSelector"
          @select="selectAddress"
          name="field"
          track-by="id"
@@ -17,7 +19,8 @@
          :options="addresses">
       </VueMultiselect>
    </div>
-   <div class="custom-address row g-1" v-if="writeNewAddress || writeNewPostalCode">
+
+   <div class="custom-address row g-1" v-if="writeNewAddress || writeNewPostalCode || (isEnteredCustomAddress && !isAddressSelectorOpen)">
       <div class="col-10">
          <div class="form-floating">
             <input class="form-control"
@@ -60,6 +63,12 @@ export default {
       writeNewPostalCode() {
          return this.entity.selected.writeNew.postCode;
       },
+      isAddressSelectorOpen() {
+         return this.$refs.addressSelector.$data.isOpen;
+      },
+      isEnteredCustomAddress() {
+         return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
+      },
       addresses() {
          return this.entity.loaded.addresses;
       },
@@ -90,6 +99,36 @@ export default {
          this.entity.selected.address.streetNumber = value.streetNumber;
          this.updateMapCenter(value.point);
       },
+      listenInputSearch(query) {
+         //console.log('listenInputSearch', query, this.isAddressSelectorOpen);
+         if (this.isAddressSelectorOpen) {
+            this.$data.value = { text: query };
+         } else if (this.isEnteredCustomAddress) {
+            let addr = this.splitAddress(this.$data.value.text);
+            this.entity.selected.address.street = addr.street;
+            this.entity.selected.address.streetNumber = addr.number;
+         }
+      },
+      splitAddress(address) {
+         let substr = address
+            .split(',')
+            .map(s => s.trim());
+         if (substr.length === 1) {
+            substr = address.split(' ');
+         }
+         let decimal = [];
+         substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) });
+         if (decimal[0] === true) {
+            return { number: substr.shift(),
+               street: substr.join(' ') }
+         }
+         else if (decimal[decimal.length - 1] === true) {
+            return { number: substr.pop(),
+               street: substr.join(' ') }
+         }
+         return { number: '',
+               street: substr.join(' ') }
+      },
       addAddress() {
          this.entity.selected.writeNew.address = true;
       }

From f6e65dddbee1c17b1690a448949c0a52f6358fcb Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 2 Sep 2021 21:06:11 +0200
Subject: [PATCH 027/217] vue Address: listen to citySelector to automatically
 fill city name and postcode fields

---
 .../AddAddress/AddressSelection.vue           | 18 ++++---
 .../components/AddAddress/CitySelection.vue   | 51 ++++++++++++++++++-
 .../Address/components/EditAddressPane.vue    |  4 +-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index e8b856f57..6f27b5fbf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -119,15 +119,21 @@ export default {
          let decimal = [];
          substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) });
          if (decimal[0] === true) {
-            return { number: substr.shift(),
-               street: substr.join(' ') }
+            return {
+               number: substr.shift(),
+               street: substr.join(' ')
+            }
          }
          else if (decimal[decimal.length - 1] === true) {
-            return { number: substr.pop(),
-               street: substr.join(' ') }
+            return {
+               number: substr.pop(),
+               street: substr.join(' ')
+            }
+         }
+         return {
+            number: '',
+            street: substr.join(' ')
          }
-         return { number: '',
-               street: substr.join(' ') }
       },
       addAddress() {
          this.entity.selected.writeNew.address = true;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index d0e196361..5bad8ed83 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -4,6 +4,8 @@
       <VueMultiselect
          id="citySelector"
          v-model="value"
+         @search-change="listenInputSearch"
+         ref="citySelector"
          @select="selectCity"
          name="field"
          track-by="id"
@@ -18,7 +20,7 @@
       </VueMultiselect>
    </div>
 
-   <div class="custom-postcode row g-1" v-if="writeNewPostcode">
+   <div class="custom-postcode row g-1" v-if="writeNewPostcode || (isEnteredCustomCity && !isCitySelectorOpen)">
       <div class="col-4">
          <div class="form-floating">
             <input class="form-control"
@@ -59,6 +61,12 @@ export default {
       writeNewPostcode() {
          return this.entity.selected.writeNew.postcode;
       },
+      isCitySelectorOpen() {
+         return this.$refs.citySelector.$data.isOpen;
+      },
+      isEnteredCustomCity() {
+         return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
+      },
       cities() {
          return this.entity.loaded.cities;
       },
@@ -81,7 +89,7 @@ export default {
    },
    methods: {
       transName(value) {
-         return `${value.code}-${value.name}`
+         return (value.code && value.name) ? `${value.code}-${value.name}` : '';
       },
       selectCity(value) {
          this.entity.selected.city = value;
@@ -90,6 +98,45 @@ export default {
          this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
       },
+      listenInputSearch(query) {
+         console.log('listenInputSearch', query, this.isCitySelectorOpen);
+         if (this.isCitySelectorOpen) {
+            this.$data.value = { text: query };
+         } else if (this.isEnteredCustomCity) {
+            let city = this.splitCity(this.$data.value.text);
+            this.$refs.citySelector.currentOptionLabel = '';
+            this.entity.selected.city = city;
+            this.entity.selected.postcode.name = city.name;
+            this.entity.selected.postcode.code = city.code;
+         }
+      },
+      splitCity(city) {
+         let substr = city
+            .split('-')
+            .map(s => s.trim());
+         if (substr.length === 1) {
+            substr = city.split(' ');
+         }
+         console.log('substr', substr);
+         let decimal = [];
+         substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) });
+         if (decimal[0] === true) {
+            return {
+               code: substr.shift(),
+               name: substr.join(' ')
+            }
+         }
+         else if (decimal[decimal.length - 1] === true) {
+            return {
+               code: substr.pop(),
+               name: substr.join(' ')
+            }
+         }
+         return {
+            code: '',
+            name: substr.join(' ')
+         }
+      },
       addPostcode() {
          this.entity.selected.writeNew.postcode = true;
       }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
index 017e6fd24..7bbad3db5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
@@ -134,7 +134,9 @@ export default {
    methods: {
       focusOnAddress() {
          const addressSelector = document.getElementById('addressSelector');
-         addressSelector.focus();
+         if (addressSelector !== null) {
+            addressSelector.focus();
+         }
       },
       updateMapCenter(point) {
          //console.log('point', point);

From d8b2d3cd901d81de8dc5de7a89e04acf7ea79ecb Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 2 Sep 2021 22:19:03 +0200
Subject: [PATCH 028/217] rename address-render-box component

(cfr b9602aa72 - file had been moved and renamed,
now we just rename component name into import and template
)
---
 .../public/vuejs/Address/components/ShowAddressPane.vue   | 6 +++---
 .../AccompanyingCourse/components/ButtonLocation.vue      | 6 +++---
 .../AccompanyingCourse/components/CourseLocation.vue      | 8 ++++----
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue       | 8 ++++----
 .../vuejs/HouseholdMembersEditor/components/Household.vue | 6 +++---
 .../vuejs/_components/Entity/HouseholdRenderBox.vue       | 6 +++---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue   | 6 +++---
 .../vuejs/_components/Entity/ThirdPartyRenderBox.vue      | 6 +++---
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index 738c1ab08..d3894f972 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -11,7 +11,7 @@
       {{ $t(getSuccessText) }}
    </div>
 
-   <show-address :address="address"></show-address>
+   <address-render-box :address="address"></address-render-box>
 
    <div v-if="showDateFrom" class='address-valid date-since'>
       <h3>{{ $t(getValidFromDateText) }}</h3>
@@ -48,12 +48,12 @@
 
 <script>
 import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
    name: 'ShowAddressPane',
    components: {
-      ShowAddress
+      AddressRenderBox
    },
    props: [
       'context',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index 34a240f2e..60d81969b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -13,7 +13,7 @@
             <h2 class="modal-title">{{ $t('courselocation.sure') }}</h2>
          </template>
          <template v-slot:body>
-            <show-address :address="person.current_household_address"></show-address>
+            <address-render-box :address="person.current_household_address"></address-render-box>
             <p>{{ $t('courselocation.sure_description') }}</p>
          </template>
          <template v-slot:footer>
@@ -28,12 +28,12 @@
 <script>
 import {mapState} from "vuex";
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
-import ShowAddress from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
+import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 
 export default {
    name: "ButtonLocation",
    components: {
-      ShowAddress,
+      import AddressRenderBox from,
       Modal,
    },
    props: ['person'],
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 790af303d..8538db3bc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -17,9 +17,9 @@
 
       <div class="flex-table" v-if="accompanyingCourse.location">
          <div class="item-bloc">
-            <show-address
+            <address-render-box
                :address="accompanyingCourse.location">
-            </show-address>
+            </address-render-box>
 
             <div v-if="isPersonLocation" class="alert alert-secondary separator">
                <label class="col-form-label">
@@ -63,13 +63,13 @@
 <script>
 import { mapState } from "vuex";
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
    name: "CourseLocation",
    components: {
       AddAddress,
-      ShowAddress
+      AddressRenderBox
    },
    data() {
       return {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 1dbc9e6d8..8162faddf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -150,7 +150,7 @@
          </div>
          <div v-else>
             <p>{{ handlingThirdParty.text }}</p>
-            <show-address :address="handlingThirdParty.address"></show-address>
+            <address-render-box :address="handlingThirdParty.address"></address-render-box>
 
             <ul class="record_actions">
                <li>
@@ -173,7 +173,7 @@
             <ul>
                <li v-for="t in thirdParties">
                   <p>{{ t.text }}</p>
-                  <show-address :address="t.address"></show-address>
+                  <address-render-box :address="t.address"></address-render-box>
 
                   <ul class="record_actions">
                      <button :title="$t('remove_thirdparty')" class="btn btn-remove"
@@ -231,7 +231,7 @@ import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
    messages: {
@@ -275,7 +275,7 @@ export default {
       AddEvaluation,
       AddPersons,
       PersonRenderBox,
-      ShowAddress,
+      AddressRenderBox,
    },
    i18n,
    data() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index cf6d8adeb..ba77e2e18 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -13,7 +13,7 @@
 
       <div v-if="filterAddressesSuggestion.length > 0" class="flex-table householdAddressSuggestionList">
         <div v-for="a in filterAddressesSuggestion" class="item-bloc">
-          <show-address :address="a"></show-address>
+          <address-render-box :address="a"></address-render-box>
            <ul class="record_actions">
               <li>
                   <button class="btn btn-action" @click="setHouseholdAddress(a)">
@@ -125,14 +125,14 @@
 <script>
 import { mapGetters, mapState } from 'vuex';
 import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 
 export default {
   name: 'Household',
   components: {
     HouseholdRenderBox,
-    ShowAddress,
+    AddressRenderBox,
     AddAddress,
   },
   data() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 694dc8440..c15938c4f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -35,7 +35,7 @@
 
                <!-- address part -->
                <li v-if="hasAddress()">
-                  <show-address :address="household.current_address" :isMultiline="isMultiline"></show-address>
+                  <address-render-box :address="household.current_address" :isMultiline="isMultiline"></address-render-box>
                </li>
                <li v-else>
                   <span class="chill-no-data-statement">{{ $t('no_current_address') }}</span>
@@ -49,7 +49,7 @@
 
 <script>
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 const i18n = {
   "messages": {
@@ -69,7 +69,7 @@ export default {
   props: ['household', 'isAddressMultiline'],
   components: {
     PersonRenderBox,
-    ShowAddress,
+    AddressRenderBox,
   },
   i18n,
    computed: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index bc0757574..bdc2b1eed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -45,7 +45,7 @@
 
                 <li v-if="person.current_household_address">
                     <i class="fa fa-li fa-map-marker"></i>
-                    <show-address :address="person.current_household_address" :isMultiline="isMultiline"></show-address>
+                    <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
                 </li>
                 <li v-else-if="options.addNoData">
                     <i class="fa fa-li fa-map-marker"></i>
@@ -109,12 +109,12 @@
 
 <script>
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
     name: "PersonRenderBox",
     components: {
-        ShowAddress
+        AddressRenderBox
     },
     props: ['person', 'options', 'render'],
     computed: {
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 1564b54a0..f3a41e4e4 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -35,7 +35,7 @@
             <ul class="list-content fa-ul">
                 <li v-if="thirdparty.address">
                     <i class="fa fa-li fa-map-marker"></i>
-                    <show-address :address="thirdparty.address" :isMultiline="isMultiline"></show-address>
+                    <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
                 </li>
                 <li v-if="thirdparty.telephone">
                     <i class="fa fa-li fa-mobile"></i>
@@ -57,13 +57,13 @@
 </template>
 
 <script>
-import ShowAddress from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 
 export default {
     name: "ThirdPartyRenderBox",
     components: {
-        ShowAddress
+        AddressRenderBox
     },
     props: ['thirdparty', 'options'],
     computed: {

From f2248a1e9c9db7b79afdff3eba9c2f641f9ccb4c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 09:59:54 +0200
Subject: [PATCH 029/217] translation, wip

---
 .../ChillMainBundle/Resources/public/vuejs/Address/i18n.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 2b4b4a9ea..c938ae86d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -28,8 +28,8 @@ const addressMessages = {
         create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
         postalCode_name: 'Nom',
         postalCode_code: 'Code postal',
-        date: 'Date de la nouvelle adresse',
-        validFrom: 'Date de la nouvelle adresse',
+        date: "Date de la nouvelle adresse",
+        validFrom: "L'adresse est valable à partir du",
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
         address_new_success: 'La nouvelle adresse est enregistrée',

From 21630a37af8bbf0eeb7ca5a30754ad894f522204 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 10:59:44 +0200
Subject: [PATCH 030/217] household banner: badge-member and holder mark in
 person theme

---
 .../Resources/public/chill/chillperson.scss         | 13 ++++++++++---
 .../Resources/public/chill/scss/render_box.scss     | 12 ++++++++++++
 .../vuejs/_components/Entity/PersonRenderBox.vue    | 11 -----------
 .../Resources/views/Household/banner.html.twig      | 11 +++++++----
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 206e0c5ad..4a762cb17 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -157,12 +157,19 @@ div.banner {
             span.badge-member {
                 flex-shrink: 0; flex-grow: 0; flex-basis: auto;
                 color: $white;
-                border: 1px solid #ffffff3b;
+                border: 1px solid transparentize($white, 0.75);
+                border-bottom: 3px solid transparentize( shade-color( $chill-green, 20%), 0.3);
                 border-radius: 8px;
-                padding: 0.4em 0.8em;
+                padding: 0.2em 0.7em;
                 margin-bottom: 0.2em;
                 margin-right: 0.3em;
-                &.holder { order: -1; }
+
+                &.holder {
+                    order: -1;
+                    .fa-holder .text-success {
+                        color: transparentize( shade-color( $chill-green, 20%), 0.3) !important;
+                    }
+                }
                 &.child { order: 2; }
             }
         }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
index 2c3eefa2d..d2d46f398 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
@@ -49,3 +49,15 @@ span.badge-person {
 span.badge-thirdparty {
     border-bottom-color: shade-color($chill-pink, 10%);
 }
+
+// household holder mark
+span.fa-holder {
+    width: 1em;
+    margin: -10px 0.3em -8px 0;
+    i:last-child {
+        font-weight: 900;
+        color: white;
+        font-size: 70%;
+        font-family: "Open Sans Extrabold";
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index bc0757574..c47daaf39 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -160,17 +160,6 @@ export default {
 
 <style lang='scss'>
 
-span.fa-holder {
-   width: 1em;
-   margin: -10px 0.3em -8px 0;
-   i:last-child {
-      font-weight: 900;
-      color: white;
-      font-size: 70%;
-      font-family: "Open Sans Extrabold";
-   }
-}
-
 .lastname:before{
     content: " "
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index 7d358de80..63e284d6a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -21,16 +21,19 @@
                             </span>
 
                             {%- for m in members|slice(0, 5) -%}
+                                <a href="{{ path('chill_person_view', { person_id: m.person.id}) }}">
                                 <span
                                     class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
                                     title="{{ m.position.label.fr }}">
                                     {%- if m.holder %}
-                                        <span class="badge bg-chill-light-gray text-chill-gray">
-                                        {{ 'household.holder'|trans }}
-                                    </span>
+                                        <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
+                                            <i class="fa fa-circle fa-stack-1x text-success"></i>
+                                            <i class="fa fa-stack-1x">T</i>
+                                        </span>
                                     {% endif -%}
-                                    {{- m.person|chill_entity_render_box({'addLink': false}) -}}
+                                    {{- m.person|chill_entity_render_box() -}}
                                 </span>
+                                </a>
                             {%- endfor -%}
 
                             {% if members|length > 5 %}

From 81b7e769e141e95b2a2bc7d594f339213191fd8a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 11:15:08 +0200
Subject: [PATCH 031/217] lightly increase heading 3-6 weight

---
 .../Resources/public/chill/chillmain.scss     |  4 +-
 .../module/bootstrap/custom/_variables.scss   |  2 +-
 .../Resources/public/chill/chillperson.scss   | 42 ++++++++++++++++++-
 .../public/chill/scss/render_box.scss         | 35 ----------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 1d7cd5db8..577cadf04 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -206,8 +206,8 @@ footer.footer {
 
 /// titles
 h1, h2,
-.h1, .h2 {
-   font-weight: $headings-font-weight + 200;
+.h1, .h2  {
+   font-weight: $headings-font-weight + 100;
 }
 
 /// typography
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
index 9e8d3031c..f9cd33f5f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
@@ -479,7 +479,7 @@ $font-sizes: (
 $headings-margin-bottom:      $spacer / 2 !default;
 $headings-font-family:        null !default;
 $headings-font-style:         null !default;
-$headings-font-weight:        500 !default;
+$headings-font-weight:        600 !default;
 $headings-line-height:        1.2 !default;
 $headings-color:              null !default;
 // scss-docs-end headings-variables
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 4a762cb17..f3759aef7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -87,7 +87,6 @@ div.person-view {
    }
 }
 
-
 /*
  *  ACCOMPANYING_COURSE CONTEXT
  *  Header custom for Accompanying Course
@@ -125,7 +124,6 @@ abbr.referrer {
     align-self: center; // in flex context
 }
 
-
 /*
  *  HOUSEHOLD CONTEXT
  *  Header custom for Household
@@ -186,3 +184,43 @@ div.banner {
         }
     }
 }
+
+/*
+*  BADGES, MARKS, PINS
+*  for chill person theme
+*/
+
+// chill person badges
+span.badge-person,
+span.badge-thirdparty {
+    display: inline-block;
+    padding: 0 0.5em !important;
+    background-color: $white;
+    color: $dark;
+    border: 1px solid $chill-ll-gray;
+    border-bottom-width: 2px;
+    border-bottom-style: solid;
+    border-radius: 6px;
+    a {
+        text-decoration: none;
+    }
+}
+span.badge-person {
+    border-bottom-color: $chill-green;
+}
+// todo: move in thirdparty
+span.badge-thirdparty {
+    border-bottom-color: shade-color($chill-pink, 10%);
+}
+
+// household holder mark
+span.fa-holder {
+    width: 1em;
+    margin: -10px 0.3em -8px 0;
+    i:last-child {
+        font-weight: 900;
+        color: white;
+        font-size: 70%;
+        font-family: "Open Sans Extrabold";
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
index d2d46f398..1aa1c214b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
@@ -26,38 +26,3 @@
         }
     }
 }
-
-// specific chill badges
-span.badge-person,
-span.badge-thirdparty {
-    display: inline-block;
-    padding: 0 0.5em !important;
-    background-color: $white;
-    color: $dark;
-    border: 1px solid $chill-ll-gray;
-    border-bottom-width: 2px;
-    border-bottom-style: solid;
-    border-radius: 6px;
-    a {
-        text-decoration: none;
-    }
-}
-span.badge-person {
-    border-bottom-color: $chill-green;
-}
-// todo: move in thirdparty
-span.badge-thirdparty {
-    border-bottom-color: shade-color($chill-pink, 10%);
-}
-
-// household holder mark
-span.fa-holder {
-    width: 1em;
-    margin: -10px 0.3em -8px 0;
-    i:last-child {
-        font-weight: 900;
-        color: white;
-        font-size: 70%;
-        font-family: "Open Sans Extrabold";
-    }
-}

From eb067fe59bddc7aff323817b864bdec16a304db7 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 2 Sep 2021 11:39:50 +0200
Subject: [PATCH 032/217] integration, test css class floatbutton

---
 .../Resources/views/Activity/list.html.twig   | 135 ++++++++++--------
 .../public/chill/scss/flex_table.scss         |  46 ++++++
 2 files changed, 121 insertions(+), 60 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 906a28d78..5bcd41c66 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -47,68 +47,12 @@
 
                         </div>
                         <div class="item-col">
-                            <ul class="list-content">
 
-                                {% if activity.user and t.userVisible %}
-                                    <li>
-                                        <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
-                                        <b>{{ activity.user.usernameCanonical }}</b>
-                                    </li>
-                                {% endif %}
+                            <div class="floatbutton top">
+                                <div class="box">
 
-                                <li>
-                                    <b>{{ activity.type.name | localize_translatable_string }}</b>
-
-                                    {% if activity.attendee is not null and t.attendeeVisible %}
-                                        {% if activity.attendee %}
-                                            {{ '→ ' ~ 'present'|trans|capitalize }}
-                                        {% else %}
-                                            {{ '→ ' ~ 'not present'|trans|capitalize }}
-                                        {% endif %}
-                                    {% endif %}
-                                </li>
-
-                                <li>
-                                    <b>{{ 'location'|trans ~ ': ' }}</b>
-                                    Domicile de l'usager
-                                    {# TODO
-                                    {% if activity.location %}{{ activity.location }}{% endif %}
-                                    #}
-                                </li>
-
-                                {%- if t.reasonsVisible -%}
-                                    <li>
-                                        {%- if activity.reasons is not empty -%}
-                                            {% for r in activity.reasons %}
-                                                {{ r|chill_entity_render_box }}
-                                            {% endfor %}
-                                        {%- endif -%}
-                                    </li>
-                                {% endif %}
-
-                                {%- if t.socialIssuesVisible %}
-                                    <li class="social-issues">
-                                        {%- if activity.socialIssues is not empty -%}
-                                            {% for r in activity.socialIssues %}
-                                                {{ r|chill_entity_render_box }}
-                                            {% endfor %}
-                                        {%- endif -%}
-                                    </li>
-                                {% endif %}
-
-                                {%- if t.socialActionsVisible -%}
-                                    <li class="social-actions">
-                                        {%- if activity.socialActions is not empty -%}
-                                            {% for r in activity.socialActions %}
-                                                {{ r|chill_entity_render_box }}
-                                            {% endfor %}
-                                        {%- endif -%}
-                                    </li>
-                                {% endif %}
-
-
-                            </ul>
-                            <ul class="record_actions">
+                                    <div class="action">
+                                        <ul class="record_actions">
                                 <li>
                                     <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
                                        class="btn btn-sm btn-show "></a>
@@ -134,6 +78,77 @@
                                     #}
                                 {% endif %}
                             </ul>
+                                    </div>
+
+                                    <ul class="list-content">
+
+                                        {% if activity.user and t.userVisible %}
+                                            <li>
+                                                <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
+                                                <b>{{ activity.user.usernameCanonical }}</b>
+                                            </li>
+                                        {% endif %}
+
+                                        <li>
+                                            <b>{{ activity.type.name | localize_translatable_string }}</b>
+
+                                            {% if activity.attendee is not null and t.attendeeVisible %}
+                                                {% if activity.attendee %}
+                                                    {{ '→ ' ~ 'present'|trans|capitalize }}
+                                                {% else %}
+                                                    {{ '→ ' ~ 'not present'|trans|capitalize }}
+                                                {% endif %}
+                                            {% endif %}
+                                        </li>
+
+                                        <li>
+                                            <b>{{ 'location'|trans ~ ': ' }}</b>
+                                            Domicile de l'usager
+
+                                            {# TODO {% if activity.location %}{{ activity.location }}{% endif %}
+                                            #}
+
+                                        </li>
+
+                                        {%- if t.reasonsVisible -%}
+                                            <li>
+                                                {%- if activity.reasons is not empty -%}
+                                                    {% for r in activity.reasons %}
+                                                        {{ r|chill_entity_render_box }}
+                                                    {% endfor %}
+                                                {%- endif -%}
+                                            </li>
+                                        {% endif %}
+
+                                        {%- if t.socialIssuesVisible %}
+                                            <li class="social-issues">
+                                                {%- if activity.socialIssues is not empty -%}
+                                                    {% for r in activity.socialIssues %}
+                                                        {{ r|chill_entity_render_box }}
+                                                    {% endfor %}
+                                                {%- endif -%}
+                                            </li>
+                                        {% endif %}
+
+                                        {%- if t.socialActionsVisible -%}
+                                            <li class="social-actions">
+                                                {%- if activity.socialActions is not empty -%}
+                                                    {% for r in activity.socialActions %}
+                                                        {{ r|chill_entity_render_box }}
+                                                    {% endfor %}
+                                                {%- endif -%}
+                                            </li>
+                                        {% endif %}
+
+
+                                    </ul>
+
+
+
+
+                                </div>
+                            </div>
+
                         </div>
                     </div>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index a939b17f8..eb0a4ca41 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -256,3 +256,49 @@ div.wrap-header {
         }
     }
 }
+
+
+/*
+*  FLOATBUTTON
+*/
+
+div.floatbutton {
+
+    width: 100%;
+    div.box {
+        width: 100%;
+        div.action {
+            float: right; /*
+            width: 50%; */
+        }
+    }
+    &.top {
+        div.action {
+            //margin: 0 0 1em 1em;
+            padding: 0 0 1em 1em;
+        }
+    }
+    &.bottom {
+        display: flex;
+        overflow: hidden;
+        //margin-bottom: 100px;
+        div.action {
+            height: calc(100% - 0em);
+            shape-outside: inset(calc(100% - 2em) 0 0);
+            display: flex;
+            align-items: flex-end;
+            padding: 0 0 0 1em;
+            * {
+                align-self: flex-end !important;
+            }
+        }
+    }
+    &.debug {
+        padding: 1em;
+        border: 1px solid black;
+        background-color: yellow;
+        div.action {
+            background-color: #00ffffa3;
+        }
+    }
+}

From f2f39d092262c88ec8424a0649c4add590e93e56 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 13:02:35 +0200
Subject: [PATCH 033/217] household: improve ux in form to edit a member

---
 .../Resources/views/Household/Member/edit.html.twig            | 3 ++-
 .../ChillPersonBundle/translations/messages+intl-icu.fr.yaml   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
index 85fee6ec9..ac712264a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
@@ -4,7 +4,8 @@
 
 {% block content %}
 
-<h1>{{ block('title') }}</h1>
+<h1>{{ member.person|chill_entity_render_string }}</h1>
+<h2 class="mb-5">{{ 'household.Edit his household'|trans }}</h2>
 
 {{ form_start(form) }}
 {{ form_widget(form) }}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 05738effb..fb7354789 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -36,6 +36,7 @@ household:
     is not holder: N'est pas titulaire
     holder: Titulaire
     Edit member household: Modifier l'appartenance au ménage
+    Edit his household: Modifier son appartenance au ménage
     Current household members: Membres actuels
     Household summary: Résumé du ménage
     Accompanying period: Parcours d'accompagnement

From 9b8b60ed759be3b68a03853c2dc863f9203ec645 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 13:07:47 +0200
Subject: [PATCH 034/217] twig person/thirdparty renderbox: add a customArea
 option

with 2 areas to begin:
* before the label
* after the label
---
 .../Resources/views/Entity/person.html.twig   | 23 ++++++++++++++----
 .../Templating/Entity/PersonRender.php        |  1 +
 .../views/Entity/thirdparty.html.twig         | 24 +++++++++++++++----
 .../Templating/Entity/ThirdPartyRender.php    |  1 +
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 8a9cc4e5d..f60b7dc9e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -16,6 +16,10 @@
         'replace'   Twig\Markup,
         'after'     Twig\Markup
     ]
+    * customArea [
+        'beforeLabel'   Twig\Markup,
+        'afterLabel'    Twig\Markup,
+    ]
 #}
 
 {% macro raw(person, options) %}
@@ -37,11 +41,22 @@
         <div class="denomination {{ 'h' ~ options['hLevel'] }}">
             {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%}
                 <a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">
-                    {{ _self.raw(person, options) }}
-                </a>
-            {%- else -%}
-                {{ _self.raw(person, options) }}
             {%- endif -%}
+
+                {% if options['customArea']['beforeLabel'] is defined %}
+                    {{ options['customArea']['beforeLabel'] }}
+                {% endif %}
+
+                {{ _self.raw(person, options) }}
+
+                {% if options['customArea']['afterLabel'] is defined %}
+                    {{ options['customArea']['afterLabel'] }}
+                {% endif %}
+
+            {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%}
+                </a>
+            {%- endif -%}
+
             {%- if options['addEntity'] -%}
                 <span class="badge rounded-pill bg-secondary">{{ 'Person'|trans }}</span>
             {%- endif -%}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index 55890c4b0..fc112a1e7 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -62,6 +62,7 @@ class PersonRender extends AbstractChillEntityRender
             'address_multiline' => $options['address_multiline'] ?? false,
             'hLevel' => $options['hLevel'] ?? 3,
             'customButtons' => $options['customButtons'] ?? [],
+            'customArea' => $options['customArea'] ?? [],
         ];
 
         return
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
index 689c98ecb..7768d2913 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -13,6 +13,10 @@
         'replace'   Twig\Markup,
         'after'     Twig\Markup
     ]
+    * customArea [
+        'beforeLabel'   Twig\Markup,
+        'afterLabel'    Twig\Markup,
+    ]
 #}
 
 {% macro raw(thirdparty, options) %}
@@ -23,13 +27,25 @@
     <div class="entity-label">
 
         <div class="denomination {{ 'h' ~ options['hLevel'] }}">
+
             {%- if options['addLink'] and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
                 <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': thirdparty.id }) }}">
-                    {{ _self.raw(thirdparty, options) }}
-                </a>
-            {%- else -%}
-                {{ _self.raw(thirdparty, options) }}
             {%- endif -%}
+
+                {% if options['customArea']['beforeLabel'] is defined %}
+                    {{ options['customArea']['beforeLabel'] }}
+                {% endif %}
+
+                {{ _self.raw(thirdparty, options) }}
+
+                {% if options['customArea']['afterLabel'] is defined %}
+                    {{ options['customArea']['afterLabel'] }}
+                {% endif %}
+    
+            {%- if options['addLink'] and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
+                </a>
+            {%- endif -%}
+
             {%- if options['addEntity'] -%}
                 <span class="badge rounded-pill bg-secondary">{{ 'Third party'|trans }}</span>
             {%- endif -%}
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index 07f6e1668..80450f7bb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -54,6 +54,7 @@ class ThirdPartyRender extends AbstractChillEntityRender
             'addInfo' => $options['addInfo'] ?? false,
             'hLevel' => $options['hLevel'] ?? 3,
             'customButtons' => $options['customButtons'] ?? [],
+            'customArea' => $options['customArea'] ?? [],
         ];
 
         return

From 3fefaf1e4dddbbf91f596d62a29fdaf447513ba5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 13:59:31 +0200
Subject: [PATCH 035/217] household summary: put member box in a reused include
 template

---
 .../views/Household/_render_member.html.twig  |  65 +++++++++
 .../views/Household/summary.html.twig         | 127 ++++--------------
 2 files changed, 93 insertions(+), 99 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
new file mode 100644
index 000000000..f1c96e5fa
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
@@ -0,0 +1,65 @@
+{% macro addHolder(holder) %}
+    {% if holder %}
+        <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
+            <i class="fa fa-circle fa-stack-1x text-success"></i>
+            <i class="fa fa-stack-1x">T</i>
+        </span>
+    {% endif %}
+{% endmacro %}
+
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col" style="flex-basis: 30%;">
+            {{ member.person|chill_entity_render_box({
+                'render': 'label',
+                'addLink': true,
+                'addInfo': true,
+                'customArea': {
+                    'afterLabel': _self.addHolder(member.holder)
+                }
+            }) }}
+        </div>
+        <div class="item-col">
+            <div class="floatbutton top"><div class="box">
+
+                    <div class="action">
+                        <ul class="record_actions">
+
+                            {% if customButtons['before'] is defined %}
+                                {{ customButtons['before'] }}
+                            {% endif %}
+
+                            <li>
+                                <a  class="btn btn-sm btn-edit"
+                                    title="{{ 'household.Update membership'|trans }}"
+                                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
+                            </li>
+
+                            {% if customButtons['after'] is defined %}
+                                {{ customButtons['after'] }}
+                            {% endif %}
+
+                        </ul>
+                    </div>
+
+                    <ul class="list-content fa-ul small ms-0">
+                    {% if member.startDate is not empty %}
+                        <li><i class="fa fa-long-arrow-right"></i>
+                            {{ 'Since %date%'|trans({'%date%': member.startDate|format_date('short') }) }}</li>
+                    {% endif %}
+                    {% if member.endDate is not empty %}
+                        <li><i class="fa fa-long-arrow-right"></i>
+                            {{ 'Until %date%'|trans({'%date%': member.endDate|format_date('short') }) }}</li>
+                    {% endif %}
+                    </ul>
+
+                    {% if member.comment is not empty %}
+                        <blockquote class="chill-user-quote ms-0 mb-0" style="clear: right">
+                            {{ member.comment|chill_markdown_to_html }}
+                        </blockquote>
+                    {% endif %}
+
+                </div></div>
+        </div>
+    </div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 933032426..1b1d22775 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -12,11 +12,13 @@
 {% set address = household.currentAddress %}
 
 {% if address is empty %}
-<p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+    <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
 {% else %}
-<div>
-  {{ address|chill_entity_render_box({'multiline': true}) }}
-</div>
+    <div class="flex-table">
+        <div class="item-bloc">
+          {{ address|chill_entity_render_box({'multiline': true}) }}
+        </div>
+    </div>
 {% endif %}
 
 <h2>{{ 'household.Household members'|trans }}</h2>
@@ -81,67 +83,31 @@
   {% endif %}
 
   {%- set members = household.currentMembersByPosition(p) %}
+
+  {% macro customButtons(member, household) %}
+      <li>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
+             class="btn btn-sm btn-misc"><i class="fa fa-arrows-h"></i>
+              {{ 'household.Change position'|trans }}</a>
+      </li>
+      <li>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
+             class="btn btn-sm btn-misc"><i class="fa fa-sign-out"></i>
+              {{ 'household.Leave'|trans }}</a>
+      </li>
+  {% endmacro %}
+
   {% if members|length > 0 %}
     <div class="flex-table list-household-members">
       {% for m in members %}
-        <div class="item-bloc">
-          <div class="item-row">
-            <div class="item-col">
-              <div>
-                {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                {% if m.holder %}
-                  <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
-                {% endif %}
-              </div>
-              <div>
-                {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-              </div>
-            </div>
-            <div class="item-col">
-              <ul class="list-content fa-ul">
-                {% if m.startDate is not empty %}
-                  <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                {% endif %}
-                {% if m.endDate is not empty %}
-                  <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                {% endif %}
-              </ul>
-              <ul class="record_actions">
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
-                        class="btn btn-edit" />
-                        {{ 'household.Update membership'|trans }}
-                    </a>
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'household': household.id} ) }}"
-                        class="btn btn-misc" />
-                        <i class="fa fa-arrows-h"></i>
-                        {{ 'household.Change position'|trans }}
-                    </a>
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
-                        class="btn btn-misc" />
-                        <i class="fa fa-sign-out"></i>
-                        {{ 'household.Leave'|trans }}
-                    </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-          {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-          {% endif %}
-        </div>
+          {% include '@ChillPerson/Household/_render_member.html.twig' with {
+              'member': m,
+              'customButtons': { 'after': _self.customButtons(m, household) }
+          } %}
       {% endfor %}
     </div>
   {% else %}
-  <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+    <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
   {% endif %}
 
   {% set members = household.nonCurrentMembersByPosition(p) %}
@@ -154,46 +120,9 @@
     <div id="nonCurrent_{{ p.id }}" class="collapse">
       <div class="flex-table list-household-members">
         {% for m in members %}
-          <div class="item-bloc">
-            <div class="item-row">
-              <div class="item-col">
-                <div>
-                  {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                  {% if m.holder %}
-                    <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
-                  {% endif %}
-                </div>
-                <div>
-                  {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-                </div>
-              </div>
-              <div class="item-col">
-                <ul class="list-content fa-ul">
-                  {% if m.startDate is not empty %}
-                    <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                  {% endif %}
-                  {% if m.endDate is not empty %}
-                    <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                  {% endif %}
-                </ul>
-                <ul class="record_actions">
-                  <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
-                    class="btn btn-edit">
-                      {{ 'household.Update membership'|trans }}
-                    </a>
-                  </li>
-                </ul>
-              </div>
-            </div>
-            {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-            {% endif %}
-          </div>
+            {% include '@ChillPerson/Household/_render_member.html.twig' with {
+                'member': m
+            } %}
         {% endfor %}
       </div>
     </div>

From d575b48e762ed77cc14b2550bf37242ed6657b76 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 15:31:00 +0200
Subject: [PATCH 036/217] household banner: <a> tag inside <span> if we want
 flex order

---
 .../Resources/views/Household/banner.html.twig | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index 63e284d6a..f5348e6be 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -21,19 +21,19 @@
                             </span>
 
                             {%- for m in members|slice(0, 5) -%}
-                                <a href="{{ path('chill_person_view', { person_id: m.person.id}) }}">
                                 <span
                                     class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
                                     title="{{ m.position.label.fr }}">
-                                    {%- if m.holder %}
-                                        <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
-                                            <i class="fa fa-circle fa-stack-1x text-success"></i>
-                                            <i class="fa fa-stack-1x">T</i>
-                                        </span>
-                                    {% endif -%}
-                                    {{- m.person|chill_entity_render_box() -}}
+                                    <a href="{{ path('chill_person_view', { person_id: m.person.id}) }}">
+                                        {%- if m.holder %}
+                                            <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
+                                                <i class="fa fa-circle fa-stack-1x text-success"></i>
+                                                <i class="fa fa-stack-1x">T</i>
+                                            </span>
+                                        {% endif -%}
+                                        {{- m.person|chill_entity_render_box() -}}
+                                    </a>
                                 </span>
-                                </a>
                             {%- endfor -%}
 
                             {% if members|length > 5 %}

From 8b945dc38baeb0b89adf140ab7feb1de6036c7a8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 18:30:43 +0200
Subject: [PATCH 037/217] test a new chill help tooltip

---
 .../Resources/public/chill/chillmain.scss          | 14 ++++++++++++++
 .../Resources/views/Household/summary.html.twig    | 11 ++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 577cadf04..436f764dd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -276,6 +276,20 @@ div.metadata {
    }
 }
 
+/// chill help tooltip
+
+.chill-help-tooltip {
+   &::before {
+      content: '\f05a';
+      color: $chill-pink;
+      font-family: ForkAwesome;
+      font-style: normal;
+      font-size: 120%;
+      cursor: pointer;
+      margin: auto 0.3em;
+   }
+}
+
 /// display definition list
 //  with dt and dd on same line
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 1b1d22775..614e13fed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -76,11 +76,12 @@
 
 
 {% for p in positions %}
-  <h3>{{ p.label|localize_translatable_string }}</h3>
-
-  {% if false == p.shareHousehold %}
-    <p>{{ 'household.Those members does not share address'|trans }}</p>
-  {% endif %}
+  <h3>{{ p.label|localize_translatable_string }}
+      {% if false == p.shareHousehold %}
+          <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
+             title="{{ 'household.Those members does not share address'|trans }}"></i>
+      {% endif %}
+  </h3>
 
   {%- set members = household.currentMembersByPosition(p) %}
 

From 81f97980fc57f8f0d3287f2e3662a57e4d06c2c8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 3 Sep 2021 18:31:19 +0200
Subject: [PATCH 038/217] household members: fold/unfold accordion

---
 .../public/chill/scss/flex_table.scss         | 13 +++--
 .../views/Household/summary.html.twig         | 51 +++++++++++++------
 .../translations/messages+intl-icu.fr.yaml    |  1 +
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index eb0a4ca41..0f4dc3e8a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -263,25 +263,23 @@ div.wrap-header {
 */
 
 div.floatbutton {
-
     width: 100%;
+
     div.box {
         width: 100%;
+
         div.action {
-            float: right; /*
-            width: 50%; */
+            float: right;
         }
     }
     &.top {
         div.action {
-            //margin: 0 0 1em 1em;
             padding: 0 0 1em 1em;
         }
     }
     &.bottom {
         display: flex;
         overflow: hidden;
-        //margin-bottom: 100px;
         div.action {
             height: calc(100% - 0em);
             shape-outside: inset(calc(100% - 2em) 0 0);
@@ -301,4 +299,9 @@ div.floatbutton {
             background-color: #00ffffa3;
         }
     }
+
+    // avoid a position relative that make links unclickable
+    .fa-ul > li {
+        position: initial;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 614e13fed..89bb4da14 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -53,9 +53,9 @@
 
   {% if household.waitingForBirth %}
     {% if household.waitingForBirthDate is not null %}
-    {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
+        {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
     {% else %}
-    {{ 'household.Expecting for birth'|trans }}
+        {{ 'household.Expecting for birth'|trans }}
     {% endif %}
   {% else %}
     <p class="chill-no-data-statement">
@@ -76,6 +76,7 @@
 
 
 {% for p in positions %}
+<div class="mb-5">
   <h3>{{ p.label|localize_translatable_string }}
       {% if false == p.shareHousehold %}
           <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
@@ -113,22 +114,42 @@
 
   {% set members = household.nonCurrentMembersByPosition(p) %}
   {% if members|length > 0 %}
-    <p><!-- force a space after table --></p>
-    <button class="btn btn-green" type="button" data-bs-toggle="collapse" data-bs-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
-      {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
-    </button>
 
-    <div id="nonCurrent_{{ p.id }}" class="collapse">
-      <div class="flex-table list-household-members">
-        {% for m in members %}
-            {% include '@ChillPerson/Household/_render_member.html.twig' with {
-                'member': m
-            } %}
-        {% endfor %}
-      </div>
+    <style>
+        button[aria-expanded="true"] > span.folded,
+        button[aria-expanded="false"] > span.unfolded { display: none; }
+        button[aria-expanded="false"] > span.folded,
+        button[aria-expanded="true"] > span.unfolded { display: inline; }
+    </style>
+    <div class="accordion" id="nonCurrent">
+        <div class="accordion-item">
+            <h2 class="accordion-header" id="heading_{{ p.id }}">
+                <button
+                    class="accordion-button collapsed"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#collapse_{{ p.id }}"
+                    aria-expanded="false"
+                    aria-controls="collapse_{{ p.id }}">
+                    <span class="folded">{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}</span>
+                    <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
+                </button>
+            </h2>
+            <div id="collapse_{{ p.id }}"
+                class="accordion-collapse collapse"
+                aria-labelledby="heading_{{ p.id }}"
+                data-bs-parent="#nonCurrent">
+                <div class="flex-table my-0 list-household-members">
+                    {% for m in members %}
+                        {% include '@ChillPerson/Household/_render_member.html.twig' with { 'member': m } %}
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
     </div>
-
   {% endif %}
+
+</div>
 {% endfor %}
 
 <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index fb7354789..cdaf55cc8 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -19,6 +19,7 @@ household:
             many {Montrer # anciennes ou futures appartenances}
             other {Montrer # anciennes ou futures appartenances}
         }
+    Hide memberships: Masquer
     Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage.
     Any persons into this position: Aucune personne n'appartient au ménage à cette position.
     Leave household: Quitter le ménage

From d51752fa4118ac8d9009c63fe3fbd44f680c97ce Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 4 Sep 2021 12:40:42 +0200
Subject: [PATCH 039/217] Address, city/address selector: update writeNew flag
 when choose existing or create new

---
 .../Address/components/AddAddress/AddressSelection.vue     | 3 +++
 .../vuejs/Address/components/AddAddress/CitySelection.vue  | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 6f27b5fbf..50a1bd8c1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -97,6 +97,7 @@ export default {
          this.entity.selected.address = value;
          this.entity.selected.address.street = value.street;
          this.entity.selected.address.streetNumber = value.streetNumber;
+         this.entity.selected.writeNew.address = false;
          this.updateMapCenter(value.point);
       },
       listenInputSearch(query) {
@@ -107,6 +108,7 @@ export default {
             let addr = this.splitAddress(this.$data.value.text);
             this.entity.selected.address.street = addr.street;
             this.entity.selected.address.streetNumber = addr.number;
+            this.entity.selected.writeNew.address = true;
          }
       },
       splitAddress(address) {
@@ -136,6 +138,7 @@ export default {
          }
       },
       addAddress() {
+         console.log('addAddress: pass here ?? never, it seems');
          this.entity.selected.writeNew.address = true;
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 5bad8ed83..828c3ed96 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -95,11 +95,12 @@ export default {
          this.entity.selected.city = value;
          this.entity.selected.postcode.name = value.name;
          this.entity.selected.postcode.code = value.code;
+         this.entity.selected.writeNew.postcode = false;
          this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
       },
       listenInputSearch(query) {
-         console.log('listenInputSearch', query, this.isCitySelectorOpen);
+         //console.log('listenInputSearch', query, this.isCitySelectorOpen);
          if (this.isCitySelectorOpen) {
             this.$data.value = { text: query };
          } else if (this.isEnteredCustomCity) {
@@ -108,6 +109,7 @@ export default {
             this.entity.selected.city = city;
             this.entity.selected.postcode.name = city.name;
             this.entity.selected.postcode.code = city.code;
+            this.entity.selected.writeNew.postcode = true;
          }
       },
       splitCity(city) {
@@ -117,7 +119,7 @@ export default {
          if (substr.length === 1) {
             substr = city.split(' ');
          }
-         console.log('substr', substr);
+         //console.log('substr', substr);
          let decimal = [];
          substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) });
          if (decimal[0] === true) {
@@ -138,6 +140,7 @@ export default {
          }
       },
       addPostcode() {
+         console.log('addPostcode: pass here ?? never, it seems');
          this.entity.selected.writeNew.postcode = true;
       }
    }

From 2208518ca07d12ad7bcbd78b98bf3f5ddfdd4f42 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 4 Sep 2021 12:47:47 +0200
Subject: [PATCH 040/217] AddAddress: add new address or update existing
 address: split fetch cascade and factorize reused functions

---
 .../vuejs/Address/components/AddAddress.vue   | 106 ++++++++----------
 1 file changed, 48 insertions(+), 58 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 fa4ff4773..5eeda6ac7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -248,7 +248,6 @@ export default {
       *  Opening and closing Panes when interacting with buttons
       */
       openShowPane() {
-         console.log('open the Show Panel');
 
          if (this.context.edit) {
             this.getInitialAddress(this.context.addressId);
@@ -263,17 +262,18 @@ export default {
 
          } else {
             this.flag.showPane = true;
+            console.log('step1: open the Show Panel');
          }
       },
 
       openEditPane() {
-         console.log('open the Edit panel');
+         console.log('step2: open the Edit panel');
          this.initForm();
          this.getCountries();
       },
 
       closeEditPane() {
-         console.log('close the Edit Panel');
+         console.log('step2: close the Edit Panel');
          this.applyChanges();
          this.flag.showPane = true;
          this.flag.editPane = false;
@@ -413,7 +413,7 @@ export default {
                newAddress: newAddress
             });
          } else {
-            this.addAddress(newAddress);
+            this.addNewAddress(newAddress);
          }
       },
 
@@ -421,56 +421,52 @@ export default {
       *  Async POST transactions,
       *  creating new address, and receive backend datas when promise is resolved
       */
-      addAddress(payload)
+      addNewAddress(payload)
       {
+         //console.log('addNewAddress', payload);
          this.flag.loading = true;
+
          if ('newPostcode' in payload) {
 
             let postcodeBody = payload.newPostcode;
             if (this.context.entity.type === 'person') {
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
-
             postPostalCode(postcodeBody)
-               .then(postalCode => {
-                  let body = payload;
-                  body.postcode = {'id': postalCode.id },
-                     postAddress(body)
-                        .then(address => new Promise((resolve, reject) => {
-                           this.entity.address = address;
-                           this.flag.loading = false;
-                           this.flag.success = true;
-                           resolve();
-                        }))
-                        .catch((error) => {
-                           this.errorMsg.push(error);
-                           this.flag.loading = false;
-                        });
-               })
+               .then(postalCode =>  {
+                  payload.postcode = {'id': postalCode.id };
+                  this.postNewAddress(payload);
+               });
 
          } else {
-            postAddress(payload)
-               .then(address => new Promise((resolve, reject) => {
-                  this.entity.address = address;
-                  this.flag.loading = false;
-                  this.flag.success = true;
-                  resolve();
-               }))
-               .catch((error) => {
-                  this.errorMsg.push(error);
-                  this.flag.loading = false;
-               });
+            this.postNewAddress(payload);
          }
       },
 
+      postNewAddress(payload) {
+         //console.log('postNewAddress', payload);
+         postAddress(payload)
+            .then(address => new Promise((resolve, reject) => {
+               this.entity.address = address;
+               this.flag.loading = false;
+               this.flag.success = true;
+               resolve();
+            }))
+            .catch((error) => {
+               this.errorMsg.push(error);
+               this.flag.loading = false;
+            });
+      },
+
       /*
       *  Async PATCH transactions,
       *  then update existing address with backend datas when promise is resolved
       */
       updateAddress(payload)
       {
-         // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
          this.flag.loading = true;
+
+         // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
          if ('newPostcode' in payload.newAddress) {
 
             let postcodeBody = payload.newAddress.newPostcode;
@@ -478,36 +474,30 @@ export default {
 
             postPostalCode(postcodeBody)
                .then(postalCode => {
-                  let body = payload.newAddress;
-                  body.postcode = {'id': postalCode.id },
-                     patchAddress(payload.addressId, body)
-                        .then(address => new Promise((resolve, reject) => {
-                           this.entity.address = address;
-                           this.flag.loading = false;
-                           this.flag.success = true;
-                           resolve();
-                        }))
-                        .catch((error) => {
-                           this.errorMsg.push(error);
-                           this.flag.loading = false;
-                        });
-               })
+                  payload.newAddress.postcode = {'id': postalCode.id };
+                  this.patchExistingAddress(payload.addressId, payload.newAddress);
+               });
 
          } else {
-            patchAddress(payload.addressId, payload.newAddress)
-               .then(address => new Promise((resolve, reject) => {
-                  this.entity.address = address;
-                  this.flag.loading = false;
-                  this.flag.success = true;
-                  resolve();
-               }))
-               .catch((error) => {
-                  this.errorMsg.push(error);
-                  this.flag.loading = false;
-               });
+            this.patchExistingAddress(payload.addressId, payload.newAddress);
          }
       },
 
+      patchExistingAddress(addressId, newAddress) {
+         console.log('patchExistingAddress', addressId, newAddress);
+         patchAddress(addressId, newAddress)
+            .then(address => new Promise((resolve, reject) => {
+               this.entity.address = address;
+               this.flag.loading = false;
+               this.flag.success = true;
+               resolve();
+            }))
+            .catch((error) => {
+               this.errorMsg.push(error);
+               this.flag.loading = false;
+            });
+      },
+
       /*
       *  When submit address
       *  (get out step1 show pane, submit button)

From 374ac652d40b59aad9a57855cef03c0c0a4668a9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 4 Sep 2021 14:26:03 +0200
Subject: [PATCH 041/217] AddAddress: submitNewAddress return callback payload,
 and parent patch date then postTo (TO BE MORE TESTED)

improve pattern for better reusability of AddAddress component
---
 .../Resources/public/vuejs/Address/App.vue    |  83 ++++++++++++--
 .../vuejs/Address/components/AddAddress.vue   | 106 +++---------------
 2 files changed, 86 insertions(+), 103 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 0ae6fc578..249b53588 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,9 +1,4 @@
 <template>
-
-   <div v-for="error in displayErrors" class="alert alert-danger my-2">
-      {{ error }}
-   </div>
-
    <add-address
       v-bind:key="context.entity.type"
       v-bind:context="context"
@@ -23,6 +18,8 @@
 *
 * */
 import AddAddress from './components/AddAddress.vue';
+import { patchAddress } from "./api";
+import { postAddressToHousehold, postAddressToPerson } from "ChillPersonAssets/vuejs/_api/AddAddress";
 
 export default {
    name: "App",
@@ -39,6 +36,9 @@ export default {
             },
             addressId: window.addressId | null,
             backUrl: window.backUrl,
+            valid: {
+               from: new Date()
+            },
          },
          addAddress: {
             options: {
@@ -75,12 +75,75 @@ export default {
       },
       submitAddress() {
          console.log('@@@ click on Submit Address Button');
+         let payload = this.$refs.addAddress.submitNewAddress(); // Cast child method
+         this.addDateToAddressAndPostAddressTo(payload);
+      },
+      addDateToAddressAndPostAddressTo(payload)
+      {
+         payload.body = {
+            validFrom: {
+               datetime: `${this.context.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
+            }
+         };
+         console.log('addDateToAddress', payload);
 
-         // Cast child method
-         this.$refs.addAddress.submitNewAddress();
-         // it fetch post request only for person and household
-         // else get returned payload then dispatch from here (parent)
-      }
+         this.$refs.addAddress.flag.loading = true;
+         return patchAddress(payload.addressId, payload.body)
+            .then(address => new Promise((resolve, reject) => {
+                  this.context.valid.from = address.validFrom;
+                  resolve();
+               })
+                  .then(this.postAddressTo(payload))
+            )
+            .catch((error) => {
+               this.$refs.addAddress.errorMsg.push(error);
+               this.$refs.addAddress.flag.loading = false;
+            });
+      },
+
+      postAddressTo(payload)
+      {
+         console.log('postAddressTo', payload.entity);
+         if (!this.context.edit) {
+            switch (payload.entity) {
+               case 'household':
+                  postAddressToHousehold(payload.entityId, payload.addressId)
+                     .then(household => new Promise((resolve, reject) => {
+                        console.log('..toHousehold', household);
+                        this.$refs.addAddress.flag.loading = false;
+                        this.$refs.addAddress.flag.success = true;
+                        window.location.assign(this.context.backUrl);
+                        resolve();
+                     }))
+                     .catch((error) => {
+                        this.$refs.addAddress.errorMsg.push(error);
+                        this.$refs.addAddress.flag.loading = false;
+                     })
+                  ;
+                  break;
+               case 'person':
+                  postAddressToPerson(payload.entityId, payload.addressId)
+                     .then(person => new Promise((resolve, reject) => {
+                        console.log('..toPerson', person);
+                        this.$refs.addAddress.flag.loading = false;
+                        this.$refs.addAddress.flag.success = true;
+                        window.location.assign(this.context.backUrl);
+                        resolve();
+                     }))
+                     .catch((error) => {
+                        this.$refs.addAddress.errorMsg.push(error);
+                        this.$refs.addAddress.flag.loading = false;
+                     })
+                  ;
+                  break;
+               default:
+                  this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
+            }
+         } else {
+            // address is already linked, just finish !
+            window.location.assign(this.context.backUrl);
+         }
+      },
    }
 }
 </script>
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 5eeda6ac7..19d35381c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -29,7 +29,7 @@
                v-bind:options="this.options"
                v-bind:default="this.default"
                v-bind:entity="this.entity"
-               v-bind:valid="this.valid"
+               v-bind:valid="this.context.valid"
                v-bind:flag="this.flag"
                ref="showAddress">
             </show-address-pane>
@@ -55,7 +55,7 @@
          v-bind:options="this.options"
          v-bind:default="this.default"
          v-bind:entity="this.entity"
-         v-bind:valid="this.valid"
+         v-bind:valid="this.context.valid"
          v-bind:flag="this.flag"
          ref="showAddress"
          v-bind:insideModal="false" @openEditPane="openEditPane"
@@ -182,10 +182,6 @@ export default {
                zoom: 12
             },
          },
-         valid: {
-            from: new Date(),
-            to: null
-         },
          errorMsg: []
       }
    },
@@ -475,17 +471,17 @@ export default {
             postPostalCode(postcodeBody)
                .then(postalCode => {
                   payload.newAddress.postcode = {'id': postalCode.id };
-                  this.patchExistingAddress(payload.addressId, payload.newAddress);
+                  this.patchExistingAddress(payload);
                });
 
          } else {
-            this.patchExistingAddress(payload.addressId, payload.newAddress);
+            this.patchExistingAddress(payload);
          }
       },
 
-      patchExistingAddress(addressId, newAddress) {
-         console.log('patchExistingAddress', addressId, newAddress);
-         patchAddress(addressId, newAddress)
+      patchExistingAddress(payload) {
+         console.log('patchExistingAddress', payload);
+         patchAddress(payload.addressId, payload.newAddress)
             .then(address => new Promise((resolve, reject) => {
                this.entity.address = address;
                this.flag.loading = false;
@@ -499,7 +495,7 @@ export default {
       },
 
       /*
-      *  When submit address
+      *  Method called by parent when submitting address
       *  (get out step1 show pane, submit button)
       */
       submitNewAddress()
@@ -507,92 +503,16 @@ export default {
          let payload = {
             entity: this.context.entity.type,
             entityId: this.context.entity.id,
-            addressId: this.entity.address.address_id,
-            body: {
-               validFrom: {
-                  datetime: `${this.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
-               }
-            },
-            backUrl: this.context.backUrl
-         }
+            addressId: this.entity.address.address_id
+         };
 
-         if ( payload.entity !== 'person' && payload.entity !== 'household' ) {
-
-            // just return payload to parent
-            // (changes will be patched in parent store)
-            this.initForm();
-            this.flag.showPane = false;
-            return payload;
-         }
-
-         console.log('submitNewAddress with', payload);
-         this.addDateToAddressAndAddressTo(payload);
+         console.log('submitNewAddress return', payload);
 
          this.initForm();
          this.flag.showPane = false;
-      },
-
-      addDateToAddressAndAddressTo(payload)
-      {
-         console.log('addDateToAddressAndAddressTo', payload.entity)
-         this.flag.loading = true;
-         return patchAddress(payload.addressId, payload.body)
-            .then(address => new Promise((resolve, reject) => {
-                  this.valid.from = address.validFrom;
-                  resolve();
-               })
-               .then(this.postAddressTo(payload))
-            )
-            .catch((error) => {
-               this.errorMsg.push(error);
-               this.flag.loading = false;
-            });
-      },
-
-      postAddressTo(payload)
-      {
-         console.log('postAddressTo', payload.entity);
-         if (!this.context.edit) {
-            switch (payload.entity) {
-               case 'household':
-                  postAddressToHousehold(payload.entityId, payload.addressId)
-                     .then(household => new Promise((resolve, reject) => {
-                        console.log('postAddressToHousehold', household);
-                        this.flag.loading = false;
-                        this.flag.success = true;
-                        window.location.assign(payload.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.errorMsg.push(error);
-                        this.flag.loading = false;
-                     })
-                  ;
-                  break;
-               case 'person':
-                  postAddressToPerson(payload.entityId, payload.addressId)
-                     .then(person => new Promise((resolve, reject) => {
-                        console.log('postAddressToPerson', person);
-                        this.flag.loading = false;
-                        this.flag.success = true;
-                        window.location.assign(payload.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.errorMsg.push(error);
-                        this.flag.loading = false;
-                     })
-                  ;
-                  break;
-               default:
-                  this.errorMsg.push('That entity is not managed by address !');
-            }
-         } else {
-            // address is already linked, just finish !
-            window.location.assign(payload.backUrl);
-         }
-      },
 
+         return payload;
+      }
    }
 }
 </script>

From 93c08f7e18e4fe2cee236998cddee3ba9a791c1c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 15:05:08 +0200
Subject: [PATCH 042/217] vue_accourse: adding current_household link on
 associated_persons

---
 .../components/ButtonLocation.vue             |  2 +-
 .../PersonsAssociated/ParticipationItem.vue   | 21 ++++++++++++-------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  3 +++
 .../_components/Entity/PersonRenderBox.vue    | 16 +++++++++++---
 .../Normalizer/PersonNormalizer.php           |  7 ++++++-
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index 60d81969b..f4f2f1c78 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -33,7 +33,7 @@ import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRe
 export default {
    name: "ButtonLocation",
    components: {
-      import AddressRenderBox from,
+      AddressRenderBox,
       Modal,
    },
    props: ['person'],
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index ce6a20bb6..45cdd9775 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -9,7 +9,8 @@
                addAge : false,
                hLevel : 3,
             }"
-      :person="participation.person">
+      :person="participation.person"
+      :returnPath="getAccompanyingCourseReturnPath">
 
       <template v-slot:record-actions>
          <ul class="record_actions">
@@ -40,11 +41,17 @@
             <li>
                <button v-if="!participation.endDate"
                   class="btn btn-sm btn-remove"
-                  v-bind:title="$t('action.remove')"
+                  v-bind:title="$t('persons_associated.leave_course')"
                   @click.prevent="$emit('close', participation)">
                </button>
                <button v-else
-                  class="btn btn-sm btn-remove disabled"></button>
+                  class="btn btn-sm btn-secondary"
+                  :title="$t('persons_associated.date_start_to_end', {
+                    start: $d(participation.startDate.datetime, 'short'),
+                    end: $d(participation.endDate.datetime, 'short')
+                  })">
+                  <i class="fa fa-fw fa-info"></i>
+               </button>
             </li>
          </ul>
 
@@ -86,6 +93,9 @@ export default {
             return true;
          }
          return false;
+      },
+      getAccompanyingCourseReturnPath() {
+         return `fr/parcours/${this.$store.state.accompanyingCourse.id}/edit#section-10`;
       }
    }
 }
@@ -93,10 +103,7 @@ export default {
 /*
  *  dates of participation
  *
- *   :title="$t('persons_associated.date_start_to_end', {
- *      start: $d(participation.startDate.datetime, 'short'),
- *      end: $d(participation.endDate.datetime, 'short')
- *   })"
+ *
  *
  *   <tr>
  *      <td><span v-if="participation.startDate">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index d6954c3d4..1486ec956 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -42,6 +42,9 @@ const appMessages = {
          enddate: "Date de sortie",
          add_persons: "Ajouter des usagers",
          date_start_to_end: "Participation du {start} au {end}",
+         leave_course: "L'usager quitte le parcours",
+         show_household_number: "Voir le ménage n° {id}",
+         show_household: "Voir le ménage"
       },
       requestor: {
          title: "Demandeur",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 120de65f1..d05b4ce99 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -44,8 +44,15 @@
             <ul class="list-content fa-ul">
 
                 <li v-if="person.current_household_address">
-                    <i class="fa fa-li fa-map-marker"></i>
-                    <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
+                   <i class="fa fa-li fa-map-marker"></i>
+                   <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
+                   <a :href="getCurrentHouseholdUrl" :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
+                      <span class="badge rounded-pill bg-chill-beige">
+                         <i class="fa fa-fw fa-home"></i>
+                         <!--{{ $t('persons_associated.show_household') }}-->
+                      </span>
+                   </a>
+                   <br>
                 </li>
                 <li v-else-if="options.addNoData">
                     <i class="fa fa-li fa-map-marker"></i>
@@ -116,7 +123,7 @@ export default {
     components: {
         AddressRenderBox
     },
-    props: ['person', 'options', 'render'],
+    props: ['person', 'options', 'render', 'returnPath'],
     computed: {
         getGender: function() {
             return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
@@ -153,6 +160,9 @@ export default {
         },
         getUrl() {
            return `/fr/person/${this.person.id}/general`;
+        },
+        getCurrentHouseholdUrl() {
+           return `/fr/person/household/${this.person.current_household_id}/summary?returnPath=${this.returnPath}`
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
index cde495f52..07f9a11be 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
@@ -19,6 +19,7 @@
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -61,6 +62,9 @@ class PersonNormalizer implements
 
     public function normalize($person, string $format = null, array $context = array())
     {
+        /** @var Household $household */
+        $household = $person->getCurrentHousehold();
+
         /** @var Person $person */
         return [
             'type' => 'person',
@@ -76,6 +80,7 @@ class PersonNormalizer implements
             'gender' => $person->getGender(),
             'gender_numeric' => $person->getGenderNumeric(),
             'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress()),
+            'current_household_id' => $household ? $this->normalizer->normalize($household->getId()) : null,
         ];
     }
 
@@ -89,7 +94,7 @@ class PersonNormalizer implements
 
         return $r;
     }
-    
+
 
     public function supportsNormalization($data, string $format = null): bool
     {

From 1a95b44577a4da03b5ffc4988def384da716b0f9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 15:12:53 +0200
Subject: [PATCH 043/217] accourse: don't display old participations

(they will be still visible in history)
---
 .../components/PersonsAssociated.vue              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 13294b232..edde7fbdb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -11,7 +11,7 @@
 
    <div class="flex-table mb-3">
       <participation-item
-         v-for="participation in participations"
+         v-for="participation in currentParticipations"
          v-bind:participation="participation"
          v-bind:key="participation.id"
          @remove="removeParticipation"
@@ -56,10 +56,15 @@ export default {
          }
       }
    },
-   computed: mapState({
-      participations: state => state.accompanyingCourse.participations,
-      counter: state => state.accompanyingCourse.participations.length
-   }),
+   computed: {
+      ...mapState({
+         participations: state => state.accompanyingCourse.participations,
+         counter: state => state.accompanyingCourse.participations.length
+      }),
+      currentParticipations() {
+         return this.participations.filter(p => p.endDate === null)
+      }
+   },
    methods: {
       removeParticipation(item) {
         //console.log('@@ CLICK remove participation: item', item);

From 98b0b3beeb7ce0434ebb6256bb1f48a7e358ba9c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 15:49:15 +0200
Subject: [PATCH 044/217] applying floatbutton logic on person/thirdparty vue
 renderbox

---
 .../public/chill/scss/flex_table.scss         |  4 +-
 .../vuejs/AccompanyingCourse/js/i18n.js       |  2 +-
 .../_components/Entity/PersonRenderBox.vue    | 85 ++++++++++---------
 .../Entity/ThirdPartyRenderBox.vue            | 37 ++++----
 4 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 0f4dc3e8a..82ea0aa04 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -260,6 +260,8 @@ div.wrap-header {
 
 /*
 *  FLOATBUTTON
+*  pas convaincant:
+*    conflits avec les fa-ul > li, lien non cliquables, text qui ne se place pas correctement
 */
 
 div.floatbutton {
@@ -302,6 +304,6 @@ div.floatbutton {
 
     // avoid a position relative that make links unclickable
     .fa-ul > li {
-        position: initial;
+        //position: initial; // in conflict with picto fa-ul !!
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 1486ec956..9ce5eb8b8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -43,7 +43,7 @@ const appMessages = {
          add_persons: "Ajouter des usagers",
          date_start_to_end: "Participation du {start} au {end}",
          leave_course: "L'usager quitte le parcours",
-         show_household_number: "Voir le ménage n° {id}",
+         show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage"
       },
       requestor: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index d05b4ce99..adac402d9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -41,54 +41,59 @@
         </div>
 
         <div class="item-col">
-            <ul class="list-content fa-ul">
+           <div class="floatbutton bottom">
+              <div class="box">
+                 <div class="action">
+                    <slot name="record-actions"></slot>
+                 </div>
+                 <ul class="list-content fa-ul">
 
-                <li v-if="person.current_household_address">
-                   <i class="fa fa-li fa-map-marker"></i>
-                   <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
-                   <a :href="getCurrentHouseholdUrl" :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
+                    <li v-if="person.current_household_address">
+                       <i class="fa fa-li fa-map-marker"></i>
+                       <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
+                       <a :href="getCurrentHouseholdUrl" :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
                       <span class="badge rounded-pill bg-chill-beige">
                          <i class="fa fa-fw fa-home"></i>
                          <!--{{ $t('persons_associated.show_household') }}-->
                       </span>
-                   </a>
-                   <br>
-                </li>
-                <li v-else-if="options.addNoData">
-                    <i class="fa fa-li fa-map-marker"></i>
-                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
-                </li>
+                       </a>
+                       <br>
+                    </li>
+                    <li v-else-if="options.addNoData">
+                       <i class="fa fa-li fa-map-marker"></i>
+                       <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                    </li>
 
-                <li v-if="person.mobilenumber">
-                    <i class="fa fa-li fa-mobile"></i>
-                    <a :href="'tel: ' + person.mobilenumber">{{ person.mobilenumber }}</a>
-                </li>
-                <li v-else-if="options.addNoData">
-                    <i class="fa fa-li fa-mobile"></i>
-                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
-                </li>
-                <li v-if="person.phonenumber">
-                    <i class="fa fa-li fa-phone"></i>
-                    <a :href="'tel: ' + person.phonenumber">{{ person.phonenumber }}</a>
-                </li>
-                <li v-else-if="options.addNoData">
-                    <i class="fa fa-li fa-phone"></i>
-                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
-                </li>
+                    <li v-if="person.mobilenumber">
+                       <i class="fa fa-li fa-mobile"></i>
+                       <a :href="'tel: ' + person.mobilenumber">{{ person.mobilenumber }}</a>
+                    </li>
+                    <li v-else-if="options.addNoData">
+                       <i class="fa fa-li fa-mobile"></i>
+                       <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                    </li>
+                    <li v-if="person.phonenumber">
+                       <i class="fa fa-li fa-phone"></i>
+                       <a :href="'tel: ' + person.phonenumber">{{ person.phonenumber }}</a>
+                    </li>
+                    <li v-else-if="options.addNoData">
+                       <i class="fa fa-li fa-phone"></i>
+                       <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                    </li>
 
-                <li v-if="person.center && options.addCenter">
-                    <i class="fa fa-li fa-long-arrow-right"></i>
-                    {{ person.center.name }}
-                </li>
-                <li v-else-if="options.addNoData">
-                    <i class="fa fa-li fa-long-arrow-right"></i>
-                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
-                </li>
-                <slot name="custom-zone"></slot>
+                    <li v-if="person.center && options.addCenter">
+                       <i class="fa fa-li fa-long-arrow-right"></i>
+                       {{ person.center.name }}
+                    </li>
+                    <li v-else-if="options.addNoData">
+                       <i class="fa fa-li fa-long-arrow-right"></i>
+                       <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                    </li>
+                    <slot name="custom-zone"></slot>
 
-            </ul>
-
-            <slot name="record-actions"></slot>
+                 </ul>
+              </div>
+           </div>
         </div>
 
       </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index f3a41e4e4..90dd51837 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -32,23 +32,28 @@
         </div>
 
         <div class="item-col">
-            <ul class="list-content fa-ul">
-                <li v-if="thirdparty.address">
-                    <i class="fa fa-li fa-map-marker"></i>
-                    <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
-                </li>
-                <li v-if="thirdparty.telephone">
-                    <i class="fa fa-li fa-mobile"></i>
-                    <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
-                </li>
-                <li v-if="thirdparty.email">
-                    <i class="fa fa-li fa-envelope-o"></i>
-                    <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
-                </li>
+           <div class="floatbutton bottom">
+              <div class="box">
+                 <div class="action">
+                    <slot name="record-actions"></slot>
+                 </div>
+                 <ul class="list-content fa-ul">
+                    <li v-if="thirdparty.address">
+                       <i class="fa fa-li fa-map-marker"></i>
+                       <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
+                    </li>
+                    <li v-if="thirdparty.telephone">
+                       <i class="fa fa-li fa-mobile"></i>
+                       <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
+                    </li>
+                    <li v-if="thirdparty.email">
+                       <i class="fa fa-li fa-envelope-o"></i>
+                       <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
+                    </li>
+                 </ul>
+              </div>
+           </div>
 
-            </ul>
-
-            <slot name="record-actions"></slot>
         </div>
     </div>
     </section>

From f9402ec981db4008e0db15c37b747a4e09bb3a38 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 16:04:38 +0200
Subject: [PATCH 045/217] adding confirmation modal when person leave accourse

---
 .../PersonsAssociated/ParticipationItem.vue   | 34 +++++++++++++------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  3 ++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 45cdd9775..b56ab0617 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -42,39 +42,53 @@
                <button v-if="!participation.endDate"
                   class="btn btn-sm btn-remove"
                   v-bind:title="$t('persons_associated.leave_course')"
-                  @click.prevent="$emit('close', participation)">
-               </button>
-               <button v-else
-                  class="btn btn-sm btn-secondary"
-                  :title="$t('persons_associated.date_start_to_end', {
-                    start: $d(participation.startDate.datetime, 'short'),
-                    end: $d(participation.endDate.datetime, 'short')
-                  })">
-                  <i class="fa fa-fw fa-info"></i>
+                       @click="modal.showModal = true">
                </button>
             </li>
          </ul>
 
       </template>
    </person-render-box>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal" :modalDialogClass="modal.modalDialogClass" @close="modal.showModal = false">
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t('persons_associated.sure') }}</h2>
+         </template>
+         <template v-slot:body>
+            <p>{{ $t('persons_associated.sure_description') }}</p>
+         </template>
+         <template v-slot:footer>
+            <button class="btn btn-danger" @click.prevent="$emit('close', participation)">
+               {{ $t('persons_associated.ok') }}
+            </button>
+         </template>
+      </modal>
+   </teleport>
 </template>
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
 import ButtonLocation from '../ButtonLocation.vue';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 
 export default {
    name: 'ParticipationItem',
    components: {
       OnTheFly,
       ButtonLocation,
-      PersonRenderBox
+      PersonRenderBox,
+      Modal
    },
    props: ['participation'],
    emits: ['remove', 'close'],
    data() {
       return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-md"
+         },
          PersonRenderBox: {
             participation: 'participation',
             options: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 9ce5eb8b8..66c45dc13 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -43,6 +43,9 @@ const appMessages = {
          add_persons: "Ajouter des usagers",
          date_start_to_end: "Participation du {start} au {end}",
          leave_course: "L'usager quitte le parcours",
+         sure: "Êtes-vous sûr ?",
+         sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie restera cependant consignée dans l'historique du parcours.",
+         ok: "Oui, l'usager quitte le parcours",
          show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage"
       },

From f4ce6340610ae7c75b39992169414629d4d00295 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 16:18:08 +0200
Subject: [PATCH 046/217] not used, see Entity/AddressRenderBox.vue in
 MainAssets

---
 .../_components/Entity/AddressRenderBox.vue   | 48 -------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
deleted file mode 100644
index 8334f6263..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-// CURRENTLY NOT IN USE
-
-<template>
-
-        <li v-if="address" class="chill-entity entity-address">
-            <i v-if="options.with_picto == true" class="fa fa-fw fa-map-marker"></i>
-            <span v-if="options.render == 'list' || options.render == 'list'" :class="'address ' + {'multiline' : options.multiline === true}">
-                
-                    
-                    <!-- if address.street is not empty -->
-                    <p v-if="address.street" class="street">{{ address.street }}
-                        <!-- if address.streetNumber is not empty -->
-                        <span v-if="address.streetNumber" class="streetnumber">{{ address.streetNumber }}</span>
-                    </p>
-
-                        <!-- if options['extended_infos'] -->
-                        <div v-if="options.extended_infos == true">
-                            <span v-if="address.floor" class="floor">{{ address.floor }}</span>
-                            <span v-if="address.corridor" class="corridor">{{ address.corridor }}</span>
-                            <span v-if="address.steps" class="steps">{{ address.steps }}</span>
-                            <span v-if="address.buildingName" class="buildingName">{{ address.buildingName }}</span>
-                            <span v-if="address.flat" class="flat">{{ address.flat }}</span>
-                            <span v-if="address.distribution" class="distribution">{{ address.distribution }}</span>
-                            <span v-if="address.extra" class="extra">{{ address.extra }}</span>
-                        </div>
-
-                    <!-- if address.postCode is not empty -->
-                    <div v-if="address.postCode">
-                        <p class="postcode">
-                            <span class="code">{{ address.postCode.code }}</span>
-                            <span class="name">{{ address.postCode.name }}</span>
-                        </p>
-                        <p class="country">{{ address.postCode.country.name }}</p>
-                    </div>
-                
-            </span>
-        </li> 
-
-</template>
-
-<script>
-
-export default{
-    name: "AddressRenderBox",
-    props: ['address', 'options']
-}
-
-</script>

From 6e57d16ebf35cb64641c4e062c2a350f229ca627 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 16:36:27 +0200
Subject: [PATCH 047/217] fix conflict with fa-ul and floatbutton (different
 with top or bottom)

---
 .../Resources/public/chill/scss/flex_table.scss     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 82ea0aa04..c25285da1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -260,8 +260,7 @@ div.wrap-header {
 
 /*
 *  FLOATBUTTON
-*  pas convaincant:
-*    conflits avec les fa-ul > li, lien non cliquables, text qui ne se place pas correctement
+*  p-ê pas convaincant: cet asset est toujours en observation
 */
 
 div.floatbutton {
@@ -278,6 +277,11 @@ div.floatbutton {
         div.action {
             padding: 0 0 1em 1em;
         }
+        
+        // avoid a position relative that make links unclickable
+        .fa-ul > li {
+            position: initial;
+        }
     }
     &.bottom {
         display: flex;
@@ -301,9 +305,4 @@ div.floatbutton {
             background-color: #00ffffa3;
         }
     }
-
-    // avoid a position relative that make links unclickable
-    .fa-ul > li {
-        //position: initial; // in conflict with picto fa-ul !!
-    }
 }

From cf78c59e768edc635b2649b300fcf081c6c464d0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 16:37:30 +0200
Subject: [PATCH 048/217] vue personRenderBox when no returnPath

---
 .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js       | 2 +-
 .../public/vuejs/_components/Entity/PersonRenderBox.vue        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 66c45dc13..cf685cac3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -44,7 +44,7 @@ const appMessages = {
          date_start_to_end: "Participation du {start} au {end}",
          leave_course: "L'usager quitte le parcours",
          sure: "Êtes-vous sûr ?",
-         sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie restera cependant consignée dans l'historique du parcours.",
+         sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie reste cependant consignée dans l'historique du parcours.",
          ok: "Oui, l'usager quitte le parcours",
          show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index adac402d9..b8a638593 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -167,7 +167,8 @@ export default {
            return `/fr/person/${this.person.id}/general`;
         },
         getCurrentHouseholdUrl() {
-           return `/fr/person/household/${this.person.current_household_id}/summary?returnPath=${this.returnPath}`
+           let returnPath = this.returnPath ? `?returnPath=${this.returnPath}` : ``;
+           return `/fr/person/household/${this.person.current_household_id}/summary${returnPath}`
         }
     }
 }

From a94a757ae63218cde9f0a4e57d282ea94131b954 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 16:50:10 +0200
Subject: [PATCH 049/217] accourse: don't display old participations (fix
 counter)

---
 .../Resources/public/chill/scss/flex_table.scss           | 2 +-
 .../AccompanyingCourse/components/PersonsAssociated.vue   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index c25285da1..2b9e4e671 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -277,7 +277,7 @@ div.floatbutton {
         div.action {
             padding: 0 0 1em 1em;
         }
-        
+
         // avoid a position relative that make links unclickable
         .fa-ul > li {
             position: initial;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index edde7fbdb..37833ef29 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -2,7 +2,7 @@
 <div class="vue-component">
    <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
 
-   <div v-if="participations.length > 0">
+   <div v-if="currentParticipations.length > 0">
       <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
    <div v-else>
@@ -58,11 +58,13 @@ export default {
    },
    computed: {
       ...mapState({
-         participations: state => state.accompanyingCourse.participations,
-         counter: state => state.accompanyingCourse.participations.length
+         participations: state => state.accompanyingCourse.participations
       }),
       currentParticipations() {
          return this.participations.filter(p => p.endDate === null)
+      },
+      counter() {
+         return this.currentParticipations.length;
       }
    },
    methods: {

From dba3ede9e16a03821e97d9d2fb0f1c4d34db4c3c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 18:46:37 +0200
Subject: [PATCH 050/217] when a person has a household without address:
 display no_data message, even if option addNoData is false

---
 .../Resources/public/vuejs/_js/i18n.js        |  1 +
 .../_components/Entity/PersonRenderBox.vue    | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 39bbd4cb1..9d1c8adde 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -77,6 +77,7 @@ const messages = {
             man: "Né le",
             woman: "Née le"
          } ,
+         household_without_address: "Le ménage de l'usager est sans adresse",
          no_data: "Aucune information renseignée",
          type: {
             thirdparty: "Tiers",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index b8a638593..ea1a3008e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -48,20 +48,27 @@
                  </div>
                  <ul class="list-content fa-ul">
 
-                    <li v-if="person.current_household_address">
+                    <li v-if="person.current_household_id">
                        <i class="fa fa-li fa-map-marker"></i>
-                       <address-render-box :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
-                       <a :href="getCurrentHouseholdUrl" :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
-                      <span class="badge rounded-pill bg-chill-beige">
-                         <i class="fa fa-fw fa-home"></i>
-                         <!--{{ $t('persons_associated.show_household') }}-->
-                      </span>
+                       <address-render-box v-if="person.current_household_address"
+                         :address="person.current_household_address"
+                         :isMultiline="isMultiline">
+                       </address-render-box>
+                       <p v-else class="chill-no-data-statement">
+                          {{ $t('renderbox.household_without_address') }}
+                       </p>
+                       <a :href="getCurrentHouseholdUrl"
+                          :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
+                          <span class="badge rounded-pill bg-chill-beige">
+                             <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->
+                          </span>
                        </a>
-                       <br>
                     </li>
                     <li v-else-if="options.addNoData">
                        <i class="fa fa-li fa-map-marker"></i>
-                       <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                       <p class="chill-no-data-statement">
+                          {{ $t('renderbox.no_data') }}
+                       </p>
                     </li>
 
                     <li v-if="person.mobilenumber">

From e99a371f3a873bc2c57a615136f15cdfc51f3dd0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 19:39:52 +0200
Subject: [PATCH 051/217] vue personRenderBox: adding an option to display
 householdLink

---
 .../components/PersonsAssociated/ParticipationItem.vue         | 1 +
 .../public/vuejs/_components/Entity/PersonRenderBox.vue        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index b56ab0617..71e0ccd6b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -5,6 +5,7 @@
                addId : false,
                addEntity: false,
                addLink: false,
+               addHouseholdLink: true,
                addAltNames: true,
                addAge : false,
                hLevel : 3,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index ea1a3008e..29578d3ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -57,7 +57,8 @@
                        <p v-else class="chill-no-data-statement">
                           {{ $t('renderbox.household_without_address') }}
                        </p>
-                       <a :href="getCurrentHouseholdUrl"
+                       <a v-if="options.addHouseholdLink === true"
+                          :href="getCurrentHouseholdUrl"
                           :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
                           <span class="badge rounded-pill bg-chill-beige">
                              <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->

From 3a6a0da1dd748f47d93906fa5c63926911dbd557 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Sep 2021 19:41:09 +0200
Subject: [PATCH 052/217] accourse associated_persons: display alert warning if
 persons without household

---
 .../components/PersonsAssociated.vue          | 52 +++++++++++++++++++
 .../vuejs/AccompanyingCourse/js/i18n.js       |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 37833ef29..4c6757fcd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -30,6 +30,29 @@
       </add-persons>
    </div>
 
+   <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
+      <i class="fa fa-warning fa-2x"></i>
+      <div class="floatbutton bottom"><div class="box">
+         <div class="action">
+            <button class="btn btn-update">{{ $t('persons_associated.update_household') }}</button>
+         </div>
+         <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
+         <div class="form-check" v-for="p in participationWithoutHousehold">
+            <input type="checkbox"
+                   class="form-check-input"
+                   v-model="hasNoHousehold"
+                   :id="p.person.id"
+                   :value="p.person.id" />
+            <label class="form-check-label" for="hasNoHousehold">
+               {{ p.person.text }}
+            </label>
+         </div>
+
+      </div></div>
+
+
+   </div>
+
 </div>
 </template>
 
@@ -65,6 +88,9 @@ export default {
       },
       counter() {
          return this.currentParticipations.length;
+      },
+      participationWithoutHousehold() {
+         return this.currentParticipations.filter(p => p.person.current_household_id === null);
       }
    },
    methods: {
@@ -88,3 +114,29 @@ export default {
    }
 }
 </script>
+<style lang="scss" scoped>
+div#accompanying-course {
+   div.vue-component {
+      & > div.alert {
+         margin: 1em 0 0;
+      }
+      div.no-household {
+         display: flex;
+         flex-direction: row;
+         & > i {
+            flex-basis: 1.5em; flex-grow: 0; flex-shrink: 0;
+            padding-top: 0.2em;
+            opacity: 0.75;
+         }
+         & > div {
+            flex-basis: auto;
+            div.action {
+               button.btn-update {
+                  margin-right: 2em;
+               }
+            }
+         }
+      }
+   }
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index cf685cac3..d7c01a174 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -47,7 +47,9 @@ const appMessages = {
          sure_description: "Une fois confirmé, il ne sera pas possible de faire marche arrière ! La sortie reste cependant consignée dans l'historique du parcours.",
          ok: "Oui, l'usager quitte le parcours",
          show_household_number: "Voir le ménage (n° {id})",
-         show_household: "Voir le ménage"
+         show_household: "Voir le ménage",
+         person_without_household_warning: "Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.",
+         update_household: "Modifier l'appartenance",
       },
       requestor: {
          title: "Demandeur",

From 753e6c110545611d41ea6f4026ae863eb4335a1e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Sep 2021 11:32:12 +0200
Subject: [PATCH 053/217] adding a dev page with sass assets album

---
 .../Resources/views/Activity/list.html.twig         |  2 +-
 .../Resources/public/chill/scss/flex_table.scss     | 13 ++++++++-----
 .../components/PersonsAssociated.vue                |  2 +-
 .../vuejs/_components/Entity/PersonRenderBox.vue    |  2 +-
 .../views/Household/_render_member.html.twig        |  2 +-
 .../_components/Entity/ThirdPartyRenderBox.vue      |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 5bcd41c66..07b59c7e7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -48,7 +48,7 @@
                         </div>
                         <div class="item-col">
 
-                            <div class="floatbutton top">
+                            <div class="float-button top">
                                 <div class="box">
 
                                     <div class="action">
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 2b9e4e671..21ecde267 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -1,3 +1,6 @@
+// See Assets Album page:
+// http://localhost:8001/_dev/assets
+
 /*
 *  __FLEX-TABLE_________
 *  FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
@@ -175,13 +178,13 @@ div.wrap-list {
         border: 1px solid $black;
 
         div.wl-col.title {
-            background-color: $yellow;
+            background-color: yellow;
         }
         div.wl-col.list {
-            background-color: $green;
+            background-color: cyan;
 
             p.wl-item {
-                background-color: $orange;
+                background-color: orange;
             }
         }
     }
@@ -263,7 +266,7 @@ div.wrap-header {
 *  p-ê pas convaincant: cet asset est toujours en observation
 */
 
-div.floatbutton {
+div.float-button {
     width: 100%;
 
     div.box {
@@ -302,7 +305,7 @@ div.floatbutton {
         border: 1px solid black;
         background-color: yellow;
         div.action {
-            background-color: #00ffffa3;
+            background-color: transparentize(#00ffff, 0.4);
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 4c6757fcd..da1b4c4e6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -32,7 +32,7 @@
 
    <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
       <i class="fa fa-warning fa-2x"></i>
-      <div class="floatbutton bottom"><div class="box">
+      <div class="float-button bottom"><div class="box">
          <div class="action">
             <button class="btn btn-update">{{ $t('persons_associated.update_household') }}</button>
          </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 29578d3ba..249162b87 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -41,7 +41,7 @@
         </div>
 
         <div class="item-col">
-           <div class="floatbutton bottom">
+           <div class="float-button bottom">
               <div class="box">
                  <div class="action">
                     <slot name="record-actions"></slot>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
index f1c96e5fa..25160ff5b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
@@ -20,7 +20,7 @@
             }) }}
         </div>
         <div class="item-col">
-            <div class="floatbutton top"><div class="box">
+            <div class="float-button top"><div class="box">
 
                     <div class="action">
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 90dd51837..c710cedfb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -32,7 +32,7 @@
         </div>
 
         <div class="item-col">
-           <div class="floatbutton bottom">
+           <div class="float-button bottom">
               <div class="box">
                  <div class="action">
                     <slot name="record-actions"></slot>

From ff7cb6ca79c3b307896d860f66716ed892c68332 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Sep 2021 11:38:18 +0200
Subject: [PATCH 054/217] adding unlink chill button

---
 .../Resources/public/chill/scss/buttons.scss          |  6 +++++-
 .../Resources/views/Household/summary.html.twig       | 11 +++++------
 .../translations/messages+intl-icu.fr.yaml            |  6 ++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index 6b54172c7..14c22685b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -19,7 +19,8 @@ $chill-theme-buttons: (
    "view":          $chill-blue,
    "misc":          $gray-300,
    "cancel":        $gray-300,
-   "choose":        $gray-300
+   "choose":        $gray-300,
+   "unlink":        $chill-red,
 );
 
 @each $button, $color in $chill-theme-buttons {
@@ -45,6 +46,7 @@ $chill-theme-buttons: (
    &.btn-delete,
    &.btn-danger,
    &.btn-remove,
+   &.btn-unlink,
    &.btn-action,
    &.btn-edit,
    &.btn-update {
@@ -67,6 +69,7 @@ $chill-theme-buttons: (
       // &.btn-submit::before,
       // &.btn-reset::before,
       // &.btn-action::before,
+   &.btn-unlink::before,
    &.btn-delete::before,
    &.btn-remove::before,
    &.btn-choose::before,
@@ -94,6 +97,7 @@ $chill-theme-buttons: (
    &.btn-remove::before    { content: "\f00d"; } // fa-times
    &.btn-cancel::before    { content: "\f060"; } // fa-arrow-left
    &.btn-choose::before    { content: "\f00c"; } // fa-check  // f046 fa-check-square-o
+   &.btn-unlink::before    { content: "\f127"; } // fa-chain-broken
 }
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 89bb4da14..1568b6bed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -88,14 +88,13 @@
 
   {% macro customButtons(member, household) %}
       <li>
-          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
-             class="btn btn-sm btn-misc"><i class="fa fa-arrows-h"></i>
-              {{ 'household.Change position'|trans }}</a>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
+             class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}">
+              {{ 'household.Leave'|trans }}</a>
       </li>
       <li>
-          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
-             class="btn btn-sm btn-misc"><i class="fa fa-sign-out"></i>
-              {{ 'household.Leave'|trans }}</a>
+          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
+             class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
       </li>
   {% endmacro %}
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index cdaf55cc8..f1362e7ae 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -23,7 +23,9 @@ household:
     Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage.
     Any persons into this position: Aucune personne n'appartient au ménage à cette position.
     Leave household: Quitter le ménage
-    Leave: Quitter
+    Leave: Détacher
+    person:
+        leave: L'usager quitte le ménage
     Join: Rejoindre un ménage
     Change position: Repositionner
     Household file: Dossier ménage
@@ -54,7 +56,7 @@ household:
     Expecting for birth on date: Naissance attendue pour le {date}
     Expecting for birth: Naissance attendue (date inconnue)
     Any expecting birth: Aucune naissance proche n'a été renseignée.
-    Comment and expecting birth: Commentaire et naissance attendue
+    Comment and expecting birth: Mettre à jour le commentaire
     Edit member metadata: Données supplémentaires
     comment_membership: Commentaire général sur les membres
     expecting_birth: Naissance attendue ?

From 74957154b1bebf26f34e50ab0adf266651c21e57 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 23 Aug 2021 09:11:08 +0200
Subject: [PATCH 055/217] rdv: pages by User

---
 .../Controller/CalendarController.php         | 43 ++++++++++---------
 ...firm_deleteByAccompanyingCourse.html.twig} |  0
 .../Calendar/confirm_deleteByUser.html.twig   | 18 ++++++++
 .../Calendar/confirm_deletePerson.html.twig   | 17 --------
 .../Resources/views/Calendar/edit.html.twig   |  8 ++--
 ...wig => editByAccompanyingCourse.html.twig} |  2 +-
 .../views/Calendar/editByUser.html.twig       | 36 ++++++++++++++++
 .../Resources/views/Calendar/list.html.twig   |  7 ++-
 .../views/Calendar/listByUser.html.twig       |  9 ++++
 .../Resources/views/Calendar/show.html.twig   | 19 ++++++--
 ...wig => showByAccompanyingCourse.html.twig} |  0
 .../views/Calendar/showByUser.html.twig       | 13 ++++++
 .../translations/messages.fr.yml              |  1 +
 13 files changed, 127 insertions(+), 46 deletions(-)
 rename src/Bundle/ChillCalendarBundle/Resources/views/Calendar/{confirm_deleteAccompanyingCourse.html.twig => confirm_deleteByAccompanyingCourse.html.twig} (100%)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
 delete mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig
 rename src/Bundle/ChillCalendarBundle/Resources/views/Calendar/{editAccompanyingCourse.html.twig => editByAccompanyingCourse.html.twig} (97%)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
 rename src/Bundle/ChillCalendarBundle/Resources/views/Calendar/{showAccompanyingCourse.html.twig => showByAccompanyingCourse.html.twig} (100%)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index a894099e4..6e8dc624c 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -80,11 +80,10 @@ class CalendarController extends AbstractController
 
         if ($user instanceof User) {
 
-            // $calendar = $em->getRepository(Calendar::class)
-            //     ->findByUser($user)
-            //     ;
-
-            // $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig';
+            $calendarItems = $em->getRepository(Calendar::class)
+                ->findByUser($user)
+                ;
+            $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $calendarItems = $em->getRepository(Calendar::class)->findBy(
                 ['accompanyingPeriod' => $accompanyingPeriod],
@@ -174,11 +173,11 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:showAccompanyingCourse.html.twig';
+            $view = 'ChillCalendarBundle:Calendar:showByAccompanyingCourse.html.twig';
         } 
-        // elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:showPerson.html.twig';
-        // }
+        elseif ($user instanceof User) {
+            $view = 'ChillCalendarBundle:Calendar:showByUser.html.twig';
+        }
 
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
 
@@ -198,9 +197,9 @@ class CalendarController extends AbstractController
         }
 
         return $this->render($view, [
-            //'person'      => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'entity'      => $entity,
+            'user' => $user
             //'delete_form' => $deleteForm->createView(),
         ]);
     }
@@ -218,11 +217,11 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:editAccompanyingCourse.html.twig';
+            $view = 'ChillCalendarBundle:Calendar:editByAccompanyingCourse.html.twig';
+        }
+         elseif ($user instanceof User) {
+            $view = 'ChillCalendarBundle:Calendar:editByUser.html.twig';
         }
-        //  elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:editPerson.html.twig';
-        // }
 
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
 
@@ -259,6 +258,7 @@ class CalendarController extends AbstractController
             'form' => $form->createView(),
             'delete_form' => $deleteForm->createView(),
             'accompanyingCourse' => $accompanyingPeriod,
+            'user' => $user,
             'entity_json' => $entity_array
         ]);
     }
@@ -274,11 +274,11 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:confirm_deleteAccompanyingCourse.html.twig';
+            $view = 'ChillCalendarBundle:Calendar:confirm_deleteByAccompanyingCourse.html.twig';
         } 
-        // elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig';
-        // }
+        elseif ($user instanceof User) {
+            $view = 'ChillCalendarBundle:Calendar:confirm_deleteByUser.html.twig';
+        }
 
         /* @var $entity Calendar */
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
@@ -324,9 +324,9 @@ class CalendarController extends AbstractController
     /**
      * Creates a form to delete a Calendar entity by id.
      */
-    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
+    private function createDeleteForm(int $id, ?User $user, ?AccompanyingPeriod $accompanyingPeriod): Form
     {
-        $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+        $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
         $params['id'] = $id;
 
         return $this->createFormBuilder()
@@ -350,7 +350,8 @@ class CalendarController extends AbstractController
                 throw $this->createNotFoundException('User not found');
             }
 
-            $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user);
         } elseif ($request->query->has('accompanying_period_id')) {
             $accompanying_period_id = $request->get('accompanying_period_id');
             $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
new file mode 100644
index 000000000..4f1ad45e5
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
@@ -0,0 +1,18 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set user = calendar.user %}
+
+{% set activeRouteKey = 'chill_calendar_calendar' %}
+
+{% block title  'Remove activity'|trans %}
+
+{% block content %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Remove calendar item'|trans,
+        'confirm_question'  : 'Are you sure you want to remove the calendar item?'|trans,
+        'cancel_route'      : 'chill_calendar_calendar',
+        'cancel_parameters' : { 'user_id' : calendar.user.id, 'id' : calendar.id },
+        'form'              : delete_form
+    } ) }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig
deleted file mode 100644
index 9f8172bb4..000000000
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-{% set person = activity.person %}
-
-{% block title  'Remove activity'|trans %}
-
-{% block personcontent %}
-{{ include('@ChillMain/Util/confirmation_template.html.twig',
-    {
-        'title'             : 'Remove activity'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ),
-        'cancel_route'      : 'chill_activity_activity_list',
-        'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
-        'form'              : delete_form
-    } ) }}
-{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index f64e22353..4b4dca59b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -48,15 +48,17 @@
     {{ form_row(form.sendSMS) }}
 {% endif %}
 
+<div id="calendarControls"></div>
+
 <div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
     <a 
       class="btn btn-cancel"
-      {%- if context == 'person' -%} 
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'person_id': person.id } )}}"
-      {%- else -%}
+      {%- if context == 'user' -%}
+      href="{{ chill_return_path_or('chill_calendar_calendar', { 'user_id': user.id } )}}"
+      {%- elseif context == 'accompanyingCourse' -%}
       href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
       {%- endif -%}
       >
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
similarity index 97%
rename from src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
index f41939f62..1d506cb48 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
@@ -2,7 +2,7 @@
 
 {% set activeRouteKey = 'chill_calendar_calendar_list' %}
 
-{% block title  'Update calendar'|trans %}
+{% block title 'Update calendar'|trans %}
 
 {% block content %}
 <div class="calendar-edit">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
new file mode 100644
index 000000000..b2368ca76
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
@@ -0,0 +1,36 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title 'Update calendar'|trans %}
+
+{% block content %}
+<div class="calendar-edit">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
+            <div id="calendar"></div> {# <=== vue component #}
+            {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'user'} %}
+            
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.entity = {{ entity_json|json_encode|raw }};
+        window.startDate = {{ entity.startDate|date('Y-m-d H:i:s')|json_encode|raw }};
+        window.endDate = {{ entity.endDate|date('Y-m-d H:i:s')|json_encode|raw }};
+        window.mainUser = {{ entity.mainUser.id }};
+    </script>
+    {{ encore_entry_script_tags('vue_calendar') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_calendar') }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index d5ea0e172..33ea5d1b8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -8,7 +8,11 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-<h2>{{ 'Calendar list' |trans }}</h2>
+{% if user %}
+    <h2>{{ 'My calendar list' |trans }}</h2>
+{% else %}
+    <h2>{{ 'Calendar list' |trans }}</h2>
+{% endif %}
 
 {% if calendarItems|length == 0 %}
     <p class="chill-no-data-statement">
@@ -54,6 +58,7 @@
                         </a>
                     {% endif %}
 
+                    
                 </div>
                 <div class="item-col">
                     <ul class="list-content">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
new file mode 100644
index 000000000..ce4a8843c
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -0,0 +1,9 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title %}{{ 'My calendar list' |trans }}{% endblock title %}
+
+{% block content %}
+    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'user'} %}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index efab85442..d450d2ab8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -58,24 +58,37 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
+{% set user_id = null %}
+{% if user %}
+    {% set user_id = user.id %}
+{% endif %}
+
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar', { 'accompanying_period_id': accompanying_course_id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar', { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
+    {% if accompanyingCourse %}
     <li>
         <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
             {{ 'Edit'|trans }}
         </a>
     </li>
-    
+    {% endif %}
+    {% if user %}
+    <li>
+        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'user_id': user_id }) }}">
+            {{ 'Edit'|trans }}
+        </a>
+    </li>
+    {% endif %}
     {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     #}
     
     <li>
-        <a href="{{ path('chill_calendar_calendar_delete', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+        <a href="{{ path('chill_calendar_calendar_delete', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
new file mode 100644
index 000000000..8fa216fa4
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title 'Calendar'|trans %}
+
+{% block content -%}
+<div class="calendar-show">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">           
+            {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'user'} %}
+        </div>
+    </div>
+</div> 
+{% endblock content %}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index e5e5c636a..0eb7349a4 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -1,5 +1,6 @@
 Calendar: Rendez-vous
 Calendar list: Liste des rendez-vous
+My calendar list: Mes rendez-vous
 There is no calendar items.: Il n'y a pas de rendez-vous
 Remove calendar item: Supprimer le rendez-vous
 Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?

From 68538f0e85a1d40ae5aa575ad90b478f9c2ec3aa Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 23 Aug 2021 09:21:47 +0200
Subject: [PATCH 056/217] rdv: add user menu entry for my calendar list

---
 src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index 33e84949f..f4dc4391e 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -115,6 +115,17 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                 'icon' => 'tasks'
             ]);
 
+        $menu->addChild("My calendar list", [
+                'route' => 'chill_calendar_calendar',
+                'routeParameters' => [
+                    'user_id' => $user->getId(),
+                ]
+            ])
+            ->setExtras([
+                'order' => -9,
+                'icon' => 'tasks'
+            ]);
+
         /*
         $menu->addChild("My aside activities", [
                 'route' => 'chill_crud_aside_activity_index'

From 864f84fededa3db5a8cc4e2f5e0a656b9eccedb2 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 23 Aug 2021 09:36:53 +0200
Subject: [PATCH 057/217] rdv: change entrypoint for calendar css + correct
 calendar controls as a function of context

---
 .../CalendarUserSelector/CalendarUserSelector.vue     | 11 +----------
 .../Resources/views/Calendar/edit.html.twig           |  4 +++-
 .../views/Calendar/editByAccompanyingCourse.html.twig |  1 +
 .../ChillCalendarBundle/chill.webpack.config.js       |  4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
index 758b7bae8..bf359f49b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="calendar__controls">
+  <div>
      <h2 class="chill-red">{{ $t('choose_your_calendar_user') }}</h2>
     <VueMultiselect
         name="field"
@@ -201,12 +201,3 @@ export default {
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
 
-<style lang="scss" scoped>
-  div.calendar__controls {
-    background-color: 'black';
-    height: 50%;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-  }
-</style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index 4b4dca59b..f47727b9c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -48,7 +48,9 @@
     {{ form_row(form.sendSMS) }}
 {% endif %}
 
-<div id="calendarControls"></div>
+{% if context == 'user' %}
+    <div id="calendarControls"></div>
+{% endif %}
 
 <div id="fullCalendar"></div>
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
index 1d506cb48..1db9b9223 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
@@ -35,6 +35,7 @@
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('vue_calendar') }}
+    {{ encore_entry_link_tags('page_calendar') }}
 {% endblock %}
 
 {% block block_post_menu %}
diff --git a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
index b4b42d2fe..258e43089 100644
--- a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
@@ -1,10 +1,10 @@
 // this file loads all assets from the Chill calendar bundle
 module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/chill/index.js');
-    
+
     encore.addAliases({
         ChillCalendarAssets: __dirname + '/Resources/public'
     });
 
     encore.addEntry('vue_calendar', __dirname + '/Resources/public/vuejs/Calendar/index.js');
+    encore.addEntry('page_calendar', __dirname + '/Resources/public/chill/index.js');
 };

From 54ea954a5aa159876cfd3cdf9819429015c87770 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 23 Aug 2021 10:47:26 +0200
Subject: [PATCH 058/217] rdv: init unit tests

---
 .../Controller/CalendarControllerTest.php     | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php

diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
new file mode 100644
index 000000000..c94238a51
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\CalendarBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+class CalendarControllerTest extends WebTestCase
+{
+    
+    /**
+     * Setup before the first test of this class (see phpunit doc)
+     */
+    public static function setUpBeforeClass()
+    {
+        static::bootKernel();
+    }
+
+    /**
+     * Setup before each test method (see phpunit doc)
+     */
+    public function setUp()
+    {
+        $this->client = static::createClient(array(), array(
+           'PHP_AUTH_USER' => 'center a_social',
+           'PHP_AUTH_PW'   => 'password',
+        ));
+    }
+    
+    private function getAccompanyingPeriodFromFixtures(): AccompanyingPeriod
+    {
+        $em = static::$kernel->getContainer()
+              ->get('doctrine.orm.entity_manager');
+
+        $accompanying_period = $em->getRepository('ChillPersonBundle:AccompanyingPeriod')->find(1);
+
+        if ($accompanying_period === NULL) {
+            throw new \RuntimeException("We need an accompanying course with id = 1. Did you add fixtures ?");
+        }
+
+        return $accompanying_period;
+    }
+
+    public function testList()
+    {
+        $this->client->request(
+            Request::METHOD_GET, 
+            sprintf('/fr/calendar/?accompanying_period_id=%d', $this->getAccompanyingPeriodFromFixtures()->getId())
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+
+    public function testNew()
+    {
+        $this->client->request(
+            Request::METHOD_GET, 
+            sprintf('/fr/calendar/new?accompanying_period_id=%d', $this->getAccompanyingPeriodFromFixtures()->getId())
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+}

From ee4d23ff82aeeea1e95451b8df9c67b3f16e418d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 27 Aug 2021 17:14:33 +0200
Subject: [PATCH 059/217] rdv: init vue component for calendar range editing +
 refactor vue calendar code

---
 .../public/vuejs/MyCalendarRange/App.vue      | 107 ++++++++++++++++++
 .../public/vuejs/MyCalendarRange/i18n.js      |   8 ++
 .../public/vuejs/MyCalendarRange/index.js     |  16 +++
 .../CalendarUserSelector/js => _api}/api.js   |   0
 .../CalendarUserSelector.vue                  |   2 +-
 .../Resources/views/Calendar/list.html.twig   |   7 +-
 .../views/Calendar/listByUser.html.twig       |  13 +++
 .../chill.webpack.config.js                   |   1 +
 8 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
 rename src/Bundle/ChillCalendarBundle/Resources/public/vuejs/{_components/CalendarUserSelector/js => _api}/api.js (100%)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
new file mode 100644
index 000000000..1eaf04335
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <h2 class="chill-red">{{ $t('edit_your_calendar_range') }}</h2>
+    <FullCalendar ref="fullCalendar" :options="calendarOptions">
+      <template v-slot:eventContent='arg'>
+        <b>{{ arg.timeText }}</b>
+        <i>&nbsp;{{ arg.event.title }}</i>
+      </template>
+    </FullCalendar>
+  </div>
+</template>
+
+<script>
+import '@fullcalendar/core/vdom'; // solves problem with Vite
+import frLocale from '@fullcalendar/core/locales/fr';
+import FullCalendar from '@fullcalendar/vue3';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import interactionPlugin from '@fullcalendar/interaction';
+import timeGridPlugin from '@fullcalendar/timegrid';
+import { fetchCalendar } from '../_api/api';
+
+export default {
+  name: "App",
+  components: {
+    FullCalendar
+  },
+  data() {
+    return {
+      errorMsg: [],
+      userId: window.userId,
+      showMyCalendar: true,
+      calendarEvents: {
+         user: [],
+      },
+      calendarOptions: {
+        locale: frLocale,
+        plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin ],
+        initialView: 'timeGridWeek',
+        initialDate: window.startDate !== undefined ? window.startDate : new Date(),
+        eventSource: [],
+        selectable: true,
+        select: this.onDateSelect,
+        eventChange: this.onEventChange,
+        eventClick: this.onEventClick,
+        selectMirror: true,
+        editable: true,
+        weekends: false,
+        headerToolbar: {
+          left: 'prev,next today',
+          center: 'title',
+          right: 'dayGridMonth,timeGridWeek,timeGridDay'
+        },
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.fetchData()
+    },
+    fetchData() {
+      console.log(this.userId);
+      fetchCalendar(this.userId).then(calendar => new Promise((resolve, reject) => {
+        let results = calendar.results;
+        let events = results.map(i => 
+          ({
+            start: i.startDate.datetime,
+            end: i.endDate.datetime,
+          })
+        );
+        let calendarEventsCurrentUser = {
+            events: events,
+            color: 'darkblue',
+            id: 1000,
+            editable: false
+        };
+        this.calendarEvents.user = calendarEventsCurrentUser;
+        this.updateEventsSource()
+        resolve();
+      }));
+    },
+    updateEventsSource() {
+      this.calendarOptions.eventSources = [];
+      if (this.showMyCalendar) {
+          this.calendarOptions.eventSources.push(this.calendarEvents.user);
+      }
+    },
+    toggleMyCalendar(value) {
+      this.showMyCalendar = value;
+    },
+    toggleWeekends: function() {
+      this.calendarOptions.weekends = !this.calendarOptions.weekends;
+    },
+    onDateSelect(payload) {
+      console.log(payload)
+    },
+    onEventChange(payload) {
+      //this.$store.dispatch('updateEvent', payload);
+    },
+    onEventClick(payload) {
+    },
+  },
+  mounted() {
+    this.init();
+  }
+}
+</script>
+
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
new file mode 100644
index 000000000..2f3f698ce
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
@@ -0,0 +1,8 @@
+const appMessages = {
+   fr: {
+   }
+}
+
+export {
+   appMessages
+};
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
new file mode 100644
index 000000000..ca338a3be
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
@@ -0,0 +1,16 @@
+import { createApp } from 'vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { appMessages } from './i18n'
+//import store from './store'
+
+import App from './App.vue';
+
+const i18n = _createI18n(appMessages);
+
+const app = createApp({
+   template: `<app></app>`,
+})
+//.use(store)
+.use(i18n)
+.component('app', App)
+.mount('#myCalendar');
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js
rename to src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
index bf359f49b..da9a9eaf8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
@@ -31,7 +31,7 @@
 </template>
 <script>
 
-import { fetchCalendarRanges, fetchCalendar } from './js/api'
+import { fetchCalendarRanges, fetchCalendar } from '../../_api/api'
 import VueMultiselect from 'vue-multiselect';
 import { whoami } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api';
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 33ea5d1b8..71b2e98a6 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -8,12 +8,17 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-{% if user %}
+{% if context == 'user' %}
     <h2>{{ 'My calendar list' |trans }}</h2>
 {% else %}
     <h2>{{ 'Calendar list' |trans }}</h2>
 {% endif %}
 
+{% if context == 'user' %}
+    <div id="myCalendar"></div>
+{% endif %}
+
+
 {% if calendarItems|length == 0 %}
     <p class="chill-no-data-statement">
         {{ "There is no calendar items."|trans }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
index ce4a8843c..f33e73851 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -7,3 +7,16 @@
 {% block content %}
     {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'user'} %}
 {% endblock %}
+ 
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.userId = {{ user.id }};
+    </script>
+    {{ encore_entry_script_tags('vue_mycalendarrange') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_calendar') }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
index 258e43089..f91b30268 100644
--- a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
@@ -6,5 +6,6 @@ module.exports = function(encore, entries) {
     });
 
     encore.addEntry('vue_calendar', __dirname + '/Resources/public/vuejs/Calendar/index.js');
+    encore.addEntry('vue_mycalendarrange', __dirname + '/Resources/public/vuejs/MyCalendarRange/index.js');
     encore.addEntry('page_calendar', __dirname + '/Resources/public/chill/index.js');
 };

From 329d3cc3d8b793403042340dbe3f4e490cdb9743 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 30 Aug 2021 11:02:53 +0200
Subject: [PATCH 060/217] rdv: add API entry point for POSTing calendar range

---
 .../Controller/CalendarRangeAPIController.php | 19 ++++---
 .../ChillCalendarExtension.php                |  3 +-
 .../Entity/CalendarRange.php                  |  6 +--
 .../ChillCalendarBundle/chill.api.specs.yaml  | 50 +++++++++++++++++++
 4 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index be279ed36..672e9527c 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -18,16 +18,19 @@ class CalendarRangeAPIController extends ApiController
      */
     public function availableRanges(Request $request, string $_format): JsonResponse
     {
-        if ($request->query->has('user')) {
-            $user = $request->query->get('user');
-        }
-
         $em = $this->getDoctrine()->getManager();
 
-        $query = $em->createQuery(
-            'SELECT c FROM ChillCalendarBundle:CalendarRange c 
-            WHERE NOT EXISTS (SELECT cal.id FROM ChillCalendarBundle:Calendar cal WHERE cal.calendarRange = c.id)')
-        ;
+        $sql = 'SELECT c FROM ChillCalendarBundle:CalendarRange c 
+        WHERE NOT EXISTS (SELECT cal.id FROM ChillCalendarBundle:Calendar cal WHERE cal.calendarRange = c.id)';
+
+        if ($request->query->has('user')) {
+            $user = $request->query->get('user');
+            $sql = $sql . ' AND c.user = :user';
+            $query = $em->createQuery($sql)
+                ->setParameter('user', $user);
+        } else {
+            $query = $em->createQuery($sql);
+        }
 
         $results = $query->getResult();
 
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 2927d4910..5f20f5968 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -72,7 +72,8 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST => true,
                             ]
                         ],
                     ]
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index f9582c8c2..b83684a7c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -25,19 +25,19 @@ class CalendarRange
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read"})
+     * @groups({"read", "write"})
      */
     private User $user;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
-     * @groups({"read"})
+     * @groups({"read", "write"})
      */
     private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
-     * @groups({"read"})
+     * @groups({"read", "write"})
      */
     private \DateTimeImmutable $endDate;
 
diff --git a/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml b/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
index 8da280b36..1ca66375d 100644
--- a/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
@@ -8,6 +8,28 @@ servers:
   - url: "/api"
     description: "Your current dev server"
 
+components:
+  schemas:
+    Date:
+      type: object
+      properties:
+        datetime:
+          type: string
+          format: date-time
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        type:
+          type: string
+          enum:
+            - user
+        username:
+          type: string
+        text:
+          type: string
+
 paths:
   /1.0/calendar/calendar.json:
     get:
@@ -48,6 +70,34 @@ paths:
       responses:
         200:
           description: "ok"
+    post:
+      tags:
+        - calendar
+      summary: create a new calendar range
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                user:
+                  $ref: '#/components/schemas/User'
+                startDate:
+                  $ref: '#/components/schemas/Date'
+                endDate:
+                  $ref: '#/components/schemas/Date'
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Unprocessable entity (validation errors)"
+        400:
+          description: "transition cannot be applyed"
 
   /1.0/calendar/calendar-range/{id}.json:
     get:

From 0fe6d7d00b3a9ae4e3f4a0993dabba19b0d6948a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 30 Aug 2021 11:57:15 +0200
Subject: [PATCH 061/217] rdv: add calendar range events in myCalendar

---
 .../public/vuejs/MyCalendarRange/App.vue      | 54 +++++++++++++------
 .../public/vuejs/MyCalendarRange/index.js     |  4 +-
 .../public/vuejs/MyCalendarRange/store.js     | 38 +++++++++++++
 .../Resources/public/vuejs/_api/api.js        | 12 ++++-
 4 files changed, 90 insertions(+), 18 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 1eaf04335..ace1ec5f4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -7,6 +7,7 @@
         <i>&nbsp;{{ arg.event.title }}</i>
       </template>
     </FullCalendar>
+
   </div>
 </template>
 
@@ -17,7 +18,7 @@ import FullCalendar from '@fullcalendar/vue3';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import timeGridPlugin from '@fullcalendar/timegrid';
-import { fetchCalendar } from '../_api/api';
+import { fetchCalendar, fetchCalendarRangesByUser } from '../_api/api';
 
 export default {
   name: "App",
@@ -30,7 +31,8 @@ export default {
       userId: window.userId,
       showMyCalendar: true,
       calendarEvents: {
-         user: [],
+         userCalendar: [],
+         userCalendarRange: []
       },
       calendarOptions: {
         locale: frLocale,
@@ -59,30 +61,49 @@ export default {
     },
     fetchData() {
       console.log(this.userId);
-      fetchCalendar(this.userId).then(calendar => new Promise((resolve, reject) => {
-        let results = calendar.results;
-        let events = results.map(i => 
+
+      fetchCalendarRangesByUser(this.userId).then(calendarRanges => new Promise((resolve, reject) => {
+        let events = calendarRanges.results.map(i =>
           ({
             start: i.startDate.datetime,
             end: i.endDate.datetime,
           })
         );
-        let calendarEventsCurrentUser = {
-            events: events,
-            color: 'darkblue',
-            id: 1000,
-            editable: false
+        let calendarRangeEvents = {
+              events: events,
+              color: 'orange',
+              textColor: '#444444'
         };
-        this.calendarEvents.user = calendarEventsCurrentUser;
-        this.updateEventsSource()
-        resolve();
+        this.calendarEvents.userCalendarRange = calendarRangeEvents;
+
+        fetchCalendar(this.userId).then(calendar => new Promise((resolve, reject) => {
+          let events = calendar.results.map(i =>
+            ({
+              start: i.startDate.datetime,
+              end: i.endDate.datetime,
+            })
+          );
+          let calendarEventsCurrentUser = {
+              events: events,
+              color: 'darkblue',
+              id: 1000,
+              editable: false
+          };
+          this.calendarEvents.userCalendar = calendarEventsCurrentUser;
+          this.updateEventsSource();
+          resolve();
+        }));
+
+      resolve();
       }));
     },
     updateEventsSource() {
       this.calendarOptions.eventSources = [];
+      this.calendarOptions.eventSources.push(this.calendarEvents.userCalendarRange);
       if (this.showMyCalendar) {
-          this.calendarOptions.eventSources.push(this.calendarEvents.user);
+          this.calendarOptions.eventSources.push(this.calendarEvents.userCalendar);
       }
+      console.log(this.calendarOptions.eventSources);
     },
     toggleMyCalendar(value) {
       this.showMyCalendar = value;
@@ -92,11 +113,14 @@ export default {
     },
     onDateSelect(payload) {
       console.log(payload)
+      this.$store.dispatch('createRange', payload);
     },
     onEventChange(payload) {
-      //this.$store.dispatch('updateEvent', payload);
+      console.log(payload)
+      this.$store.dispatch('updateRange', payload);
     },
     onEventClick(payload) {
+      console.log(payload)
     },
   },
   mounted() {
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
index ca338a3be..a10a16601 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index.js
@@ -1,7 +1,7 @@
 import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { appMessages } from './i18n'
-//import store from './store'
+import store from './store'
 
 import App from './App.vue';
 
@@ -10,7 +10,7 @@ const i18n = _createI18n(appMessages);
 const app = createApp({
    template: `<app></app>`,
 })
-//.use(store)
+.use(store)
 .use(i18n)
 .component('app', App)
 .mount('#myCalendar');
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
new file mode 100644
index 000000000..457069de7
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -0,0 +1,38 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const store = createStore({
+   strict: debug,
+   state: {
+     newCalendarRanges: [],
+     updateCalendarRanges: [],
+     deleteCalendarRanges: []
+   },
+   mutations: {
+      updateRange(state, payload) {
+         state.updateCalendarRanges.push({start: payload.start, end: payload.end});
+      },
+      addRange(state, payload) {
+         state.newCalendarRanges.push({start: payload.start, end: payload.end});
+      }
+   },
+   actions: {
+      createRange({ commit }, payload) {
+         console.log('### action createRange', payload);
+         commit('addRange', payload);
+      },
+      updateRange({ commit }, payload) {
+         console.log('### action updateRange', payload);
+         commit('updateRange', payload);
+      },
+      saveRanges({ commit }, payload) {
+         console.log('### action saveRange', payload);
+         postRange()
+      },
+
+  }
+});
+
+export default store;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
index a11ca8498..2c08068fd 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
@@ -12,6 +12,15 @@ const fetchCalendarRanges = () => {
       });
 };
 
+const fetchCalendarRangesByUser = (userId) => {
+   const url = `/api/1.0/calendar/calendar-range-available.json?user=${userId}`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
 /*
 * Endpoint chill_api_single_calendar
 * method GET, get Calendar events, can be filtered by mainUser
@@ -28,5 +37,6 @@ const fetchCalendar = (mainUserId) => {
 
 export {
    fetchCalendarRanges,
-   fetchCalendar
+   fetchCalendar,
+   fetchCalendarRangesByUser
 };

From 6d607e3939ecab641daff95b912192b80b964f85 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 30 Aug 2021 17:44:52 +0200
Subject: [PATCH 062/217] rdv: edit calendar ranges: create and update calendar
 ranges

---
 .../ChillCalendarExtension.php                |  2 +
 .../public/vuejs/MyCalendarRange/App.vue      | 31 ++++++++--
 .../public/vuejs/MyCalendarRange/store.js     | 60 ++++++++++++++++++-
 .../Resources/public/vuejs/_api/api.js        | 43 ++++++++++++-
 4 files changed, 127 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 5f20f5968..f4c5411f8 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -74,6 +74,8 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST => true,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_DELETE => true,
                             ]
                         ],
                     ]
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index ace1ec5f4..e28655ab4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -7,7 +7,10 @@
         <i>&nbsp;{{ arg.event.title }}</i>
       </template>
     </FullCalendar>
-
+    <button class="btn btn-save"
+        @click.prevent="onClickSave">
+        {{ $t('action.save')}}
+    </button>
   </div>
 </template>
 
@@ -32,7 +35,11 @@ export default {
       showMyCalendar: true,
       calendarEvents: {
          userCalendar: [],
-         userCalendarRange: []
+         userCalendarRange: [],
+         new: {
+           events: [],
+           color: "red"
+         }
       },
       calendarOptions: {
         locale: frLocale,
@@ -43,7 +50,7 @@ export default {
         selectable: true,
         select: this.onDateSelect,
         eventChange: this.onEventChange,
-        eventClick: this.onEventClick,
+        // eventClick: this.onEventClick,
         selectMirror: true,
         editable: true,
         weekends: false,
@@ -67,6 +74,7 @@ export default {
           ({
             start: i.startDate.datetime,
             end: i.endDate.datetime,
+            calendarRangeId: i.id
           })
         );
         let calendarRangeEvents = {
@@ -100,6 +108,7 @@ export default {
     updateEventsSource() {
       this.calendarOptions.eventSources = [];
       this.calendarOptions.eventSources.push(this.calendarEvents.userCalendarRange);
+      this.calendarOptions.eventSources.push(this.calendarEvents.new);
       if (this.showMyCalendar) {
           this.calendarOptions.eventSources.push(this.calendarEvents.userCalendar);
       }
@@ -113,15 +122,25 @@ export default {
     },
     onDateSelect(payload) {
       console.log(payload)
+      this.calendarEvents.new.events.push({ //TODO does not work
+          start: payload.startStr,
+          end: payload.endStr,
+      });
+      this.updateEventsSource();
       this.$store.dispatch('createRange', payload);
     },
     onEventChange(payload) {
       console.log(payload)
       this.$store.dispatch('updateRange', payload);
+      //TODO update the eventsSource with payload, or use the store for updating the eventsSource
     },
-    onEventClick(payload) {
-      console.log(payload)
-    },
+    // onEventClick(payload) {
+    //   console.log(payload)
+    //   //TODO update the eventsSource with payload, or use the store for updating the eventsSource
+    // },
+    onClickSave(payload){
+      this.$store.dispatch('saveRanges', payload);
+    }
   },
   mounted() {
     this.init();
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
index 457069de7..cec206661 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postCalendarRange, patchCalendarRange } from '../_api/api';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -12,10 +13,23 @@ const store = createStore({
    },
    mutations: {
       updateRange(state, payload) {
-         state.updateCalendarRanges.push({start: payload.start, end: payload.end});
+         state.updateCalendarRanges.push({
+            id: payload.event.extendedProps.calendarRangeId,
+            start: payload.event.start,
+            end: payload.event.end
+         });
       },
       addRange(state, payload) {
          state.newCalendarRanges.push({start: payload.start, end: payload.end});
+      },
+      clearNewCalendarRanges(state) {
+         state.newCalendarRanges = [];
+      },
+      clearUpdateCalendarRanges(state) {
+         state.updateCalendarRanges = [];
+      },
+      deleteUpdateCalendarRanges(state) {
+         state.deleteCalendarRanges = [];
       }
    },
    actions: {
@@ -29,10 +43,52 @@ const store = createStore({
       },
       saveRanges({ commit }, payload) {
          console.log('### action saveRange', payload);
-         postRange()
+         console.log(this.state)
+         //TODO: if smthg new in newCalendarRange, postRange(), if smthg to update in updateCalendarRanges, update...
+         if (this.state.newCalendarRanges.length > 0){
+            this.state.newCalendarRanges.map(cr => {
+               postCalendarRange({
+                  user: {
+                     type: 'user',
+                     id: window.userId,
+                  },
+                  startDate: {
+                     datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
+                  },
+                  endDate: {
+                     datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
+                  },
+               }, 'POST');
+            })
+            commit('clearNewCalendarRanges');
+         }
+         if (this.state.updateCalendarRanges.length > 0){
+            this.state.updateCalendarRanges.map(cr => {
+               console.log(cr)
+               patchCalendarRange(cr.id,
+                  {
+                  startDate: {
+                     datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
+                  },
+                  endDate: {
+                     datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
+                  },
+               });
+            })
+            commit('clearUpdateCalendarRanges');
+         }
+         if (this.state.deleteCalendarRanges.length > 0){
+            this.state.deleteCalendarRanges.map(cr => {
+               postCalendarRange({
+                  id: cr.id //TODO check functionning
+               }, 'DELETE');
+            })
+            commit('deleteUpdateCalendarRanges');
+         }
       },
 
   }
 });
 
+
 export default store;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
index 2c08068fd..c062d0d6e 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
@@ -35,8 +35,49 @@ const fetchCalendar = (mainUserId) => {
       });
 };
 
+
+/*
+* Endpoint chill_api_single_calendar_range__entity_create
+* method POST or DELETE, post CalendarRange entity
+*/
+const postCalendarRange = (body, method) => {
+   const url = `/api/1.0/calendar/calendar-range.json?`;
+   return fetch(url, {
+      method: method,
+      headers: {
+         'Content-Type': 'application/json;charset=utf-8'
+      },
+      body: JSON.stringify(body)
+   }).then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
+};
+
+/*
+* Endpoint chill_api_single_calendar_range__entity
+* method PATCH, patch CalendarRange entity
+*/
+const patchCalendarRange = (id, body) => {
+   console.log(body)
+   const url = `/api/1.0/calendar/calendar-range/${id}.json`;
+   return fetch(url, {
+      method: 'PATCH',
+      headers: {
+         'Content-Type': 'application/json;charset=utf-8'
+      },
+      body: JSON.stringify(body)
+   }).then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
+};
+
+
 export {
    fetchCalendarRanges,
    fetchCalendar,
-   fetchCalendarRangesByUser
+   fetchCalendarRangesByUser,
+   postCalendarRange,
+   patchCalendarRange
 };

From bcb36ddc112476f16f1db559bd21bfbe0c2d48b1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 31 Aug 2021 09:03:12 +0200
Subject: [PATCH 063/217] rdv: edit calendar range: fix display of new calendar
 ranges

---
 .../public/vuejs/MyCalendarRange/App.vue      | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index e28655ab4..5f6ed3c0d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -34,11 +34,11 @@ export default {
       userId: window.userId,
       showMyCalendar: true,
       calendarEvents: {
-         userCalendar: [],
-         userCalendarRange: [],
+         userCalendar: null,
+         userCalendarRange: null,
          new: {
            events: [],
-           color: "red"
+           color: "#3788d8"
          }
       },
       calendarOptions: {
@@ -50,6 +50,8 @@ export default {
         selectable: true,
         select: this.onDateSelect,
         eventChange: this.onEventChange,
+        eventDrop: this.onEventDropOrResize,
+        eventResize: this.onEventDropOrResize,
         // eventClick: this.onEventClick,
         selectMirror: true,
         editable: true,
@@ -79,7 +81,7 @@ export default {
         );
         let calendarRangeEvents = {
               events: events,
-              color: 'orange',
+              color: '#79bafc',
               textColor: '#444444'
         };
         this.calendarEvents.userCalendarRange = calendarRangeEvents;
@@ -107,8 +109,8 @@ export default {
     },
     updateEventsSource() {
       this.calendarOptions.eventSources = [];
-      this.calendarOptions.eventSources.push(this.calendarEvents.userCalendarRange);
       this.calendarOptions.eventSources.push(this.calendarEvents.new);
+      this.calendarOptions.eventSources.push(this.calendarEvents.userCalendarRange);
       if (this.showMyCalendar) {
           this.calendarOptions.eventSources.push(this.calendarEvents.userCalendar);
       }
@@ -122,17 +124,24 @@ export default {
     },
     onDateSelect(payload) {
       console.log(payload)
-      this.calendarEvents.new.events.push({ //TODO does not work
+      let events = this.calendarEvents.new.events;
+      events.push({
           start: payload.startStr,
-          end: payload.endStr,
+          end: payload.endStr
       });
+      this.calendarEvents.new = {
+        events: events,
+        color: "#3788d8"
+      };
       this.updateEventsSource();
       this.$store.dispatch('createRange', payload);
     },
     onEventChange(payload) {
       console.log(payload)
       this.$store.dispatch('updateRange', payload);
-      //TODO update the eventsSource with payload, or use the store for updating the eventsSource
+    },
+    onEventDropOrResize(payload) {
+      payload.event.setProp('color', '#3788d8');
     },
     // onEventClick(payload) {
     //   console.log(payload)

From 25b85fcc6816fdfa8a45b36349a81415f634dc4c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 31 Aug 2021 14:16:42 +0200
Subject: [PATCH 064/217] rdv: edit calendar ranges: add delete + doc swagger

---
 .../Controller/CalendarRangeAPIController.php |  6 +++
 .../ChillCalendarExtension.php                |  2 +-
 .../Resources/public/chill/scss/calendar.scss | 10 ++++
 .../public/vuejs/MyCalendarRange/App.vue      | 29 ++++++-----
 .../public/vuejs/MyCalendarRange/store.js     | 26 +++++++---
 .../Resources/public/vuejs/_api/api.js        | 41 +++++++++++++--
 .../views/Calendar/listByUser.html.twig       |  1 +
 .../ChillCalendarBundle/chill.api.specs.yaml  | 50 +++++++++++++++++++
 8 files changed, 137 insertions(+), 28 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index 672e9527c..a60eb98b3 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -38,4 +38,10 @@ class CalendarRangeAPIController extends ApiController
         //TODO use also the paginator, eg return $this->serializeCollection('get', $request, $_format, $paginator, $results);
     }
 
+    // public function calendarRangeApi($id, Request $request, string $_format): Response
+    // {
+    //     return $this->addRemoveSomething('calendarRange', $id, $request, $_format, 'calendarRange', CalendarRange::class, [ 'groups' => [ 'read' ] ]);
+    // }
+
+
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index f4c5411f8..8660fac52 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -66,7 +66,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
index b224125f1..a2c0c4b89 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
@@ -7,4 +7,14 @@ div#calendarControls {
 
 div#fullCalendar{
 
+}
+
+span.calendarRangeItems {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    a {
+        text-decoration: none;
+        padding: 3px;
+    }
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 5f6ed3c0d..320b5a978 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -2,14 +2,19 @@
   <div>
     <h2 class="chill-red">{{ $t('edit_your_calendar_range') }}</h2>
     <FullCalendar ref="fullCalendar" :options="calendarOptions">
-      <template v-slot:eventContent='arg'>
+      <template v-slot:eventContent='arg' >
+        <span class='calendarRangeItems'>
         <b>{{ arg.timeText }}</b>
-        <i>&nbsp;{{ arg.event.title }}</i>
+          <i>&nbsp;{{ arg.event.title }}</i>
+          <a class="fa fa-fw fa-times"
+            @click.prevent="onDelete(arg.event)">
+          </a>
+        </span>
       </template>
     </FullCalendar>
     <button class="btn btn-save"
-        @click.prevent="onClickSave">
-        {{ $t('action.save')}}
+      @click.prevent="onClickSave">
+      {{ $t('action.save')}}
     </button>
   </div>
 </template>
@@ -52,7 +57,6 @@ export default {
         eventChange: this.onEventChange,
         eventDrop: this.onEventDropOrResize,
         eventResize: this.onEventDropOrResize,
-        // eventClick: this.onEventClick,
         selectMirror: true,
         editable: true,
         weekends: false,
@@ -69,8 +73,6 @@ export default {
       this.fetchData()
     },
     fetchData() {
-      console.log(this.userId);
-
       fetchCalendarRangesByUser(this.userId).then(calendarRanges => new Promise((resolve, reject) => {
         let events = calendarRanges.results.map(i =>
           ({
@@ -123,7 +125,6 @@ export default {
       this.calendarOptions.weekends = !this.calendarOptions.weekends;
     },
     onDateSelect(payload) {
-      console.log(payload)
       let events = this.calendarEvents.new.events;
       events.push({
           start: payload.startStr,
@@ -137,18 +138,17 @@ export default {
       this.$store.dispatch('createRange', payload);
     },
     onEventChange(payload) {
-      console.log(payload)
-      this.$store.dispatch('updateRange', payload);
     },
     onEventDropOrResize(payload) {
       payload.event.setProp('color', '#3788d8');
+      this.$store.dispatch('updateRange', payload);
     },
-    // onEventClick(payload) {
-    //   console.log(payload)
-    //   //TODO update the eventsSource with payload, or use the store for updating the eventsSource
-    // },
     onClickSave(payload){
       this.$store.dispatch('saveRanges', payload);
+    },
+    onDelete(payload){
+      payload.setProp('color', '#dddddd');
+      this.$store.dispatch('deleteRange', payload);
     }
   },
   mounted() {
@@ -156,4 +156,3 @@ export default {
   }
 }
 </script>
-
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
index cec206661..319514fd1 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -1,6 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { postCalendarRange, patchCalendarRange } from '../_api/api';
+import { postCalendarRange, patchCalendarRange, deleteCalendarRange } from '../_api/api';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -20,7 +20,17 @@ const store = createStore({
          });
       },
       addRange(state, payload) {
-         state.newCalendarRanges.push({start: payload.start, end: payload.end});
+         state.newCalendarRanges.push({
+            start: payload.start,
+            end: payload.end
+         });
+      },
+      deleteRange(state, payload) {
+         state.deleteCalendarRanges.push({
+            id: payload.extendedProps.calendarRangeId,
+            start: payload.start,
+            end: payload.end
+         });
       },
       clearNewCalendarRanges(state) {
          state.newCalendarRanges = [];
@@ -41,10 +51,13 @@ const store = createStore({
          console.log('### action updateRange', payload);
          commit('updateRange', payload);
       },
+      deleteRange({ commit }, payload) {
+         console.log('### action deleteRange', payload);
+         commit('deleteRange', payload);
+      },
       saveRanges({ commit }, payload) {
          console.log('### action saveRange', payload);
          console.log(this.state)
-         //TODO: if smthg new in newCalendarRange, postRange(), if smthg to update in updateCalendarRanges, update...
          if (this.state.newCalendarRanges.length > 0){
             this.state.newCalendarRanges.map(cr => {
                postCalendarRange({
@@ -58,13 +71,12 @@ const store = createStore({
                   endDate: {
                      datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
                   },
-               }, 'POST');
+               });
             })
             commit('clearNewCalendarRanges');
          }
          if (this.state.updateCalendarRanges.length > 0){
             this.state.updateCalendarRanges.map(cr => {
-               console.log(cr)
                patchCalendarRange(cr.id,
                   {
                   startDate: {
@@ -79,9 +91,7 @@ const store = createStore({
          }
          if (this.state.deleteCalendarRanges.length > 0){
             this.state.deleteCalendarRanges.map(cr => {
-               postCalendarRange({
-                  id: cr.id //TODO check functionning
-               }, 'DELETE');
+               deleteCalendarRange(cr.id);
             })
             commit('deleteUpdateCalendarRanges');
          }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
index c062d0d6e..aa3d12f8d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
@@ -38,12 +38,12 @@ const fetchCalendar = (mainUserId) => {
 
 /*
 * Endpoint chill_api_single_calendar_range__entity_create
-* method POST or DELETE, post CalendarRange entity
+* method POST, post CalendarRange entity
 */
-const postCalendarRange = (body, method) => {
+const postCalendarRange = (body) => {
    const url = `/api/1.0/calendar/calendar-range.json?`;
    return fetch(url, {
-      method: method,
+      method: 'POST',
       headers: {
          'Content-Type': 'application/json;charset=utf-8'
       },
@@ -73,11 +73,44 @@ const patchCalendarRange = (id, body) => {
    });
 };
 
+/*
+* Endpoint chill_api_single_calendar_range__entity
+* method DELETE, delete CalendarRange entity
+*/
+const deleteCalendarRange = (id) => {
+   const url = `/api/1.0/calendar/calendar-range/${id}.json`;
+   return fetch(url, {
+      method: 'DELETE',
+      headers: {
+         'Content-Type': 'application/json;charset=utf-8'
+      },
+   }).then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
+};
+
+// const deleteCalendarRange = (id) => {
+//    const url = `/api/1.0/calendar/calendar-range.json`;
+//    return fetch(url, {
+//       method: 'DELETE',
+//       headers: {
+//          'Content-Type': 'application/json;charset=utf-8'
+//       },
+//       body: JSON.stringify({
+//          id: id
+//       })
+//    }).then(response => {
+//       if (response.ok) { return response.json(); }
+//       throw Error('Error with request resource response');
+//    });
+// };
 
 export {
    fetchCalendarRanges,
    fetchCalendar,
    fetchCalendarRangesByUser,
    postCalendarRange,
-   patchCalendarRange
+   patchCalendarRange,
+   deleteCalendarRange
 };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
index f33e73851..004000fc6 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -19,4 +19,5 @@
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('vue_calendar') }}
+    {{ encore_entry_link_tags('page_calendar') }}
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml b/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
index 1ca66375d..ebe0de88d 100644
--- a/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml
@@ -120,6 +120,56 @@ paths:
           description: "not found"
         401:
           description: "Unauthorized"
+    patch:
+      tags:
+        - calendar
+      summary: update a calendar range
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                user:
+                  $ref: '#/components/schemas/User'
+                startDate:
+                  $ref: '#/components/schemas/Date'
+                endDate:
+                  $ref: '#/components/schemas/Date'
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Unprocessable entity (validation errors)"
+        400:
+          description: "transition cannot be applyed"
+    delete:
+      tags:
+        - calendar
+      summary: "Remove a calendar range"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The calendar range id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "object with validation errors"
   
   /1.0/calendar/calendar-range-available.json:
     get:

From e1ccc8aba55c02e444d088cd9c5a19d8a7e418a0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Sun, 5 Sep 2021 11:06:39 +0200
Subject: [PATCH 065/217] =?UTF-8?q?rdv:=20edition=20plage=20de=20disponibi?=
 =?UTF-8?q?lit=C3=A9s:=20copy=20events=20to=20next=20day=20(WIP)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/vuejs/MyCalendarRange/App.vue      | 65 ++++++++++++++++++-
 .../public/vuejs/MyCalendarRange/i18n.js      |  5 ++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 320b5a978..48d07a74c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -16,6 +16,18 @@
       @click.prevent="onClickSave">
       {{ $t('action.save')}}
     </button>
+    <div class="form-check">
+      <input type="checkbox" id="myCalendar" class="form-check-input" v-model="showMyCalendarWidget" />
+      <label class="form-check-label" for="myCalendar">{{ $t('show_my_calendar') }}</label>
+    </div>
+    <div class="form-check">
+      <input type="checkbox" id="weekends" class="form-check-input" @click="toggleWeekends" />
+      <label class="form-check-label" for="weekends">{{ $t('show_weekends') }}</label>
+    </div>
+    <button class="btn btn-action"
+      @click.prevent="copyDay">
+      {{ $t('copy_range_to_next_day')}}
+    </button>
   </div>
 </template>
 
@@ -68,6 +80,17 @@ export default {
       }
     }
   },
+  computed: {
+    showMyCalendarWidget: {
+      set(value) {
+        this.toggleMyCalendar(value);
+        this.updateEventsSource();
+      },
+      get() {
+        return this.showMyCalendar;
+      }
+    }
+   },
   methods: {
     init() {
       this.fetchData()
@@ -143,12 +166,50 @@ export default {
       payload.event.setProp('color', '#3788d8');
       this.$store.dispatch('updateRange', payload);
     },
-    onClickSave(payload){
+    onClickSave(payload) {
       this.$store.dispatch('saveRanges', payload);
     },
-    onDelete(payload){
+    onDelete(payload) {
       payload.setProp('color', '#dddddd');
       this.$store.dispatch('deleteRange', payload);
+    },
+    copyDay(payload) {
+      console.log(payload);
+      // TODO get current day, or get current new events
+      console.log(this.calendarEvents.new);
+      if (this.calendarEvents.new.events) {
+        // TODO copy all events of the **LAST** day and create a array of events for the next day
+        // TODO if showWeekends, copy on the next day always, else, skip weekends
+        let events = this.calendarEvents.new.events.map(i => {
+          let startDate = new Date(new Date(i.start).getTime() + 24*60*60*1000);
+          let endDate = new Date(new Date(i.end).getTime() + 24*60*60*1000);
+          return ({
+            start: startDate.toISOString(),
+            end: endDate.toISOString()
+          })
+        }
+         
+        );
+        let copiedEvents = {
+          events: events,
+          color: "#3788d8"
+        };
+        console.log(copiedEvents)
+        //TODO in a loop : this.$store.dispatch('createRange', payload);
+        
+        let newEvents = this.calendarEvents.new.events;
+        newEvents.push(...copiedEvents.events);
+        this.calendarEvents.new = {
+          events: newEvents,
+          color: "#3788d8"
+        };
+
+        console.log(this.calendarEvents.new.events)
+        this.updateEventsSource();
+      } else {
+        console.log('no new events to copy-paste!')
+      }
+
     }
   },
   mounted() {
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
index 2f3f698ce..2d7513327 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
@@ -1,5 +1,10 @@
 const appMessages = {
    fr: {
+      edit_your_calendar_range: "Planifiez vos plages de disponibilités",
+      show_my_calendar: "Afficher mon calendrier",
+      show_weekends: "Afficher les week-ends",
+      copy_range_to_next_day: "Copier les plages du jour au jour suivant",
+      copy_range_to_next_week: "Copier les plages de la semaine à la semaine suivante"
    }
 }
 

From 6bfc180951b5a257968c0dc22877604038f2ab89 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Sun, 5 Sep 2021 22:29:56 +0200
Subject: [PATCH 066/217] rdv: plages de disponibilites: copy the next day +
 refresh after save

---
 .../public/vuejs/MyCalendarRange/App.vue      | 128 ++++++++++++++----
 .../public/vuejs/MyCalendarRange/i18n.js      |   3 +-
 .../public/vuejs/MyCalendarRange/store.js     |  49 ++-----
 3 files changed, 109 insertions(+), 71 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 48d07a74c..06dcec898 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -24,10 +24,13 @@
       <input type="checkbox" id="weekends" class="form-check-input" @click="toggleWeekends" />
       <label class="form-check-label" for="weekends">{{ $t('show_weekends') }}</label>
     </div>
-    <button class="btn btn-action"
+    <div>
+    <button class="btn btn-action" 
       @click.prevent="copyDay">
       {{ $t('copy_range_to_next_day')}}
     </button>
+    <p>{{ $t('copy_range_how_to')}}</p>
+    </div>
   </div>
 </template>
 
@@ -38,7 +41,7 @@ import FullCalendar from '@fullcalendar/vue3';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import timeGridPlugin from '@fullcalendar/timegrid';
-import { fetchCalendar, fetchCalendarRangesByUser } from '../_api/api';
+import { deleteCalendarRange, fetchCalendar, fetchCalendarRangesByUser, patchCalendarRange, postCalendarRange } from '../_api/api';
 
 export default {
   name: "App",
@@ -77,7 +80,8 @@ export default {
           center: 'title',
           right: 'dayGridMonth,timeGridWeek,timeGridDay'
         },
-      }
+      },
+      
     }
   },
   computed: {
@@ -89,11 +93,19 @@ export default {
       get() {
         return this.showMyCalendar;
       }
-    }
-   },
+    },
+  },
   methods: {
     init() {
-      this.fetchData()
+      this.fetchData();
+    },
+    resetCalendar() {
+      this.fetchData();
+      this.calendarEvents.new = {
+        events: [],
+        color: "#3788d8"
+      };
+      this.updateEventsSource();
     },
     fetchData() {
       fetchCalendarRangesByUser(this.userId).then(calendarRanges => new Promise((resolve, reject) => {
@@ -157,6 +169,7 @@ export default {
         events: events,
         color: "#3788d8"
       };
+      this.lastNewDate = new Date(payload.startStr);
       this.updateEventsSource();
       this.$store.dispatch('createRange', payload);
     },
@@ -166,50 +179,107 @@ export default {
       payload.event.setProp('color', '#3788d8');
       this.$store.dispatch('updateRange', payload);
     },
-    onClickSave(payload) {
-      this.$store.dispatch('saveRanges', payload);
+    onClickSave(payload) { 
+      if (this.$store.state.newCalendarRanges.length > 0){
+        this.$store.state.newCalendarRanges.map(cr => {
+            postCalendarRange({
+              user: {
+                  type: 'user',
+                  id: window.userId,
+              },
+              startDate: {
+                  datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
+              },
+              endDate: {
+                  datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
+              },
+            }).then((_r) => this.resetCalendar());
+        });
+        this.$store.dispatch('clearNewCalendarRanges', payload);
+      }
+      if (this.$store.state.updateCalendarRanges.length > 0){
+        this.$store.state.updateCalendarRanges.map(cr => {
+            patchCalendarRange(cr.id,
+              {
+              startDate: {
+                  datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
+              },
+              endDate: {
+                  datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
+              },
+            }).then((_r) => this.resetCalendar());
+        })
+        this.$store.dispatch('clearUpdateCalendarRanges', payload);
+      }
+      if (this.$store.state.deleteCalendarRanges.length > 0){
+        this.$store.state.deleteCalendarRanges.map(cr => {
+            deleteCalendarRange(cr.id).then((_r) => this.resetCalendar());;
+        })
+        this.$store.dispatch('deleteUpdateCalendarRanges', payload);
+      }
+
     },
     onDelete(payload) {
       payload.setProp('color', '#dddddd');
       this.$store.dispatch('deleteRange', payload);
     },
-    copyDay(payload) {
-      console.log(payload);
-      // TODO get current day, or get current new events
+    isSameDay(date1, date2) {
+      return date1.getFullYear() === date2.getFullYear() &&
+          date1.getMonth() === date2.getMonth() &&
+          date1.getDate() === date2.getDate();
+    },
+    isFriday(date) {
+      return date.getDay() === 5
+    },
+    // disableCopyDayButton() { //TODO does not update!
+    //   return this.calendarEvents.new.events.length === 0
+    // },
+    copyDay(_payload) {
       console.log(this.calendarEvents.new);
-      if (this.calendarEvents.new.events) {
-        // TODO copy all events of the **LAST** day and create a array of events for the next day
-        // TODO if showWeekends, copy on the next day always, else, skip weekends
-        let events = this.calendarEvents.new.events.map(i => {
-          let startDate = new Date(new Date(i.start).getTime() + 24*60*60*1000);
-          let endDate = new Date(new Date(i.end).getTime() + 24*60*60*1000);
-          return ({
-            start: startDate.toISOString(),
-            end: endDate.toISOString()
-          })
-        }
-         
+      if (this.calendarEvents.new.events.length > 0) {
+        // Create the copied events
+        let increment = !this.calendarOptions.weekends && this.isFriday(this.lastNewDate) ? 24*60*60*1000*3 : 24*60*60*1000;
+        let events = this.calendarEvents.new.events.filter(
+          i => this.isSameDay(new Date(i.start), this.lastNewDate)).map(
+            i => {
+              let startDate = new Date(new Date(i.start).getTime() + increment);
+              let endDate = new Date(new Date(i.end).getTime() + increment);
+              return ({
+                start: startDate.toISOString(),
+                end: endDate.toISOString()
+              })
+            }
         );
         let copiedEvents = {
           events: events,
           color: "#3788d8"
         };
-        console.log(copiedEvents)
-        //TODO in a loop : this.$store.dispatch('createRange', payload);
-        
+        console.log(copiedEvents);
+ 
+        // Add to the calendar
         let newEvents = this.calendarEvents.new.events;
         newEvents.push(...copiedEvents.events);
         this.calendarEvents.new = {
           events: newEvents,
           color: "#3788d8"
         };
-
-        console.log(this.calendarEvents.new.events)
         this.updateEventsSource();
+        
+        // Set the last new date
+        this.lastNewDate = new Date(copiedEvents.events[copiedEvents.events.length - 1].start);
+
+        // Dispatch in store for saving
+        for (let i = 0; i < copiedEvents.events.length; i++) {
+          let eventObj = {
+            start: new Date(copiedEvents.events[i].start),
+            end: new Date(copiedEvents.events[i].end)
+          }
+          this.$store.dispatch('createRange', eventObj);
+        }
+
       } else {
         console.log('no new events to copy-paste!')
       }
-
     }
   },
   mounted() {
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
index 2d7513327..8353a0a1f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
@@ -4,7 +4,8 @@ const appMessages = {
       show_my_calendar: "Afficher mon calendrier",
       show_weekends: "Afficher les week-ends",
       copy_range_to_next_day: "Copier les plages du jour au jour suivant",
-      copy_range_to_next_week: "Copier les plages de la semaine à la semaine suivante"
+      copy_range_to_next_week: "Copier les plages de la semaine à la semaine suivante",
+      copy_range_how_to: "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi."
    }
 }
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
index 319514fd1..63130e06f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -55,48 +55,15 @@ const store = createStore({
          console.log('### action deleteRange', payload);
          commit('deleteRange', payload);
       },
-      saveRanges({ commit }, payload) {
-         console.log('### action saveRange', payload);
-         console.log(this.state)
-         if (this.state.newCalendarRanges.length > 0){
-            this.state.newCalendarRanges.map(cr => {
-               postCalendarRange({
-                  user: {
-                     type: 'user',
-                     id: window.userId,
-                  },
-                  startDate: {
-                     datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
-                  },
-                  endDate: {
-                     datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
-                  },
-               });
-            })
-            commit('clearNewCalendarRanges');
-         }
-         if (this.state.updateCalendarRanges.length > 0){
-            this.state.updateCalendarRanges.map(cr => {
-               patchCalendarRange(cr.id,
-                  {
-                  startDate: {
-                     datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
-                  },
-                  endDate: {
-                     datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
-                  },
-               });
-            })
-            commit('clearUpdateCalendarRanges');
-         }
-         if (this.state.deleteCalendarRanges.length > 0){
-            this.state.deleteCalendarRanges.map(cr => {
-               deleteCalendarRange(cr.id);
-            })
-            commit('deleteUpdateCalendarRanges');
-         }
+      clearNewCalendarRanges({ commit }, payload) {
+         commit('clearNewCalendarRanges', payload);
       },
-
+      clearUpdateCalendarRanges({ commit }, payload) {
+         commit('clearUpdateCalendarRanges', payload);
+      },
+      deleteUpdateCalendarRanges({ commit }, payload) {
+         commit('deleteUpdateCalendarRanges', payload);
+      }
   }
 });
 

From 0a274eb2a4bd33d2de8a6521be27f3de69ded9e8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 6 Sep 2021 13:28:39 +0200
Subject: [PATCH 067/217] Enable DELETE in the ApiController

---
 .../Controller/CalendarRangeAPIController.php |  6 ---
 .../CRUD/Controller/ApiController.php         | 50 +++++++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index a60eb98b3..672e9527c 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -38,10 +38,4 @@ class CalendarRangeAPIController extends ApiController
         //TODO use also the paginator, eg return $this->serializeCollection('get', $request, $_format, $paginator, $results);
     }
 
-    // public function calendarRangeApi($id, Request $request, string $_format): Response
-    // {
-    //     return $this->addRemoveSomething('calendarRange', $id, $request, $_format, 'calendarRange', CalendarRange::class, [ 'groups' => [ 'read' ] ]);
-    // }
-
-
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index cab0bcdcb..359ff0384 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -87,6 +87,8 @@ class ApiController extends AbstractCRUDController
                 return $this->entityPut('_entity', $request, $id, $_format);
             case Request::METHOD_POST:
                 return $this->entityPostAction('_entity', $request, $id, $_format);
+            case Request::METHOD_DELETE:
+                return $this->entityDelete('_entity', $request, $id, $_format);
             default:
                 throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException("This method is not implemented");
         }
@@ -217,6 +219,54 @@ class ApiController extends AbstractCRUDController
             $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
         );
     }
+    public function entityDelete($action, Request $request, $id, string $_format): Response
+    {
+        $entity = $this->getEntity($action, $id, $request, $_format);
+
+        if (NULL === $entity) {
+            throw $this->createNotFoundException(sprintf("The %s with id %s "
+                . "is not found", $this->getCrudName(), $id));
+        }
+
+        $response = $this->checkACL($action, $request, $_format, $entity);
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $errors = $this->validate($action, $request, $_format, $entity);
+
+        $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        if ($errors->count() > 0) {
+            $response = $this->json($errors);
+            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
+
+            return $response;
+        }
+
+        $this->getDoctrine()->getManager()->remove($entity);
+        $this->getDoctrine()->getManager()->flush();
+
+        $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        return $this->json(Response::HTTP_OK);
+    }
 
     protected function onAfterValidation(string $action, Request $request, string $_format, $entity, ConstraintViolationListInterface $errors, array $more = []): ?Response
     {

From 82e76d7d5a208a93df8887d85f22223ef16d76a9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 6 Sep 2021 14:50:48 +0200
Subject: [PATCH 068/217] =?UTF-8?q?rdv:=20plages=20de=20disponibilit=C3=A9?=
 =?UTF-8?q?s:=20various=20UX/UI=20improvements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/vuejs/MyCalendarRange/App.vue      | 91 +++++++++++++++----
 .../public/vuejs/MyCalendarRange/i18n.js      |  7 +-
 .../Resources/public/vuejs/_api/api.js        | 16 ----
 3 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 06dcec898..1c0e7c4b4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -1,6 +1,16 @@
 <template>
   <div>
     <h2 class="chill-red">{{ $t('edit_your_calendar_range') }}</h2>
+
+    <div class="form-check">
+      <input type="checkbox" id="myCalendar" class="form-check-input" v-model="showMyCalendarWidget" />
+      <label class="form-check-label" for="myCalendar">{{ $t('show_my_calendar') }}</label>
+    </div>
+    <div class="form-check">
+      <input type="checkbox" id="weekends" class="form-check-input" @click="toggleWeekends" />
+      <label class="form-check-label" for="weekends">{{ $t('show_weekends') }}</label>
+    </div>
+
     <FullCalendar ref="fullCalendar" :options="calendarOptions">
       <template v-slot:eventContent='arg' >
         <span class='calendarRangeItems'>
@@ -12,24 +22,52 @@
         </span>
       </template>
     </FullCalendar>
-    <button class="btn btn-save"
-      @click.prevent="onClickSave">
-      {{ $t('action.save')}}
-    </button>
-    <div class="form-check">
-      <input type="checkbox" id="myCalendar" class="form-check-input" v-model="showMyCalendarWidget" />
-      <label class="form-check-label" for="myCalendar">{{ $t('show_my_calendar') }}</label>
-    </div>
-    <div class="form-check">
-      <input type="checkbox" id="weekends" class="form-check-input" @click="toggleWeekends" />
-      <label class="form-check-label" for="weekends">{{ $t('show_weekends') }}</label>
+    <div>
+      <button class="btn btn-save" :disabled="!dirty"
+        @click.prevent="onClickSave">
+        {{ $t('action.save')}}
+      </button>
+      <span v-if="flag.loading" class="loading">
+        <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+        <span class="sr-only">{{ $t('loading') }}</span>
+      </span>
     </div>
     <div>
-    <button class="btn btn-action" 
-      @click.prevent="copyDay">
-      {{ $t('copy_range_to_next_day')}}
-    </button>
-    <p>{{ $t('copy_range_how_to')}}</p>
+      <button v-if="disableCopyDayButton" class="btn btn-action" disabled>
+        {{ $t('copy_range_to_next_day')}}
+      </button>
+      <button v-if="!disableCopyDayButton" class="btn btn-action" 
+        @click.prevent="copyDay">
+        {{ $t('copy_range_from_day')}} {{this.lastNewDate.toLocaleDateString()}} {{ $t('to_the_next_day')}}
+      </button>
+      <p>{{ $t('copy_range_how_to')}}</p>
+    </div>
+
+    <div>
+      <div v-if="newCalendarRanges.length > 0">
+        <h4>{{ $t('new_range_to_save') }}</h4>
+        <ul>
+          <li v-for="i in newCalendarRanges" :key="i.start">
+            {{ i.start.toLocaleString() }} - {{ i.end.toLocaleString() }}
+          </li>
+        </ul>
+      </div>
+      <div v-if="updateCalendarRanges.length > 0">
+        <h4>{{ $t('update_range_to_save') }}</h4>
+        <ul>
+          <li v-for="i in updateCalendarRanges" :key="i.start">
+            {{ i.start.toLocaleString() }} - {{ i.end.toLocaleString() }}
+          </li>
+        </ul>
+      </div>
+      <div v-if="deleteCalendarRanges.length > 0">
+        <h4>{{ $t('delete_range_to_save') }}</h4>
+        <ul>
+          <li v-for="i in deleteCalendarRanges" :key="i.start">
+            {{ i.start.toLocaleString() }} - {{ i.end.toLocaleString() }}
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
@@ -42,6 +80,7 @@ import dayGridPlugin from '@fullcalendar/daygrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import timeGridPlugin from '@fullcalendar/timegrid';
 import { deleteCalendarRange, fetchCalendar, fetchCalendarRangesByUser, patchCalendarRange, postCalendarRange } from '../_api/api';
+import { mapState } from 'vuex';
 
 export default {
   name: "App",
@@ -51,6 +90,9 @@ export default {
   data() {
     return {
       errorMsg: [],
+      flag: {
+        loading: false
+      },
       userId: window.userId,
       showMyCalendar: true,
       calendarEvents: {
@@ -61,6 +103,8 @@ export default {
            color: "#3788d8"
          }
       },
+      lastNewDate: null,
+      disableCopyDayButton: true,
       calendarOptions: {
         locale: frLocale,
         plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin ],
@@ -85,6 +129,12 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      newCalendarRanges: state => state.newCalendarRanges,
+      updateCalendarRanges: state => state.updateCalendarRanges,
+      deleteCalendarRanges: state => state.deleteCalendarRanges,
+      dirty: state => state.newCalendarRanges.length > 0 || state.updateCalendarRanges.length > 0 || state.deleteCalendarRanges.length > 0 
+    }),
     showMyCalendarWidget: {
       set(value) {
         this.toggleMyCalendar(value);
@@ -108,6 +158,7 @@ export default {
       this.updateEventsSource();
     },
     fetchData() {
+      this.flag.loading = true;
       fetchCalendarRangesByUser(this.userId).then(calendarRanges => new Promise((resolve, reject) => {
         let events = calendarRanges.results.map(i =>
           ({
@@ -138,6 +189,7 @@ export default {
           };
           this.calendarEvents.userCalendar = calendarEventsCurrentUser;
           this.updateEventsSource();
+          this.flag.loading = false;
           resolve();
         }));
 
@@ -169,6 +221,7 @@ export default {
         events: events,
         color: "#3788d8"
       };
+      this.disableCopyDayButton = false;
       this.lastNewDate = new Date(payload.startStr);
       this.updateEventsSource();
       this.$store.dispatch('createRange', payload);
@@ -179,7 +232,8 @@ export default {
       payload.event.setProp('color', '#3788d8');
       this.$store.dispatch('updateRange', payload);
     },
-    onClickSave(payload) { 
+    onClickSave(payload) {
+      this.flag.loading = true;
       if (this.$store.state.newCalendarRanges.length > 0){
         this.$store.state.newCalendarRanges.map(cr => {
             postCalendarRange({
@@ -231,9 +285,6 @@ export default {
     isFriday(date) {
       return date.getDay() === 5
     },
-    // disableCopyDayButton() { //TODO does not update!
-    //   return this.calendarEvents.new.events.length === 0
-    // },
     copyDay(_payload) {
       console.log(this.calendarEvents.new);
       if (this.calendarEvents.new.events.length > 0) {
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
index 8353a0a1f..96eca1d6a 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
@@ -4,8 +4,13 @@ const appMessages = {
       show_my_calendar: "Afficher mon calendrier",
       show_weekends: "Afficher les week-ends",
       copy_range_to_next_day: "Copier les plages du jour au jour suivant",
+      copy_range_from_day: "Copier les plages du ",
+      to_the_next_day: " au jour suivant",
       copy_range_to_next_week: "Copier les plages de la semaine à la semaine suivante",
-      copy_range_how_to: "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi."
+      copy_range_how_to: "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
+      new_range_to_save: "Nouvelles plages à enregistrer",
+      update_range_to_save: "Plages à modifier",
+      delete_range_to_save: "Plages à supprimer"
    }
 }
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
index aa3d12f8d..7aad8ace2 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_api/api.js
@@ -90,22 +90,6 @@ const deleteCalendarRange = (id) => {
    });
 };
 
-// const deleteCalendarRange = (id) => {
-//    const url = `/api/1.0/calendar/calendar-range.json`;
-//    return fetch(url, {
-//       method: 'DELETE',
-//       headers: {
-//          'Content-Type': 'application/json;charset=utf-8'
-//       },
-//       body: JSON.stringify({
-//          id: id
-//       })
-//    }).then(response => {
-//       if (response.ok) { return response.json(); }
-//       throw Error('Error with request resource response');
-//    });
-// };
-
 export {
    fetchCalendarRanges,
    fetchCalendar,

From c42ec1d49353530f34a8b999f548561c0f13895a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 6 Sep 2021 15:37:54 +0200
Subject: [PATCH 069/217] rdv: plages de disponibilites: remove new events
 before it was saved

---
 .../public/vuejs/MyCalendarRange/App.vue      | 24 +++++++++++++++----
 .../public/vuejs/MyCalendarRange/store.js     | 15 +++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 1c0e7c4b4..8572ff4fa 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -133,7 +133,7 @@ export default {
       newCalendarRanges: state => state.newCalendarRanges,
       updateCalendarRanges: state => state.updateCalendarRanges,
       deleteCalendarRanges: state => state.deleteCalendarRanges,
-      dirty: state => state.newCalendarRanges.length > 0 || state.updateCalendarRanges.length > 0 || state.deleteCalendarRanges.length > 0 
+      dirty: state => state.newCalendarRanges.length > 0 || state.updateCalendarRanges.length > 0 || state.deleteCalendarRanges.length > 0
     }),
     showMyCalendarWidget: {
       set(value) {
@@ -269,13 +269,29 @@ export default {
         this.$store.state.deleteCalendarRanges.map(cr => {
             deleteCalendarRange(cr.id).then((_r) => this.resetCalendar());;
         })
-        this.$store.dispatch('deleteUpdateCalendarRanges', payload);
+        this.$store.dispatch('clearDeleteCalendarRanges', payload);
       }
 
     },
     onDelete(payload) {
-      payload.setProp('color', '#dddddd');
-      this.$store.dispatch('deleteRange', payload);
+      if (payload.extendedProps.hasOwnProperty("calendarRangeId")) {
+        payload.setProp('color', '#dddddd');
+        this.$store.dispatch('deleteRange', payload);
+      } else {
+        let newEvents = this.calendarEvents.new.events;
+        let filterEvents = newEvents.filter((e) => 
+          e.start !== payload.startStr && e.end !== payload.endStr
+        );
+        this.calendarEvents.new = {
+          events: filterEvents,
+          color: "#3788d8"
+        };
+
+        this.$store.dispatch('removeNewCalendarRanges', payload);
+
+        this.updateEventsSource();
+      }
+
     },
     isSameDay(date1, date2) {
       return date1.getFullYear() === date2.getFullYear() &&
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
index 63130e06f..7db701a0d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -38,8 +38,14 @@ const store = createStore({
       clearUpdateCalendarRanges(state) {
          state.updateCalendarRanges = [];
       },
-      deleteUpdateCalendarRanges(state) {
+      clearDeleteCalendarRanges(state) {
          state.deleteCalendarRanges = [];
+      },
+      removeNewCalendarRanges(state, payload) {
+         let filteredCollection = state.newCalendarRanges.filter(
+            (e) => e.start.toString() !== payload.start.toString() && e.end.toString() !== payload.end.toString()
+         )
+         state.newCalendarRanges = filteredCollection;
       }
    },
    actions: {
@@ -61,8 +67,11 @@ const store = createStore({
       clearUpdateCalendarRanges({ commit }, payload) {
          commit('clearUpdateCalendarRanges', payload);
       },
-      deleteUpdateCalendarRanges({ commit }, payload) {
-         commit('deleteUpdateCalendarRanges', payload);
+      clearDeleteCalendarRanges({ commit }, payload) {
+         commit('clearDeleteCalendarRanges', payload);
+      },
+      removeNewCalendarRanges({ commit }, payload) {
+         commit('removeNewCalendarRanges', payload);
       }
   }
 });

From 0ab53f465955e5c0809202212aaaff939c4d1ac0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Sep 2021 09:16:02 +0200
Subject: [PATCH 070/217] rdv: add header

---
 .../Resources/views/Calendar/list.html.twig                    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 71b2e98a6..331544854 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -18,6 +18,9 @@
     <div id="myCalendar"></div>
 {% endif %}
 
+{% if context == 'user' %}
+    <h2 class="chill-red">{{ 'My calendar list' |trans }}</h2>
+{% endif %}
 
 {% if calendarItems|length == 0 %}
     <p class="chill-no-data-statement">

From 29c148f92457ac64f8ac8ba8d2d2eedc1c384eb9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Sep 2021 13:38:13 +0200
Subject: [PATCH 071/217] rdv: can remove from delete calendar ranges

---
 .../public/vuejs/MyCalendarRange/App.vue       | 18 +++++++++++++-----
 .../public/vuejs/MyCalendarRange/store.js      | 13 +++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 8572ff4fa..0a7d83db6 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -17,7 +17,7 @@
         <b>{{ arg.timeText }}</b>
           <i>&nbsp;{{ arg.event.title }}</i>
           <a class="fa fa-fw fa-times"
-            @click.prevent="onDelete(arg.event)">
+            @click.prevent="onClickDelete(arg.event)">
           </a>
         </span>
       </template>
@@ -164,7 +164,8 @@ export default {
           ({
             start: i.startDate.datetime,
             end: i.endDate.datetime,
-            calendarRangeId: i.id
+            calendarRangeId: i.id,
+            toDelete: 0
           })
         );
         let calendarRangeEvents = {
@@ -273,10 +274,17 @@ export default {
       }
 
     },
-    onDelete(payload) {
+    onClickDelete(payload) {
       if (payload.extendedProps.hasOwnProperty("calendarRangeId")) {
-        payload.setProp('color', '#dddddd');
-        this.$store.dispatch('deleteRange', payload);
+        if (payload.extendedProps.toDelete === 1) {
+          payload.setExtendedProp('toDelete', 0)
+          payload.setProp('color', '#79bafc');
+          this.$store.dispatch('removeFromDeleteRange', payload);
+        } else {
+          payload.setExtendedProp('toDelete', 1)
+          payload.setProp('color', '#dddddd');
+          this.$store.dispatch('deleteRange', payload);
+        }
       } else {
         let newEvents = this.calendarEvents.new.events;
         let filterEvents = newEvents.filter((e) => 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
index 7db701a0d..997f95b11 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store.js
@@ -46,7 +46,13 @@ const store = createStore({
             (e) => e.start.toString() !== payload.start.toString() && e.end.toString() !== payload.end.toString()
          )
          state.newCalendarRanges = filteredCollection;
-      }
+      },
+      removeFromDeleteRange(state, payload) {
+         let filteredCollection = state.deleteCalendarRanges.filter(
+            (e) => e.start.toString() !== payload.start.toString() && e.end.toString() !== payload.end.toString()
+         )
+         state.deleteCalendarRanges = filteredCollection;
+      },
    },
    actions: {
       createRange({ commit }, payload) {
@@ -72,7 +78,10 @@ const store = createStore({
       },
       removeNewCalendarRanges({ commit }, payload) {
          commit('removeNewCalendarRanges', payload);
-      }
+      },
+      removeFromDeleteRange({ commit }, payload) {
+         commit('removeFromDeleteRange', payload);
+      },
   }
 });
 

From f6f24d0bebe4225322332e79ca72d376ada01ef7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Sep 2021 14:06:35 +0200
Subject: [PATCH 072/217] rdv: style my calendar

---
 .../public/vuejs/MyCalendarRange/App.vue      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 0a7d83db6..56d914b95 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -169,9 +169,10 @@ export default {
           })
         );
         let calendarRangeEvents = {
-              events: events,
-              color: '#79bafc',
-              textColor: '#444444'
+          events: events,
+          borderColor: "#3788d8",
+          backgroundColor: '#ffffff',
+          textColor: '#444444',
         };
         this.calendarEvents.userCalendarRange = calendarRangeEvents;
 
@@ -220,7 +221,9 @@ export default {
       });
       this.calendarEvents.new = {
         events: events,
-        color: "#3788d8"
+        borderColor: "#3788d8",
+        backgroundColor: '#fffadf ',
+        textColor: '#444444',
       };
       this.disableCopyDayButton = false;
       this.lastNewDate = new Date(payload.startStr);
@@ -230,7 +233,9 @@ export default {
     onEventChange(payload) {
     },
     onEventDropOrResize(payload) {
-      payload.event.setProp('color', '#3788d8');
+      payload.event.setProp('borderColor', '#3788d8');
+      payload.event.setProp('backgroundColor', '#fffadf');
+      payload.event.setProp('textColor', '#444444');
       this.$store.dispatch('updateRange', payload);
     },
     onClickSave(payload) {
@@ -278,11 +283,11 @@ export default {
       if (payload.extendedProps.hasOwnProperty("calendarRangeId")) {
         if (payload.extendedProps.toDelete === 1) {
           payload.setExtendedProp('toDelete', 0)
-          payload.setProp('color', '#79bafc');
+          payload.setProp('borderColor', '#79bafc');
           this.$store.dispatch('removeFromDeleteRange', payload);
         } else {
           payload.setExtendedProp('toDelete', 1)
-          payload.setProp('color', '#dddddd');
+          payload.setProp('borderColor', '#dddddd');
           this.$store.dispatch('deleteRange', payload);
         }
       } else {

From c89e2662b1b281f6e0b8ae841eea410cb6c5f1d6 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Sep 2021 12:29:06 +0200
Subject: [PATCH 073/217] household resume page, improve ux

---
 .../Resources/views/Form/fields.html.twig     |   6 +
 .../Resources/public/chill/chillperson.scss   |  23 ++
 .../Address/_insert_vue_address.html.twig     |   3 +
 .../views/Household/_render_member.html.twig  |   2 +-
 .../views/Household/layout.html.twig          |   4 +
 .../views/Household/summary.html.twig         | 308 ++++++++++--------
 .../translations/messages+intl-icu.fr.yaml    |   5 +-
 7 files changed, 210 insertions(+), 141 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 1e2bf713f..ce406286b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -192,3 +192,9 @@
         {% endif %}
     {% endfor %}
 {% endblock %}
+
+{% block comment_widget %}
+    {% for entry in form %}
+        {{ form_widget(entry) }}
+    {% endfor %}
+{% endblock comment_widget %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index f3759aef7..071d0f9a5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -185,6 +185,29 @@ div.banner {
     }
 }
 
+div.household-resume {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    div.col-address {
+        font-size: 120%;
+        padding-left: 1em;
+
+    }
+    div.col-comment {
+        //padding: 0;
+        margin-bottom: 1rem;
+        display: flex;
+        flex-direction: column;
+        > * > * {
+            & >  .chill-user-quote {
+                margin: 1.5em -1.67em 0;
+            }
+        }
+    }
+}
+
 /*
 *  BADGES, MARKS, PINS
 *  for chill person theme
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
index 8038257d6..e235aae15 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -9,6 +9,9 @@
     * modalTitle    twig translated chain
     * buttonText    twig translated chain
     * buttonSize    bootstrap class like 'btn-sm'
+    * buttonDisplayText     bool
+    * binModalStep1         bool
+    * binModalStep2         bool
 
 #}
 <div id="address"></div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
index 25160ff5b..5b41a15e3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig
@@ -31,7 +31,7 @@
 
                             <li>
                                 <a  class="btn btn-sm btn-edit"
-                                    title="{{ 'household.Update membership'|trans }}"
+                                    title="{{ 'household.Edit member household'|trans }}"
                                     href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
                             </li>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
index d97de654f..0bd208e7a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
@@ -17,4 +17,8 @@
         'layout': '@ChillPerson/menu.html.twig',
         'args' : { 'household': household }
     }) }}
+
+    {% block block_post_menu %}
+    {% endblock %}
+
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 1568b6bed..9b553f0f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -2,163 +2,195 @@
 
 {% block title 'household.Household summary'|trans %}
 
+{% block block_post_menu %}
+    <div class="block-post-menu"></div>
+{% endblock %}
+
 {% block content %}
 <div class="household-summary">
 
-<h1>{{ block('title') }}</h1>
+    {#
+    <h1>{{ block('title') }}</h1>
+    <h2>{{ 'household.Current address'|trans }}</h2>
+     #}
 
-<h2>{{ 'household.Current address'|trans }}</h2>
+    {% set address = household.currentAddress %}
 
-{% set address = household.currentAddress %}
-
-{% if address is empty %}
-    <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
-{% else %}
-    <div class="flex-table">
-        <div class="item-bloc">
-          {{ address|chill_entity_render_box({'multiline': true}) }}
-        </div>
-    </div>
-{% endif %}
-
-<h2>{{ 'household.Household members'|trans }}</h2>
-
-{% if form is not null %}
-  {{ form_start(form) }}
-
-  {{ form_row(form.commentMembers) }}
-
-  <div id="waitingForBirthContainer">
-  {{ form_row(form.waitingForBirth) }}
-  </div>
-
-  <div id="waitingForBirthDateContainer">
-  {{ form_row(form.waitingForBirthDate) }}
-  </div>
-
-  <ul class="record_actions">
-    <li>
-      <button type="submit" class="btn btn-save">
-        {{ 'Save'|trans }}
-      </button>
-    </li>
-  </ul>
-
-  {{ form_end(form) }}
-{% else %}
-
-  {% if not household.commentMembers.isEmpty() %}
-      {{ household.commentMembers|chill_entity_render_box }}
-  {% endif %}
-
-  {% if household.waitingForBirth %}
-    {% if household.waitingForBirthDate is not null %}
-        {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
+    {% if address is empty %}
+        <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
     {% else %}
-        {{ 'household.Expecting for birth'|trans }}
+        <div class="row household-resume">
+
+            <div class="item-bloc col-5 col-address">
+
+                <h2>{{ 'Address'|trans }}</h2>
+
+                {{ address|chill_entity_render_box({'multiline': true}) }}
+
+                <ul class="list-inline text-right mt-2">
+                    <li class="list-inline-item">
+                        {# include vue_address component #}
+                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            mode: 'create',
+                            buttonSize: 'btn-sm',
+                            buttonText: 'Move household',
+                            modalTitle: 'Move household',
+                            buttonDisplayText: false
+                        } %}
+                    </li>
+                    <li class="list-inline-item">
+                        <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
+                           href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
+                            <i class="fa fa-list fa-fw"></i>
+                        </a>
+                    </li>
+                </ul>
+
+            </div>
+            <div class="item-bloc col-7 col-comment">
+                {% if form is null %}
+
+                    {% if household.waitingForBirth or not household.commentMembers.isEmpty() %}
+                        <div class="p-4 bg-light">
+                            {% if household.waitingForBirth %}
+                                <i class="fa fa-check-square-o pe-2"></i>
+                                {% if household.waitingForBirthDate is not null %}
+                                    {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
+                                {% else %}
+                                    {{ 'household.Expecting for birth'|trans }}
+                                {% endif %}
+                            {% endif %}
+
+                            {% if not household.commentMembers.isEmpty() %}
+                                {{ household.commentMembers|chill_entity_render_box }}
+                            {% endif %}
+                        </div>
+                    {% endif %}
+
+                    {% if not household.commentMembers.isEmpty() %}
+                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                           class="btn btn-edit btn-block">
+                            {{ 'household.Edit comment and expecting birth'|trans }}
+                        </a>
+                    {% else %}
+                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                           class="btn btn-create btn-block">
+                            {{ 'household.New comment and expecting birth'|trans }}
+                        </a>
+                    {% endif %}
+
+                {% else %}
+
+                    {{ form_start(form) }}
+                    <div id="waitingForBirthContainer">
+                        {{ form_widget(form.waitingForBirth) }}
+                    </div>
+                    <div id="waitingForBirthDateContainer">
+                        {{ form_widget(form.waitingForBirthDate) }}
+                    </div>
+                    <div class="mt-3">
+                        {{ form_widget(form.commentMembers) }}
+                    </div>
+                    <ul class="record_actions">
+                        <li>
+                            <button type="submit" class="btn btn-save">
+                                {{ 'Save'|trans }}
+                            </button>
+                        </li>
+                    </ul>
+                    {{ form_end(form) }}
+
+                {% endif %}
+
+            </div>
+        </div>
     {% endif %}
-  {% else %}
-    <p class="chill-no-data-statement">
-      {{ 'household.Any expecting birth'|trans }}
-    </p>
-  {% endif %}
 
-  <ul class="record_actions">
-    <li>
-      <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-        class="btn btn-edit">
-        {{ 'household.Comment and expecting birth'|trans }}
-      </a>
-    </li>
-  </ul>
+    <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>
 
-{% endif %}
+    {% for p in positions %}
+    <div class="mb-5">
+      <h3>{{ p.label|localize_translatable_string }}
+          {% if false == p.shareHousehold %}
+              <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
+                 title="{{ 'household.Those members does not share address'|trans }}"></i>
+          {% endif %}
+      </h3>
 
+      {%- set members = household.currentMembersByPosition(p) %}
 
-{% for p in positions %}
-<div class="mb-5">
-  <h3>{{ p.label|localize_translatable_string }}
-      {% if false == p.shareHousehold %}
-          <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
-             title="{{ 'household.Those members does not share address'|trans }}"></i>
+      {% macro customButtons(member, household) %}
+          <li>
+              <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
+                 class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}"></a>
+          </li>
+          <li>
+              <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
+                 class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
+          </li>
+      {% endmacro %}
+
+      {% if members|length > 0 %}
+        <div class="flex-table list-household-members">
+          {% for m in members %}
+              {% include '@ChillPerson/Household/_render_member.html.twig' with {
+                  'member': m,
+                  'customButtons': { 'after': _self.customButtons(m, household) }
+              } %}
+          {% endfor %}
+        </div>
+      {% else %}
+        <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
       {% endif %}
-  </h3>
 
-  {%- set members = household.currentMembersByPosition(p) %}
+      {% set members = household.nonCurrentMembersByPosition(p) %}
+      {% if members|length > 0 %}
 
-  {% macro customButtons(member, household) %}
-      <li>
-          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
-             class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}">
-              {{ 'household.Leave'|trans }}</a>
-      </li>
-      <li>
-          <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
-             class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
-      </li>
-  {% endmacro %}
-
-  {% if members|length > 0 %}
-    <div class="flex-table list-household-members">
-      {% for m in members %}
-          {% include '@ChillPerson/Household/_render_member.html.twig' with {
-              'member': m,
-              'customButtons': { 'after': _self.customButtons(m, household) }
-          } %}
-      {% endfor %}
-    </div>
-  {% else %}
-    <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
-  {% endif %}
-
-  {% set members = household.nonCurrentMembersByPosition(p) %}
-  {% if members|length > 0 %}
-
-    <style>
-        button[aria-expanded="true"] > span.folded,
-        button[aria-expanded="false"] > span.unfolded { display: none; }
-        button[aria-expanded="false"] > span.folded,
-        button[aria-expanded="true"] > span.unfolded { display: inline; }
-    </style>
-    <div class="accordion" id="nonCurrent">
-        <div class="accordion-item">
-            <h2 class="accordion-header" id="heading_{{ p.id }}">
-                <button
-                    class="accordion-button collapsed"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#collapse_{{ p.id }}"
-                    aria-expanded="false"
-                    aria-controls="collapse_{{ p.id }}">
-                    <span class="folded">{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}</span>
-                    <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
-                </button>
-            </h2>
-            <div id="collapse_{{ p.id }}"
-                class="accordion-collapse collapse"
-                aria-labelledby="heading_{{ p.id }}"
-                data-bs-parent="#nonCurrent">
-                <div class="flex-table my-0 list-household-members">
-                    {% for m in members %}
-                        {% include '@ChillPerson/Household/_render_member.html.twig' with { 'member': m } %}
-                    {% endfor %}
+        <style>
+            button[aria-expanded="true"] > span.folded,
+            button[aria-expanded="false"] > span.unfolded { display: none; }
+            button[aria-expanded="false"] > span.folded,
+            button[aria-expanded="true"] > span.unfolded { display: inline; }
+        </style>
+        <div class="accordion" id="nonCurrent">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_{{ p.id }}">
+                    <button
+                        class="accordion-button collapsed"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#collapse_{{ p.id }}"
+                        aria-expanded="false"
+                        aria-controls="collapse_{{ p.id }}">
+                        <span class="folded">{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}</span>
+                        <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
+                    </button>
+                </h2>
+                <div id="collapse_{{ p.id }}"
+                    class="accordion-collapse collapse"
+                    aria-labelledby="heading_{{ p.id }}"
+                    data-bs-parent="#nonCurrent">
+                    <div class="flex-table my-0 list-household-members">
+                        {% for m in members %}
+                            {% include '@ChillPerson/Household/_render_member.html.twig' with { 'member': m } %}
+                        {% endfor %}
+                    </div>
                 </div>
             </div>
         </div>
+      {% endif %}
+
     </div>
-  {% endif %}
+    {% endfor %}
 
-</div>
-{% endfor %}
-
-<ul class="record_actions">
-  <li>
-    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
-      class="btn btn-create">
-      {{ 'household.Add a member'|trans }}
-    </a>
-  </li>
-</ul>
+    <ul class="record_actions">
+      <li>
+        <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+          class="btn btn-create">
+          {{ 'household.Add a member'|trans }}
+        </a>
+      </li>
+    </ul>
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index f1362e7ae..cea908ccf 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -43,7 +43,7 @@ household:
     Current household members: Membres actuels
     Household summary: Résumé du ménage
     Accompanying period: Parcours d'accompagnement
-    Addresses: Adresses
+    Addresses: Historique adresse
     Current address: Adresse actuelle
     Household does not have any address currently: Le ménage n'a pas d'adresse renseignée actuellement
     Edit household members: Modifier l'appartenance au ménage
@@ -56,7 +56,8 @@ household:
     Expecting for birth on date: Naissance attendue pour le {date}
     Expecting for birth: Naissance attendue (date inconnue)
     Any expecting birth: Aucune naissance proche n'a été renseignée.
-    Comment and expecting birth: Mettre à jour le commentaire
+    New comment and expecting birth: Écrire un commentaire
+    Edit comment and expecting birth: Mettre à jour le commentaire
     Edit member metadata: Données supplémentaires
     comment_membership: Commentaire général sur les membres
     expecting_birth: Naissance attendue ?

From fa938471aa205a6efe117429c1af61fc453aa29e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Sep 2021 16:39:59 +0200
Subject: [PATCH 074/217] vue_accourse: move no-household warning above table

---
 .../components/PersonsAssociated.vue          | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index da1b4c4e6..f04674cef 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -9,6 +9,26 @@
       <label class="chill-no-data-statement">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
 
+   <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
+      <i class="fa fa-warning fa-2x"></i>
+      <div class="float-button bottom"><div class="box">
+         <div class="action">
+            <button class="btn btn-update">{{ $t('persons_associated.update_household') }}</button>
+         </div>
+         <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
+         <div class="form-check" v-for="p in participationWithoutHousehold">
+            <input type="checkbox"
+                   class="form-check-input"
+                   v-model="hasNoHousehold"
+                   :id="p.person.id"
+                   :value="p.person.id" />
+            <label class="form-check-label" for="hasNoHousehold">
+               {{ p.person.text }}
+            </label>
+         </div>
+      </div></div>
+   </div>
+
    <div class="flex-table mb-3">
       <participation-item
          v-for="participation in currentParticipations"
@@ -30,29 +50,6 @@
       </add-persons>
    </div>
 
-   <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
-      <i class="fa fa-warning fa-2x"></i>
-      <div class="float-button bottom"><div class="box">
-         <div class="action">
-            <button class="btn btn-update">{{ $t('persons_associated.update_household') }}</button>
-         </div>
-         <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
-         <div class="form-check" v-for="p in participationWithoutHousehold">
-            <input type="checkbox"
-                   class="form-check-input"
-                   v-model="hasNoHousehold"
-                   :id="p.person.id"
-                   :value="p.person.id" />
-            <label class="form-check-label" for="hasNoHousehold">
-               {{ p.person.text }}
-            </label>
-         </div>
-
-      </div></div>
-
-
-   </div>
-
 </div>
 </template>
 
@@ -118,7 +115,7 @@ export default {
 div#accompanying-course {
    div.vue-component {
       & > div.alert {
-         margin: 1em 0 0;
+         margin: 0 0 -1em;
       }
       div.no-household {
          display: flex;

From da9d81dc050f0a28dd84536ec6f0c20e0fbe9451 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 10 Sep 2021 17:18:43 +0200
Subject: [PATCH 075/217] vue_accourse: GET form submit for no_household
 persons

---
 .../components/PersonsAssociated.vue          | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index f04674cef..79a9df5a6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -11,22 +11,30 @@
 
    <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
       <i class="fa fa-warning fa-2x"></i>
-      <div class="float-button bottom"><div class="box">
-         <div class="action">
-            <button class="btn btn-update">{{ $t('persons_associated.update_household') }}</button>
-         </div>
-         <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
-         <div class="form-check" v-for="p in participationWithoutHousehold">
-            <input type="checkbox"
-                   class="form-check-input"
-                   v-model="hasNoHousehold"
-                   :id="p.person.id"
-                   :value="p.person.id" />
-            <label class="form-check-label" for="hasNoHousehold">
-               {{ p.person.text }}
-            </label>
-         </div>
-      </div></div>
+      <form method="GET" action="/fr/person/household/members/editor">
+         <div class="float-button bottom"><div class="box">
+            <div class="action">
+               <button class="btn btn-update" type="submit">{{ $t('persons_associated.update_household') }}</button>
+            </div>
+            <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
+            <div class="form-check" v-for="p in participationWithoutHousehold">
+               <input type="checkbox"
+                  class="form-check-input"
+                  v-model="hasNoHousehold"
+                  name="persons[]"
+                  checked="checked"
+                  :id="p.person.id"
+                  :value="p.person.id"
+               />
+               <label class="form-check-label" for="hasNoHousehold">
+                  {{ p.person.text }}
+               </label>
+            </div>
+            <input type="hidden" name="expand_suggestions" value="true">
+            <input type="hidden" name="returnPath" :value="getReturnPath">
+            <input type="hidden" name="accompanying_period_id" :value="courseId">
+         </div></div>
+      </form>
    </div>
 
    <div class="flex-table mb-3">
@@ -78,6 +86,7 @@ export default {
    },
    computed: {
       ...mapState({
+         courseId: state => state.accompanyingCourse.id,
          participations: state => state.accompanyingCourse.participations
       }),
       currentParticipations() {
@@ -88,6 +97,9 @@ export default {
       },
       participationWithoutHousehold() {
          return this.currentParticipations.filter(p => p.person.current_household_id === null);
+      },
+      getReturnPath() {
+         return window.location.pathname + window.location.search + window.location.hash;
       }
    },
    methods: {
@@ -118,6 +130,7 @@ div#accompanying-course {
          margin: 0 0 -1em;
       }
       div.no-household {
+         padding-bottom: 1.5em;
          display: flex;
          flex-direction: row;
          & > i {
@@ -125,7 +138,7 @@ div#accompanying-course {
             padding-top: 0.2em;
             opacity: 0.75;
          }
-         & > div {
+         & > form {
             flex-basis: auto;
             div.action {
                button.btn-update {

From 855686c0bad80d08886cdb593a1945fb87ca821f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Sep 2021 17:31:19 +0200
Subject: [PATCH 076/217] rdv: add content of calendar item in a modal

---
 .../ChillCalendarBundle/Entity/Calendar.php   |   5 +
 .../public/vuejs/MyCalendarRange/App.vue      |  94 ++++++-
 .../public/vuejs/MyCalendarRange/i18n.js      |   4 +-
 .../Resources/views/Calendar/list.html.twig   | 231 +++++++++---------
 4 files changed, 210 insertions(+), 124 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 0663ca08b..fbde03af2 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -37,12 +37,14 @@ class Calendar
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"calendar:read"})
      */
     private ?int $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
      */
     private User $user;
 
@@ -64,6 +66,7 @@ class Calendar
      *     cascade={"persist", "remove", "merge", "detach"})
      * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
      * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
      */
     private Collection $persons;
 
@@ -74,6 +77,7 @@ class Calendar
      *     cascade={"persist", "remove", "merge", "detach"})
      * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
      * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
      */
     private Collection $professionals;
 
@@ -89,6 +93,7 @@ class Calendar
 
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
+     * @Serializer\Groups({"calendar:read"})
      */
     private CommentEmbeddable $comment;
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 56d914b95..214b8d941 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -14,9 +14,9 @@
     <FullCalendar ref="fullCalendar" :options="calendarOptions">
       <template v-slot:eventContent='arg' >
         <span class='calendarRangeItems'>
-        <b>{{ arg.timeText }}</b>
+          <b>{{ arg.timeText }}</b>
           <i>&nbsp;{{ arg.event.title }}</i>
-          <a class="fa fa-fw fa-times"
+          <a v-if=!arg.event.extendedProps.myCalendar class="fa fa-fw fa-times"
             @click.prevent="onClickDelete(arg.event)">
           </a>
         </span>
@@ -70,6 +70,47 @@
       </div>
     </div>
   </div>
+
+  <teleport to="body">
+    <modal v-if="modal.showModal"
+      :modalDialogClass="modal.modalDialogClass"
+      @close="modal.showModal = false">
+
+        <template v-slot:header>
+          <h2 class="modal-title"> {{ this.myCalendarClickedEvent.start.toLocaleString() }} - {{ this.myCalendarClickedEvent.end.toLocaleString() }}</h2>
+        </template>
+
+        <template v-slot:body>
+          <p>{{ $t('by')}} {{this.myCalendarClickedEvent.user.username }}</p>
+          <p>{{ $t('main_user_concerned') }} : {{ this.myCalendarClickedEvent.mainUser.username }}</p>
+          <p v-if="myCalendarClickedEvent.comment.length > 0" >{{ this.myCalendarClickedEvent.comment }}</p>
+        </template>
+
+        <template v-slot:footer>
+          <ul class="record_actions">
+            <li>
+              <a
+                class="btn btn-show"
+                :href=myCalendarEventShowLink() >
+              </a>
+            </li>
+            <li>
+              <a
+                class="btn btn-update"
+                :href=myCalendarEventUpdateLink() >
+              </a>
+            </li>
+            <li>
+              <a
+                class="btn btn-delete"
+                :href=myCalendarEventDeleteLink() >
+              </a>
+            </li>
+          </ul>
+        </template>
+
+      </modal>
+   </teleport>
 </template>
 
 <script>
@@ -79,22 +120,29 @@ import FullCalendar from '@fullcalendar/vue3';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import timeGridPlugin from '@fullcalendar/timegrid';
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import { deleteCalendarRange, fetchCalendar, fetchCalendarRangesByUser, patchCalendarRange, postCalendarRange } from '../_api/api';
 import { mapState } from 'vuex';
 
 export default {
   name: "App",
   components: {
-    FullCalendar
+    FullCalendar,
+    Modal
   },
   data() {
     return {
       errorMsg: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-m"
+      },
       flag: {
         loading: false
       },
       userId: window.userId,
       showMyCalendar: true,
+      myCalendarClickedEvent: null,
       calendarEvents: {
          userCalendar: null,
          userCalendarRange: null,
@@ -116,6 +164,7 @@ export default {
         eventChange: this.onEventChange,
         eventDrop: this.onEventDropOrResize,
         eventResize: this.onEventDropOrResize,
+        eventClick: this.onEventClick,
         selectMirror: true,
         editable: true,
         weekends: false,
@@ -149,6 +198,18 @@ export default {
     init() {
       this.fetchData();
     },
+    openModal() {
+      this.modal.showModal = true;
+    },
+    myCalendarEventShowLink() {
+      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/show?user_id=${ this.userId }`
+    },
+    myCalendarEventUpdateLink() {
+      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/edit?user_id=${ this.userId }`
+    },
+    myCalendarEventDeleteLink() {
+      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/delete?user_id=${ this.userId }`
+    },
     resetCalendar() {
       this.fetchData();
       this.calendarEvents.new = {
@@ -179,8 +240,15 @@ export default {
         fetchCalendar(this.userId).then(calendar => new Promise((resolve, reject) => {
           let events = calendar.results.map(i =>
             ({
+              myCalendar: true,
+              calendarId: i.id,
               start: i.startDate.datetime,
               end: i.endDate.datetime,
+              user: i.user,
+              mainUser: i.mainUser,
+              persons: i.persons,
+              professionals: i.professionals,
+              comment: i.comment
             })
           );
           let calendarEventsCurrentUser = {
@@ -238,6 +306,26 @@ export default {
       payload.event.setProp('textColor', '#444444');
       this.$store.dispatch('updateRange', payload);
     },
+    onEventClick(payload) {
+      console.log(payload)
+      console.log(payload.event)
+      console.log(payload.event.extendedProps)
+
+      if (payload.event.extendedProps.myCalendar) {
+        this.myCalendarClickedEvent = {
+          id: payload.event.extendedProps.calendarId,
+          start: payload.event.start,
+          end: payload.event.end,
+          user: payload.event.extendedProps.user,
+          mainUser: payload.event.extendedProps.mainUser,
+          persons: payload.event.extendedProps.persons,
+          professionals: payload.event.extendedProps.professionals,
+          comment: payload.event.extendedProps.comment
+        };
+        console.log(this.myCalendarClickedEvent)
+        this.openModal();
+      }
+    },
     onClickSave(payload) {
       this.flag.loading = true;
       if (this.$store.state.newCalendarRanges.length > 0){
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
index 96eca1d6a..2305b307b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.js
@@ -10,7 +10,9 @@ const appMessages = {
       copy_range_how_to: "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
       new_range_to_save: "Nouvelles plages à enregistrer",
       update_range_to_save: "Plages à modifier",
-      delete_range_to_save: "Plages à supprimer"
+      delete_range_to_save: "Plages à supprimer",
+      by: "Par",
+      main_user_concerned: "Utilisateur concerné"
    }
 }
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 331544854..80aba0d0c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -16,139 +16,130 @@
 
 {% if context == 'user' %}
     <div id="myCalendar"></div>
-{% endif %}
-
-{% if context == 'user' %}
-    <h2 class="chill-red">{{ 'My calendar list' |trans }}</h2>
-{% endif %}
-
-{% if calendarItems|length == 0 %}
-    <p class="chill-no-data-statement">
-        {{ "There is no calendar items."|trans }}
-        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
-    </p>
 {% else %}
 
-<div class="flex-table list-records context-{{ context }}">
+    {% if calendarItems|length == 0 %}
+        <p class="chill-no-data-statement">
+            {{ "There is no calendar items."|trans }}
+            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
+        </p>
+    {% else %}
 
-    {% for calendar in calendarItems %}
+    <div class="flex-table list-records context-{{ context }}">
 
-        <div class="item-bloc">
-            <div class="item-row main">
-                <div class="item-col">
+        {% for calendar in calendarItems %}
+
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
 
 
-                    {% if calendar.startDate and calendar.endDate %}
-                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                            <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
-                            <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
-                        {% else %}
-                            <h3>{{ calendar.startDate|format_date('full') }} </h3>
-                            <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+                        {% if calendar.startDate and calendar.endDate %}
+                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                            {% else %}
+                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+
+                                <div class="duration">
+                                    <p>
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
+                                    </p>
+                                </div>
+                            {% endif %}
 
-                            <div class="duration">
-                                <p>
-                                    <i class="fa fa-fw fa-hourglass-end"></i>
-                                    {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
-                                </p>
-                            </div>
                         {% endif %}
 
+                        
+                    </div>
+                    <div class="item-col">
+                        <ul class="list-content">
+                            {% if calendar.user %}
+                            <li>
+                                <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+                            {% if calendar.mainUser is not empty %}
+                            <li>
+                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+
+                            <li>
+                                {%- if calendar.comment.isEmpty -%}
+                                    <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
+                                {%- else -%}
+                                    {{ calendar.comment|chill_entity_render_box }}
+                                {%- endif -%}
+                            </li>
+
+
+                        </ul>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                            </li>
+                            {# TOOD
+                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                            </li>
+                            {# TOOD
+                            {% endif %}
+                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                            </li>
+                            {#
+                            {% endif %}
+                            #}
+                        </ul>
+                    </div>
+                </div>
+
+                {%
+                    if calendar.comment.comment is not empty
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0
+                %}
+                <div class="item-row details">
+                    <div class="item-col">
+
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
+                    </div>
+
+                    {% if calendar.comment.comment is not empty %}
+                    <div class="item-col comment">
+                        {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                    </div>
                     {% endif %}
-
-                    {% if context == 'user' and calendar.accompanyingPeriod is not empty %}
-                        <a class="btn btn-sm btn-outline-primary"
-                            title="{{ 'Period number %number%'|trans({'%number%': calendar.accompanyingPeriod.id}) }}"
-                            href="{{ chill_path_add_return_path(
-                                "chill_user_accompanying_course_index",
-                                { 'accompanying_period_id': calendar.accompanyingPeriod.id }
-                            ) }}"><i class="fa fa-random"></i>
-                        </a>
-                    {% endif %}
-
-                    
-                </div>
-                <div class="item-col">
-                    <ul class="list-content">
-                        {% if calendar.user %}
-                        <li>
-                            <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-
-                        {% if calendar.mainUser is not empty %}
-                        <li>
-                            <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-
-
-                        <li>
-                            {%- if calendar.comment.isEmpty -%}
-                                <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
-                            {%- else -%}
-                                {{ calendar.comment|chill_entity_render_box }}
-                            {%- endif -%}
-                        </li>
-
-
-                    </ul>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                        </li>
-                        {# TOOD
-                        {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                        </li>
-                        {# TOOD
-                        {% endif %}
-                        {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                        </li>
-                        {#
-                        {% endif %}
-                        #}
-                    </ul>
-                </div>
-            </div>
-
-            {%
-                if calendar.comment.comment is not empty
-                or calendar.users|length > 0
-                or calendar.thirdParties|length > 0
-                or calendar.users|length > 0
-            %}
-            <div class="item-row details">
-                <div class="item-col">
-
-                    {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
-                </div>
-
-                {% if calendar.comment.comment is not empty %}
-                <div class="item-col comment">
-                    {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                 </div>
                 {% endif %}
+
             </div>
-            {% endif %}
+        {% endfor %}
+    </div>
+    {% endif %}
+
+    {% if context != 'user' %}
+    {# TODO set this condition in configuration #}
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
+                {{ 'Add a new calendar' | trans }}
+            </a>
+        </li>
+    </ul>
+    {% endif %}
+
+
 
-        </div>
-    {% endfor %}
-</div>
 {% endif %}
 
-{% if context != 'user' %}
-{# TODO set this condition in configuration #}
-  <ul class="record_actions">
-      <li>
-          <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-              {{ 'Add a new calendar' | trans }}
-          </a>
-      </li>
-  </ul>
-{% endif %}

From 5dc430ed31d7aaa4534b9e982795534acaa5c2f3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Sep 2021 22:00:24 +0200
Subject: [PATCH 077/217] rdv: various UI improvements on my calendar

---
 .../public/vuejs/MyCalendarRange/App.vue      | 64 +++++++++++--------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 214b8d941..118ac51e8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -14,7 +14,9 @@
     <FullCalendar ref="fullCalendar" :options="calendarOptions">
       <template v-slot:eventContent='arg' >
         <span class='calendarRangeItems'>
-          <b>{{ arg.timeText }}</b>
+          <b v-if="arg.event.extendedProps.myCalendar" style="text-decoration: underline" >{{ arg.timeText }}</b>
+          <b v-else-if="!arg.event.extendedProps.myCalendar && arg.event.extendedProps.toDelete" style="text-decoration: line-through red" >{{ arg.timeText }}</b>
+          <b v-else >{{ arg.timeText }}</b>
           <i>&nbsp;{{ arg.event.title }}</i>
           <a v-if=!arg.event.extendedProps.myCalendar class="fa fa-fw fa-times"
             @click.prevent="onClickDelete(arg.event)">
@@ -23,24 +25,31 @@
       </template>
     </FullCalendar>
     <div>
-      <button class="btn btn-save" :disabled="!dirty"
-        @click.prevent="onClickSave">
-        {{ $t('action.save')}}
-      </button>
-      <span v-if="flag.loading" class="loading">
-        <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
-        <span class="sr-only">{{ $t('loading') }}</span>
-      </span>
+      <ul class="record_actions">
+        <li>
+          <button class="btn btn-save" :disabled="!dirty"
+            @click.prevent="onClickSave">
+            {{ $t('action.save')}}
+          </button>
+          <span v-if="flag.loading" class="loading">
+            <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+            <span class="sr-only">{{ $t('loading') }}</span>
+          </span>
+        </li>
+        <li>
+          <button v-if="disableCopyDayButton" class="btn btn-action" disabled>
+            {{ $t('copy_range_to_next_day')}}
+          </button>
+          <button v-else class="btn btn-action"
+            @click.prevent="copyDay">
+            {{ $t('copy_range_from_day')}} {{this.lastNewDate.toLocaleDateString()}} {{ $t('to_the_next_day')}}
+          </button>
+        </li>
+      </ul>
     </div>
     <div>
-      <button v-if="disableCopyDayButton" class="btn btn-action" disabled>
-        {{ $t('copy_range_to_next_day')}}
-      </button>
-      <button v-if="!disableCopyDayButton" class="btn btn-action" 
-        @click.prevent="copyDay">
-        {{ $t('copy_range_from_day')}} {{this.lastNewDate.toLocaleDateString()}} {{ $t('to_the_next_day')}}
-      </button>
       <p>{{ $t('copy_range_how_to')}}</p>
+
     </div>
 
     <div>
@@ -77,7 +86,7 @@
       @close="modal.showModal = false">
 
         <template v-slot:header>
-          <h2 class="modal-title"> {{ this.myCalendarClickedEvent.start.toLocaleString() }} - {{ this.myCalendarClickedEvent.end.toLocaleString() }}</h2>
+          <h2 class="modal-title">{{ this.renderEventDate() }}</h2>
         </template>
 
         <template v-slot:body>
@@ -165,7 +174,7 @@ export default {
         eventDrop: this.onEventDropOrResize,
         eventResize: this.onEventDropOrResize,
         eventClick: this.onEventClick,
-        selectMirror: true,
+        selectMirror: false,
         editable: true,
         weekends: false,
         headerToolbar: {
@@ -226,7 +235,7 @@ export default {
             start: i.startDate.datetime,
             end: i.endDate.datetime,
             calendarRangeId: i.id,
-            toDelete: 0
+            toDelete: false
           })
         );
         let calendarRangeEvents = {
@@ -307,10 +316,6 @@ export default {
       this.$store.dispatch('updateRange', payload);
     },
     onEventClick(payload) {
-      console.log(payload)
-      console.log(payload.event)
-      console.log(payload.event.extendedProps)
-
       if (payload.event.extendedProps.myCalendar) {
         this.myCalendarClickedEvent = {
           id: payload.event.extendedProps.calendarId,
@@ -369,12 +374,12 @@ export default {
     },
     onClickDelete(payload) {
       if (payload.extendedProps.hasOwnProperty("calendarRangeId")) {
-        if (payload.extendedProps.toDelete === 1) {
-          payload.setExtendedProp('toDelete', 0)
+        if (payload.extendedProps.toDelete) {
+          payload.setExtendedProp('toDelete', false)
           payload.setProp('borderColor', '#79bafc');
           this.$store.dispatch('removeFromDeleteRange', payload);
         } else {
-          payload.setExtendedProp('toDelete', 1)
+          payload.setExtendedProp('toDelete', true)
           payload.setProp('borderColor', '#dddddd');
           this.$store.dispatch('deleteRange', payload);
         }
@@ -448,6 +453,13 @@ export default {
       } else {
         console.log('no new events to copy-paste!')
       }
+    },
+    renderEventDate() {
+      let start = this.myCalendarClickedEvent.start;
+      let end = this.myCalendarClickedEvent.end;
+      return start.getDate() === end.getDate() ?
+          `${start.toLocaleDateString()}, ${start.toLocaleTimeString()} - ${end.toLocaleTimeString()}` :
+          `${start.toLocaleString()} - ${end.toLocaleString()}`;
     }
   },
   mounted() {

From 503c97d8c67e62d4d72ca7d613b9c3a8064eb094 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 13 Sep 2021 10:01:52 +0200
Subject: [PATCH 078/217] rdv: remove duplicate comment in rdv list

---
 .../Resources/views/Calendar/list.html.twig            | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 80aba0d0c..44295e192 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -68,16 +68,6 @@
                             </li>
                             {% endif %}
 
-
-                            <li>
-                                {%- if calendar.comment.isEmpty -%}
-                                    <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
-                                {%- else -%}
-                                    {{ calendar.comment|chill_entity_render_box }}
-                                {%- endif -%}
-                            </li>
-
-
                         </ul>
                         <ul class="record_actions">
                             <li>

From 672133fb5eba7217be30532cc6aed8c1e2f1339d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 10:48:38 +0200
Subject: [PATCH 079/217] repair banner in vue_household_members_editor
 component

---
 .../Resources/views/Household/members_editor.html.twig         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
index a65867fb9..301054666 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
@@ -22,5 +22,6 @@
 {% endblock %}
 
 {% block css %}
-  {{ encore_entry_link_tags('vue_household_members_editor') }}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_household_members_editor') }}
 {% endblock %}

From 6ab0007f02160ca74a73258290b8dc94efae5e72 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 11:10:02 +0200
Subject: [PATCH 080/217] fix: person-render-box need props options

---
 .../Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue | 2 +-
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue   | 2 +-
 .../vuejs/HouseholdMembersEditor/components/Concerned.vue       | 2 +-
 .../vuejs/HouseholdMembersEditor/components/MemberDetails.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 2623509a7..b6333b426 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -35,7 +35,7 @@
         <ul>
           <li v-for="p in personsReachables" :key="p.id">
             <input type="checkbox" :value="p.id" v-model="personsPicked">
-            <person-render-box render="badge" :person="p"></person-render-box>
+            <person-render-box render="badge" :options="{}" :person="p"></person-render-box>
           </li>
         </ul>
       </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 8162faddf..c99685680 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,7 @@
          <ul>
             <li v-for="p in personsReachables" :key="p.id">
                <input v-model="personsPicked" :value="p.id" type="checkbox">
-               <person-render-box render="badge" :person="p"></person-render-box>
+               <person-render-box render="badge" :options="{}" :person="p"></person-render-box>
             </li>
          </ul>
       </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index 5ae594c8d..b8ca3be30 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -25,7 +25,7 @@
         <div class="item-row">
           <div class="item-col">
             <div>
-              <person-render-box render="badge" :person="conc.person"></person-render-box>
+              <person-render-box render="badge" :options="{}" :person="conc.person"></person-render-box>
             </div>
             <div v-if="conc.person.birthdate !== null">
               {{ $t('person.born', {'gender': conc.person.gender} ) }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index 99f92aaf1..687fc7b9f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -3,7 +3,7 @@
     <div class="item-row">
       <div class="item-col">
         <div>
-          <person-render-box render="badge" :person="conc.person"></person-render-box>
+          <person-render-box render="badge" :options="{}" :person="conc.person"></person-render-box>
           <span v-if="isHolder" class="badge bg-primary holder">
             {{ $t('household_members_editor.holder') }}
           </span>

From c82efc4fd5092a33f221c765f7c7f3002214aa06 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 13 Sep 2021 11:58:48 +0200
Subject: [PATCH 081/217] rdv MR review: change name of routes + others
 modifications

---
 .../Controller/CalendarController.php         | 34 +++++++++----------
 .../ChillCalendarBundle/Entity/Calendar.php   | 10 +++---
 .../Entity/CalendarRange.php                  |  6 ++--
 .../Menu/AccompanyingCourseMenuBuilder.php    |  2 +-
 .../public/vuejs/MyCalendarRange/App.vue      |  6 ++--
 ...nfirm_deleteByAccompanyingCourse.html.twig |  6 ++--
 .../Calendar/confirm_deleteByUser.html.twig   |  4 +--
 .../Resources/views/Calendar/edit.html.twig   |  4 +--
 .../Resources/views/Calendar/new.html.twig    |  4 +--
 .../Resources/views/Calendar/show.html.twig   |  2 +-
 .../ChillTaskBundle/Menu/UserMenuBuilder.php  |  2 +-
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 6e8dc624c..fff20940a 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -69,7 +69,7 @@ class CalendarController extends AbstractController
 
     /**
      * Lists all Calendar entities.
-     * @Route("/{_locale}/calendar/", name="chill_calendar_calendar")
+     * @Route("/{_locale}/calendar/calendar/", name="chill_calendar_calendar_list")
      */
     public function listAction(Request $request): Response
     {
@@ -83,14 +83,14 @@ class CalendarController extends AbstractController
             $calendarItems = $em->getRepository(Calendar::class)
                 ->findByUser($user)
                 ;
-            $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig';
+            $view = '@ChillCalendar/Calendar/listByUser.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $calendarItems = $em->getRepository(Calendar::class)->findBy(
                 ['accompanyingPeriod' => $accompanyingPeriod],
                 ['startDate' => 'DESC']
             );
 
-            $view = 'ChillCalendarBundle:Calendar:listByAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig';
         }
 
         return $this->render($view, [
@@ -102,7 +102,7 @@ class CalendarController extends AbstractController
 
     /**
      * Create a new calendar item
-     * @Route("/{_locale}/calendar/new", name="chill_calendar_calendar_new")
+     * @Route("/{_locale}/calendar/calendar/new", name="chill_calendar_calendar_new")
      */
     public function newAction(Request $request): Response
     {
@@ -111,10 +111,10 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:newAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/newAccompanyingCourse.html.twig';
         } 
         // elseif ($user instanceof User) {
-        //     $view = 'ChillCalendarBundle:Calendar:newUser.html.twig';
+        //     $view = '@ChillCalendar/Calendar/newUser.html.twig';
         // }
 
         $entity = new Calendar();
@@ -141,7 +141,7 @@ class CalendarController extends AbstractController
 
             $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
 
-            return $this->redirectToRoute('chill_calendar_calendar', $params);
+            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
         } elseif ($form->isSubmitted() and !$form->isValid()) {
             $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
         }
@@ -164,7 +164,7 @@ class CalendarController extends AbstractController
 
     /**
      * Show a calendar item
-     * @Route("/{_locale}/calendar/{id}/show", name="chill_calendar_calendar_show")
+     * @Route("/{_locale}/calendar/calendar/{id}/show", name="chill_calendar_calendar_show")
      */
     public function showAction(Request $request, $id): Response
     {
@@ -173,10 +173,10 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:showByAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/showByAccompanyingCourse.html.twig';
         } 
         elseif ($user instanceof User) {
-            $view = 'ChillCalendarBundle:Calendar:showByUser.html.twig';
+            $view = '@ChillCalendar/Calendar/showByUser.html.twig';
         }
 
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
@@ -208,7 +208,7 @@ class CalendarController extends AbstractController
 
      /**
      * Edit a calendar item
-     * @Route("/{_locale}/calendar/{id}/edit", name="chill_calendar_calendar_edit")
+     * @Route("/{_locale}/calendar/calendar/{id}/edit", name="chill_calendar_calendar_edit")
      */
     public function editAction($id, Request $request): Response
     {
@@ -217,10 +217,10 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:editByAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/editByAccompanyingCourse.html.twig';
         }
          elseif ($user instanceof User) {
-            $view = 'ChillCalendarBundle:Calendar:editByUser.html.twig';
+            $view = '@ChillCalendar/Calendar/editByUser.html.twig';
         }
 
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
@@ -240,7 +240,7 @@ class CalendarController extends AbstractController
             $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
 
             $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-            return $this->redirectToRoute('chill_calendar_calendar', $params);
+            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
         } elseif ($form->isSubmitted() and !$form->isValid()) {
             $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
         }
@@ -274,10 +274,10 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:confirm_deleteByAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/confirm_deleteByAccompanyingCourse.html.twig';
         } 
         elseif ($user instanceof User) {
-            $view = 'ChillCalendarBundle:Calendar:confirm_deleteByUser.html.twig';
+            $view = '@ChillCalendar/Calendar/confirm_deleteByUser.html.twig';
         }
 
         /* @var $entity Calendar */
@@ -306,7 +306,7 @@ class CalendarController extends AbstractController
                       ->trans("The calendar item has been successfully removed."));
 
                 $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-                return $this->redirectToRoute('chill_calendar_calendar', $params);
+                return $this->redirectToRoute('chill_calendar_calendar_list', $params);
             }
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index fbde03af2..b3e5971bd 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -46,7 +46,7 @@ class Calendar
      * @Groups({"read"})
      * @Serializer\Groups({"calendar:read"})
      */
-    private User $user;
+    private ?User $user = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
@@ -101,20 +101,20 @@ class Calendar
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
      */
-    private \DateTimeImmutable $startDate;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
      */
-    private \DateTimeImmutable $endDate;
+    private ?\DateTimeImmutable $endDate = null;
 
     //TODO Lieu
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private string $status;
+    private ?string $status = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="CancelReason")
@@ -129,7 +129,7 @@ class Calendar
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
      */
-    private Activity $activity;
+    private ?Activity $activity = null;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index b83684a7c..312e4bb41 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -27,19 +27,19 @@ class CalendarRange
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @groups({"read", "write"})
      */
-    private User $user;
+    private ?User $user = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @groups({"read", "write"})
      */
-    private \DateTimeImmutable $startDate;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @groups({"read", "write"})
      */
-    private \DateTimeImmutable $endDate;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\OneToMany(targetEntity=Calendar::class,
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
index 2e06d9d2e..244d7db78 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -37,7 +37,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 
         if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
             $menu->addChild($this->translator->trans('Calendar'), [
-                'route' => 'chill_calendar_calendar',
+                'route' => 'chill_calendar_calendar_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
                 ]])
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 118ac51e8..329f8a0f6 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -211,13 +211,13 @@ export default {
       this.modal.showModal = true;
     },
     myCalendarEventShowLink() {
-      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/show?user_id=${ this.userId }`
+      return `/fr/calendar/calendar/${this.myCalendarClickedEvent.id}/show?user_id=${ this.userId }`
     },
     myCalendarEventUpdateLink() {
-      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/edit?user_id=${ this.userId }`
+      return `/fr/calendar/calendar/${this.myCalendarClickedEvent.id}/edit?user_id=${ this.userId }`
     },
     myCalendarEventDeleteLink() {
-      return `/fr/calendar/ ${this.myCalendarClickedEvent.id}/delete?user_id=${ this.userId }`
+      return `/fr/calendar/calendar/${this.myCalendarClickedEvent.id}/delete?user_id=${ this.userId }`
     },
     resetCalendar() {
       this.fetchData();
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig
index d957293b2..26818bb6c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByAccompanyingCourse.html.twig
@@ -1,6 +1,6 @@
 {% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
 
-{% set activeRouteKey = 'chill_calendar_calendar' %}
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
 
 {% block title  'Remove calendar item'|trans %}
 
@@ -9,8 +9,8 @@
         {
             'title'             : 'Remove calendar item'|trans,
             'confirm_question'  : 'Are you sure you want to remove the calendar item?'|trans,
-            'cancel_route'      : 'chill_calendar_calendar',
-            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : calendar.id },
+            'cancel_route'      : 'chill_calendar_calendar_list',
+            'cancel_parameters' : { 'accompanying_period_id' : accompanyingCourse.id, 'id' : calendar.id },
             'form'              : delete_form
         } ) }}
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
index 4f1ad45e5..6617f1da4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteByUser.html.twig
@@ -2,7 +2,7 @@
 
 {% set user = calendar.user %}
 
-{% set activeRouteKey = 'chill_calendar_calendar' %}
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
 
 {% block title  'Remove activity'|trans %}
 
@@ -11,7 +11,7 @@
     {
         'title'             : 'Remove calendar item'|trans,
         'confirm_question'  : 'Are you sure you want to remove the calendar item?'|trans,
-        'cancel_route'      : 'chill_calendar_calendar',
+        'cancel_route'      : 'chill_calendar_calendar_list',
         'cancel_parameters' : { 'user_id' : calendar.user.id, 'id' : calendar.id },
         'form'              : delete_form
     } ) }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index f47727b9c..c4b33e82e 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -59,9 +59,9 @@
     <a 
       class="btn btn-cancel"
       {%- if context == 'user' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'user_id': user.id } )}}"
+      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'user_id': user.id } )}}"
       {%- elseif context == 'accompanyingCourse' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
       {%- endif -%}
       >
       {{ 'Cancel'|trans|chill_return_path_label }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 1bbdc53ca..5d65a049d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -51,9 +51,9 @@
     <a 
       class="btn btn-cancel"
       {%- if context == 'person' -%} 
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'person_id': person.id } )}}"
+      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
       {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
       {%- endif -%}
       >
       {{ 'Cancel'|trans|chill_return_path_label }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index d450d2ab8..971abe67d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -65,7 +65,7 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar', { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar_list', { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index f4dc4391e..632961953 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -116,7 +116,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
             ]);
 
         $menu->addChild("My calendar list", [
-                'route' => 'chill_calendar_calendar',
+                'route' => 'chill_calendar_calendar_list',
                 'routeParameters' => [
                     'user_id' => $user->getId(),
                 ]

From 75aa600a201c04cdbf39750552e0e9adcd13b3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Sep 2021 12:41:55 +0200
Subject: [PATCH 082/217] fix composer.json and upgrade base app

---
 composer.json | 3 ++-
 tests/app     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 88e3c520a..04ff52e3d 100644
--- a/composer.json
+++ b/composer.json
@@ -95,6 +95,7 @@
         }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "vendor-dir": "tests/app/vendor"
     }
 }
diff --git a/tests/app b/tests/app
index 8839b431f..bd95d3c96 160000
--- a/tests/app
+++ b/tests/app
@@ -1 +1 @@
-Subproject commit 8839b431f296733b792c788f2ef58e5ecd6419d3
+Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01

From 98729af065ad61fa60cf4b0bdebad1eaffa138b9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 12:46:26 +0200
Subject: [PATCH 083/217] vue_household_members_editor: fix store error with
 dispatch

---
 .../public/vuejs/HouseholdMembersEditor/store/index.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index dc4f9812e..f66e68514 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -327,7 +327,7 @@ const store = createStore({
       commit('forceLeaveWithoutHousehold');
       dispatch('computeWarnings');
     },
-    selectHousehold({ commit }, h) {
+    selectHousehold({ commit, dispatch }, h) {
       commit('selectHousehold', h);
       dispatch('computeWarnings');
     },

From ed31dc3157fb245880e6903ef92a6ad416cc961b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Sep 2021 13:13:17 +0200
Subject: [PATCH 084/217] enable test for calendar

---
 phpunit.xml.dist                              |  5 +-
 .../Controller/CalendarControllerTest.php     | 59 +++++++++++--------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 25c5f0ff0..96f7461eb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> 
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
 
@@ -31,6 +31,9 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
+        <testsuite name="CalendarBundle">
+            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+        </testsuite>
     </testsuites>
 
     <listeners>
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
index c94238a51..00fca668a 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -2,65 +2,72 @@
 
 namespace Chill\CalendarBundle\Tests\Controller;
 
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 class CalendarControllerTest extends WebTestCase
 {
-    
-    /**
-     * Setup before the first test of this class (see phpunit doc)
-     */
-    public static function setUpBeforeClass()
-    {
-        static::bootKernel();
-    }
 
     /**
      * Setup before each test method (see phpunit doc)
      */
     public function setUp()
     {
+        static::bootKernel();
         $this->client = static::createClient(array(), array(
            'PHP_AUTH_USER' => 'center a_social',
            'PHP_AUTH_PW'   => 'password',
         ));
     }
-    
-    private function getAccompanyingPeriodFromFixtures(): AccompanyingPeriod
+
+    public function provideAccompanyingPeriod(): iterable
     {
-        $em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
+        static::bootKernel();
+        $em= static::$container->get(EntityManagerInterface::class);
 
-        $accompanying_period = $em->getRepository('ChillPersonBundle:AccompanyingPeriod')->find(1);
+        $nb = $em->createQueryBuilder()
+            ->from(AccompanyingPeriod::class, 'ac')
+            ->select('COUNT(ac) AS nb')
+            ->getQuery()
+            ->getSingleScalarResult()
+            ;
 
-        if ($accompanying_period === NULL) {
-            throw new \RuntimeException("We need an accompanying course with id = 1. Did you add fixtures ?");
-        }
-
-        return $accompanying_period;
+        yield [ $em->createQueryBuilder()
+            ->from(AccompanyingPeriod::class, 'ac')
+            ->select('ac.id')
+            ->setFirstResult(\random_int(0, $nb))
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ];
     }
 
-    public function testList()
+    /**
+     * @dataProvider provideAccompanyingPeriod
+     */
+    public function testList(int $accompanyingPeriodId)
     {
         $this->client->request(
-            Request::METHOD_GET, 
-            sprintf('/fr/calendar/?accompanying_period_id=%d', $this->getAccompanyingPeriodFromFixtures()->getId())
+            Request::METHOD_GET,
+            sprintf('/fr/calendar/calendar/?accompanying_period_id=%d', $accompanyingPeriodId)
         );
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
     }
 
-
-    public function testNew()
+    /**
+     * @dataProvider provideAccompanyingPeriod
+     */
+    public function testNew(int $accompanyingPeriodId)
     {
         $this->client->request(
-            Request::METHOD_GET, 
-            sprintf('/fr/calendar/new?accompanying_period_id=%d', $this->getAccompanyingPeriodFromFixtures()->getId())
+            Request::METHOD_GET,
+            sprintf('/fr/calendar/calendar/new?accompanying_period_id=%d', $accompanyingPeriodId)
         );
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
     }
-
 }

From 337a6eb974b8beb11f3c37ba5585ef5aa6851b3f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 13:29:37 +0200
Subject: [PATCH 085/217] vue_household_members_editor: toggle suggestion
 button out of conditionnal record_actions

---
 .../components/Household.vue                  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index ba77e2e18..f9c241dfe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -60,23 +60,6 @@
   </div>
 
   <ul v-if="allowChangeHousehold" class="record_actions">
-    <li v-if="!showHouseholdSuggestion" class="cancel">
-      <button
-        class="btn btn-misc"
-        @click="toggleHouseholdSuggestion"
-      ><i class="fa fa-fw fa-caret-right"></i>
-        {{ $tc('household_members_editor.show_household_suggestion',
-          countHouseholdSuggestion) }}
-      </button>
-    </li>
-    <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion" class="cancel">
-      <button
-        class="btn btn-misc"
-        @click="toggleHouseholdSuggestion"
-      ><i class="fa fa-fw fa-caret-down"></i>
-        {{ $t('household_members_editor.hide_household_suggestion') }}
-      </button>
-    </li>
     <li v-if="allowHouseholdCreate">
       <button class="btn btn-create" @click="createHousehold">
         {{ $t('household_members_editor.household.create_household') }}
@@ -99,6 +82,21 @@
     </li>
   </ul>
 
+  <ul class="record_actions">
+   <li v-if="!showHouseholdSuggestion" class="cancel">
+      <button class="btn btn-misc" @click="toggleHouseholdSuggestion">
+         <i class="fa fa-fw fa-caret-right"></i>
+         {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
+      </button>
+   </li>
+   <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion" class="cancel">
+      <button class="btn btn-misc" @click="toggleHouseholdSuggestion">
+         <i class="fa fa-fw fa-caret-down"></i>
+         {{ $t('household_members_editor.hide_household_suggestion') }}
+      </button>
+   </li>
+   </ul>
+
   <div class="householdSuggestions">
     <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
 
@@ -220,6 +218,7 @@ export default {
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
+      this.toggleHouseholdSuggestion();
     },
     removeHousehold() {
       this.$store.dispatch('removeHousehold');

From 813da1f9e022bbd73c383b005180a99b3cbd3ed5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 13 Sep 2021 13:43:39 +0200
Subject: [PATCH 086/217] rdv: reset calendar after all promises are done

---
 .../public/vuejs/MyCalendarRange/App.vue      | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
index 329f8a0f6..a30dd2000 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue
@@ -47,11 +47,6 @@
         </li>
       </ul>
     </div>
-    <div>
-      <p>{{ $t('copy_range_how_to')}}</p>
-
-    </div>
-
     <div>
       <div v-if="newCalendarRanges.length > 0">
         <h4>{{ $t('new_range_to_save') }}</h4>
@@ -334,7 +329,7 @@ export default {
     onClickSave(payload) {
       this.flag.loading = true;
       if (this.$store.state.newCalendarRanges.length > 0){
-        this.$store.state.newCalendarRanges.map(cr => {
+        Promise.all(this.$store.state.newCalendarRanges.map(cr => {
             postCalendarRange({
               user: {
                   type: 'user',
@@ -346,12 +341,14 @@ export default {
               endDate: {
                   datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
               },
-            }).then((_r) => this.resetCalendar());
-        });
+            })
+          })
+        ).then((_r) => this.resetCalendar());
+
         this.$store.dispatch('clearNewCalendarRanges', payload);
       }
       if (this.$store.state.updateCalendarRanges.length > 0){
-        this.$store.state.updateCalendarRanges.map(cr => {
+        Promise.all(this.$store.state.updateCalendarRanges.map(cr => {
             patchCalendarRange(cr.id,
               {
               startDate: {
@@ -360,14 +357,16 @@ export default {
               endDate: {
                   datetime: `${cr.end.toISOString().split('.')[0]}+0000`, // TODO check if OK with time zone
               },
-            }).then((_r) => this.resetCalendar());
-        })
+            })
+          })
+        ).then((_r) => this.resetCalendar());
         this.$store.dispatch('clearUpdateCalendarRanges', payload);
       }
       if (this.$store.state.deleteCalendarRanges.length > 0){
-        this.$store.state.deleteCalendarRanges.map(cr => {
-            deleteCalendarRange(cr.id).then((_r) => this.resetCalendar());;
-        })
+        Promise.all(this.$store.state.deleteCalendarRanges.map(cr => {
+            deleteCalendarRange(cr.id)
+          })
+        ).then((_r) => this.resetCalendar());
         this.$store.dispatch('clearDeleteCalendarRanges', payload);
       }
 

From 6680ba19ce95917b5b2deba7e54dd239a737eee3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 19 Aug 2021 09:51:51 +0200
Subject: [PATCH 087/217] final class changed for entity asideActivity + css
 fixed for record_action buttons

---
 .../src/Resources/views/asideActivityCategory/index.html.twig   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
index e9d5a0869..340dff474 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
@@ -23,7 +23,7 @@
                 {%- endif -%}
             </td>
                 <td>
-                <ul class="record_actions sticky-form-buttons">
+                <ul class="record_actions">
                     <li>
                         <a href="{{ path('chill_crud_aside_activity_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>

From eca00d155f0bc47df89be789d15d44d439cf059a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 24 Aug 2021 15:54:09 +0200
Subject: [PATCH 088/217] aside activities query added to filter by current
 user

---
 .../Controller/AsideActivityController.php    |  27 ++-
 .../src/Entity/AsideActivity.php              |   6 -
 .../src/Form/AsideActivityFormType.php        |   2 +-
 .../views/asideActivity/_delete.html.twig     |  55 +++---
 .../views/asideActivity/list.html.twig        | 183 +++++++++---------
 .../src/translations/messages.fr.yml          |   9 +-
 6 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index 55af4a6ab..a458a02b0 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -1,14 +1,29 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\Common\Collections\Criteria;
 
-
-/**
- * Class AsideActivityBundle
- */
-class AsideActivityController extends CRUDController
+final class AsideActivityController extends CRUDController
 {
-  
+    /**
+     * @param QueryBuilder $query
+     */
+    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query) {
+        
+        $usr = $this->getUser();
+        $id = $usr->getId();
+        $criteria = Criteria::create()->andWhere(Criteria::expr()->eq('agent', $id));
+
+        $query
+            ->addCriteria($criteria);
+    }
+
+    
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 92478d787..af4baa6d3 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -200,10 +200,4 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
 
         return $this;
     }
-
-    // public function __toString()
-    // {
-    //     // dump($this->type->getTitle());
-    //     return $this->type->getTitle();
-    // }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 2dcce3baa..ae4238d9a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -34,6 +34,7 @@ final class AsideActivityFormType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        dump($options);
         $timeChoices = [];
 
         foreach ($this->timeChoices as $e) {
@@ -108,7 +109,6 @@ final class AsideActivityFormType extends AbstractType
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
                     $data->add(new \DateInterval('PT'.$seconds.'S'));
-                    dump($data);
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
index fdbccb838..6871420aa 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
@@ -1,37 +1,28 @@
 <div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
-    {% block crud_content_header %}
-        <h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
-    {% endblock crud_content_header %}
+	{% block crud_content_header %}
+		<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
+	{% endblock crud_content_header %}
 
-    <p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</p>
+	<p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</p>
 
-    {{ form_start(form) }}
+	{{ form_start(form) }}
 
-    <ul class="record_actions">
-            {% block content_form_actions_back %}
-                <li class="cancel">
-                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
-                        {{ 'Cancel'|trans }}
-                    </a>
-                </li>
-            {% endblock %}
-            {% block content_form_actions_before %}{% endblock %}
-            {% block content_form_actions_view %}
-                {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
-                <li class="">
-                    <a class="btn btn-show" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}">
-                        {{ 'crud.edit.back_to_view'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            {% endblock %}
-            {% block content_form_actions_confirm_delete %}
-                <li>
-                    <button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
-                </li>
-            {% endblock content_form_actions_confirm_delete %}
-            {% block content_form_actions_after %}{% endblock %}
-    </ul>
+	<ul class="record_actions">
+		{% block content_form_actions_back %}
+			<li class="cancel">
+				<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+					{{ 'Cancel'|trans }}
+				</a>
+			</li>
+		{% endblock %}
+		{% block content_form_actions_before %}{% endblock %}
+		{% block content_form_actions_confirm_delete %}
+			<li>
+				<button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
+			</li>
+		{% endblock content_form_actions_confirm_delete %}
+		{% block content_form_actions_after %}{% endblock %}
+	</ul>
 
-    {{ form_end(form) }}
-</div>
\ No newline at end of file
+	{{ form_end(form) }}
+</div>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
index 4d2bb9110..8963d58f6 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
@@ -1,107 +1,106 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% block title %}{{ 'Aside activity list' |trans }}{% endblock title %}
+{% block title %}
+	{{ 'Aside activity list' |trans }}
+{% endblock title %}
 
 {% block content %}
-<div class="col-md-10 col-xxl asideactivity-list">
-<h2>{{ 'My aside activities' |trans }}</h2>
+	<div class="col-md-10 col-xxl asideactivity-list">
+		<h2>{{ 'My aside activities' |trans }}</h2>
 
-{% if entities|length == 0 %}
-    <p class="chill-no-data-statement">
-        {{ "There aren't any aside activities."|trans }}
-        <a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create button-small"></a>
-    </p>
-{% else %}
+		{% if entities|length == 0 %}
+			<p class="chill-no-data-statement">
+				{{ "There aren't any aside activities."|trans }}
+				<a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create button-small"></a>
+			</p>
+		{% else %}
 
-<div class="flex-table my-4 list-records">
-    {# Sort activities according to date in descending order #}
-    {% for entity in entities|sort ((a, b) => b.date <=> a.date) %}
-        {% set t = entity.type %}
+			<div
+				class="flex-table my-4 list-records">
+				{# Sort activities according to date in descending order #}
+				{% for entity in entities|sort ((a, b) => b.date <=> a.date) %}
+					{% set t = entity.type %}
 
-        {# only load aside activities of current user. #}
-        {% if entity.agent == app.user %}
+					<div class="item-bloc">
+						<div class="item-row main">
+							<div class="item-col">
 
-        <div class="item-bloc">
-            <div class="item-row main">
-                <div class="item-col">
+								<h3>
+									<b>{{ entity.type.title | localize_translatable_string }}</b>
+								</h3>
 
-                    <h3>
-                        <b>{{ entity.type.title | localize_translatable_string }}</b>
-                    </h3>
+								{% if entity.date %}
+									<p>{{ entity.date|format_date('long') }}</p>
+								{% endif %}
 
-                    {% if entity.date %}
-                        <p>{{ entity.date|format_date('long') }}</p>
-                    {% endif %}
+								<div class="duration">
+									<p>
+										<i class="fa fa-fw fa-hourglass-end"></i>
+										{{ entity.duration|date('H:i') }}
+									</p>
+								</div>
 
-                    <div class="duration">
-                            <p>
-                                <i class="fa fa-fw fa-hourglass-end"></i>
-                                {{ entity.duration|date('H:i') }}
-                            </p>
-                    </div>
+							</div>
+							<div class="item-col">
+								<ul class="list-content">
+									{% if entity.createdBy %}
+										<li>
+											<b>{{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }}</b>
+										</li>
+									{% endif %}
+								</ul>
+							</div>
+						</div>
 
-                </div>
-                <div class="item-col">
-                    <ul class="list-content">
-                        {% if entity.createdBy %}
-                        <li>
-                            <b>{{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-                    </ul>
-                </div>
-            </div>
+						{# {%
+												                if entity.note is not empty
+												                or entity.createdBy|length > 0
+												            %}
+												            <div class="item-row details">
+												                {% if entity.note is not empty %}
+												                <div class="item-col comment">
+												                    {{ entity.note|chill_markdown_to_html }}
+												                </div>
+												                {% endif %}
+												
+												            </div>
+												            {% endif %} #}
+						<div class="item-col">
+							<ul class="list-content">
+								<ul class="record_actions">
+									{# <li>
+																		                            <a href="{{ path('chill_crud_aside_activity_view', { 'id': entity.id} ) }}" class="btn btn-show "></a>
+																		                        </li> #}
+									{# TOOD
+																		                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+																		                        #}
+										<li><a href="{{ path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update "> </a>
+									</li>
+									{# TOOD
+																		                        {% endif %}
+																		                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
+																		                        #}
+									<li>
+										<a href="{{ path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete "></a>
+									</li>
+									{#
+																		                        {% endif %}
+																		                        #}
+								</ul>
+							</ul>
+						</div>
+					</div>
 
-            {# {%
-                if entity.note is not empty
-                or entity.createdBy|length > 0
-            %}
-            <div class="item-row details">
-                {% if entity.note is not empty %}
-                <div class="item-col comment">
-                    {{ entity.note|chill_markdown_to_html }}
-                </div>
-                {% endif %}
-
-            </div>
-            {% endif %} #}
-            <div class="item-col">
-                <ul class="list-content">
-                    <ul class="record_actions">
-                        {# <li>
-                            <a href="{{ path('chill_crud_aside_activity_view', { 'id': entity.id} ) }}" class="btn btn-show "></a>
-                        </li> #}
-                        {# TOOD
-                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update "></a>
-                        </li>
-                        {# TOOD
-                        {% endif %}
-                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete "></a>
-                        </li>
-                        {#
-                        {% endif %}
-                        #}
-                    </ul>
-                </ul>
-            </div>
-        </div>
-        {% endif %}
-    {% endfor %}
-</div>
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create">
-                {{ 'Add a new aside activity' | trans }}
-            </a>
-        </li>
-    </ul>
-</div>
-{% endif %}
+				{% endfor %}
+			</div>
+			<ul class="record_actions">
+				<li>
+					<a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create">
+						{{ 'Add a new aside activity' | trans }}
+					</a>
+				</li>
+			</ul>
+		</div>
+	{% endif %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index f01fd07fa..127268a1d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -1,9 +1,10 @@
 #general
 Show the aside activity: Voir l'activité annexe
 Edit the aside activity: Modifier l'activité annexe
+Remove aside activity: Supprimer l'activité annexe
 Aside activity: Activité annexe
 Duration time: Durée
-durationTime:  durée
+durationTime: durée
 user_username: nom de l'utilisateur
 Remark: Commentaire
 No comments: Aucun commentaire
@@ -25,7 +26,7 @@ Required: Obligatoire
 Persons: Personnes
 Users: Utilisateurs
 Emergency: Urgent
-by: 'Par '
+by: "Par "
 location: Lieu
 
 # Crud
@@ -75,8 +76,10 @@ My aside activities: Mes activités annexes
 Date: Date
 Created by: Creér par
 
-
 #Aside activity delete
 Delete aside activity: Supprimer une activité annexe
 Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité annexe qui concerne "%name%" ?
 The activity has been successfully removed.: L'activité a été supprimée.
+
+#Menu
+Create an aside activity: "Creér une activité annexe"

From a131510ea80df64c1ae889516f53945d96283861 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 24 Aug 2021 15:55:03 +0200
Subject: [PATCH 089/217] dataFixtures made but not tested

---
 .../src/DataFixtures/LoadAsideActivity.php    | 91 +++++++++++++++++++
 .../LoadAsideActivityCategory.php             | 53 +++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php

diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
new file mode 100644
index 000000000..04163119a
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Chill\ActivityBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Faker\Factory as FakerFactory;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\AsideActivityBundle\DataFixtures\LoadAsideActivityCategory;
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+
+/**
+ * Load reports into DB
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+{
+    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+    /**
+     * @var \Faker\Generator
+     */
+    private $faker;
+
+    public function __construct()
+    {
+        $this->faker = FakerFactory::create('fr_FR');
+    }
+
+    public function getOrder()
+    {
+        return 16400;
+    }
+
+    /**
+     * Return a random asideActivityCategory
+     *
+     * @return \Chill\AsideActivityBundle\Entity\AsideActivityCategory
+     */
+    private function getRandomAsideActivityCategory()
+    {
+        $catRef = LoadAsideActivityCategory::$references[array_rand(LoadAsideActivityCategory::$references)];
+        return $this->getReference($catRef);
+    }
+
+    /**
+     * Return a random user
+     *
+     * @return \Chill\MainBundle\Entity\User
+     */
+    private function getRandomUser()
+    {
+        $userRef = array_rand(LoadUsers::$refs);
+        return $this->getReference($userRef);
+    }
+
+    public function newRandomActivity()
+    {
+        $asideactivity = (new AsideActivity())
+            ->setAgent($this->getRandomUser())
+            ->setDate($this->faker->dateTimeThisYear())
+            ->setDuration($this->faker->dateTime(36000))
+            ->setType($this->getRandomAsideActivityCategory());
+
+        return $asideactivity;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $users = $this->container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:User')
+            ->findAll();
+
+        foreach($users as $user) {
+            $activityNbr = rand(0,3);
+            $ref = 'activity_'.$user->getUsernameCanonical();
+
+            for($i = 0; $i < $activityNbr; $i ++) {
+                print "Creating an aside activity for  : ".$user." (ref: ".$ref.")  \n";
+                $asideactivity = $this->newRandomActivity($user);
+                $manager->persist($asideactivity);
+            }
+
+            $this->setReference($ref, $asideactivity);
+        }
+        $manager->flush();
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php
new file mode 100644
index 000000000..8df2ec5f9
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php
@@ -0,0 +1,53 @@
+<?php
+
+Namespace Chill\AsideActivityBundle\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+
+/**
+ * Fixtures for AsideActivityCategory
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadAsideActivityCategory extends Fixture implements OrderedFixtureInterface
+{
+    public static $references = array();
+
+    public function getOrder()
+    {
+        return 16050;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $categories = [
+            [
+                'title' => ['fr' => 'Formation', 'en' => 'Training'],
+                'ref' => 'training',
+            ],
+            [
+                'title' => ['fr' => 'Team building', 'en' => 'Team building'],
+                'ref' => 'teambuilding',
+            ],
+        ];
+
+        foreach ($categories as $cat) {
+            print "Creating aside activity type category : " . $cat['ref'] . "\n";
+
+            $newCat = (new AsideActivityCategory())
+                ->setTitle(($cat['title']));
+
+            $manager->persist($newCat);
+            $reference = 'activity_type_cat_'.$cat['ref'];
+
+            $this->addReference($reference, $newCat);
+            static::$references[] = $reference;
+        }
+
+        $manager->flush();
+    }
+}
\ No newline at end of file

From 267c3bae6e5b7b8a7e86d2b01982f4404e0da458 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 24 Aug 2021 15:58:35 +0200
Subject: [PATCH 090/217] attempt to add aside activity to sections menu: not
 working yet

---
 .../src/Menu/SectionMenuBuilder.php           | 48 +++++++++++++++++++
 .../src/config/services/menu.yaml             |  6 +++
 2 files changed, 54 insertions(+)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
new file mode 100644
index 000000000..ba0a5d662
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Class SectionMenuBuilder
+ *
+ * @package Chill\AsideActivityBundle\Menu
+ */
+class SectionMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+    
+    /**
+     * @param $menuId
+     * @param MenuItem $menu
+     * @param array $parameters
+     */
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+
+        $menu->addChild($this->translator->trans('Create an aside activity'), [
+                'route' => 'chill_crud_aside_activity_new'
+            ])
+            ->setExtras([
+                'order' => 13,
+                'icons' => [ 'plus' ]
+            ]);
+    }
+    
+    /**
+     * @return array
+     */
+    public static function getMenuIds(): array
+    {
+        return [ 'section' ];
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
new file mode 100644
index 000000000..7969d2221
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
@@ -0,0 +1,6 @@
+services:
+  Chill\AsideActivityBundle\Menu\SectionMenuBuilder:
+    arguments:
+      $translator: '@Symfony\Component\Translation\TranslatorInterface'
+    tags:
+      - { name: "chill.menu_builder" }

From a6826623bc17c39ed6bf2cfc40127046facfafa4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Aug 2021 11:34:10 +0200
Subject: [PATCH 091/217] query_builder added to form : only active users
 displayed in select list

---
 .../src/Form/AsideActivityFormType.php                        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index ae4238d9a..322108c8e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -8,6 +8,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -54,6 +55,9 @@ final class AsideActivityFormType extends AbstractType
                 'required' => true,
                 'class' => User::class,
                 'data' => $this->storage->getToken()->getUser(),
+                'query_builder' => function(EntityRepository $er){
+                    return $er->createQueryBuilder('u')->where('u.enabled = true');
+                },
                 'attr' => array('class' => 'select2 '),
                 'placeholder' => 'Choose the agent for whom this activity is created',
                 'choice_label' => 'username'

From a0df8d8c616b61032e49ce07cac55f5a4e4cccfa Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Aug 2021 12:38:11 +0200
Subject: [PATCH 092/217] create aside activity added to sections menu

---
 .../src/DependencyInjection/ChillAsideActivityExtension.php    | 1 +
 .../ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php   | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index bbc4c8f8b..a40be70ac 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -27,6 +27,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         // $loader->load('services.yaml');
         $loader->load('services/form.yaml');
+        $loader->load('services/menu.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index ba0a5d662..09c2336e6 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -4,7 +4,6 @@ namespace Chill\AsideActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -33,7 +32,7 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'route' => 'chill_crud_aside_activity_new'
             ])
             ->setExtras([
-                'order' => 13,
+                'order' => 11,
                 'icons' => [ 'plus' ]
             ]);
     }

From 5512e25cdf35d1707dfb9d596714cf561aae5be6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 25 Aug 2021 16:16:46 +0200
Subject: [PATCH 093/217] menu entries for admin section of aside activity
 categories changed but not yet complete

---
 .../src/Controller/AdminController.php        | 20 +++++
 .../admin/layout_asideactivity.html.twig      | 14 ++++
 .../views/admin/menu_asideactivity.html.twig  |  4 +
 .../asideActivityCategory/index.html.twig     | 80 +++++++++----------
 .../src/config/routes.yaml                    | 13 ++-
 .../src/config/services.yaml                  |  8 --
 .../src/translations/messages.fr.yml          |  2 +
 7 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
new file mode 100644
index 000000000..ae04b2110
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+/**
+ * Controller for activity configuration
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
+ */
+class AdminController extends AbstractController
+{
+    
+    public function redirectToAdminIndexAction()
+    {
+        return $this->redirectToRoute('chill_main_admin_central');
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig
new file mode 100644
index 000000000..f0242c085
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig
@@ -0,0 +1,14 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+	{{ chill_menu('admin_aside_activity', {
+        'layout': '@ChillAsideActivity/Admin/menu_asideactivity.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+	{% block admin_content %}
+		<!-- block personcontent empty -->
+		<h1>{{ 'Aside activity configuration' |trans }}</h1>
+	{% endblock %}
+{% endblock  %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig
new file mode 100644
index 000000000..34ea309e5
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig
@@ -0,0 +1,4 @@
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}
+	{{ 'Aside activity configuration menu'|trans }}
+{% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
index 340dff474..d8cb67716 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
@@ -1,44 +1,44 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
 
 {% block admin_content %}
-    <h1>{{ 'ActivityType list'|trans }}</h1>
+	<h1>{{ 'ActivityType list'|trans }}</h1>
 
-    <table class="records_list table table-bordered border-dark">
-        <thead>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <th>{{ 'Active'|trans }}</th>
-                <th>{{ 'Actions'|trans }}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.title|localize_translatable_string }}</td>
-                <td style="text-align:center;">
-                {%- if entity.isActive -%}
-                    <i class="fa fa-check-square-o"></i>
-                {%- else -%}
-                    <i class="fa fa-square-o"></i>
-                {%- endif -%}
-            </td>
-                <td>
-                <ul class="record_actions">
-                    <li>
-                        <a href="{{ path('chill_crud_aside_activity_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
-                    </li>
-                </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
+	<table class="records_list table table-bordered border-dark">
+		<thead>
+			<tr>
+				<th>{{ 'Name'|trans }}</th>
+				<th>{{ 'Active'|trans }}</th>
+				<th>{{ 'Actions'|trans }}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for entity in entities %}
+				<tr>
+					<td>{{ entity.title|localize_translatable_string }}</td>
+					<td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+					<td>
+						<ul class="record_actions">
+							<li>
+								<a href="{{ path('chill_crud_aside_activity_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+							</li>
+						</ul>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 
-        <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_crud_aside_activity_category_new') }}" class="btn btn-create">
-                {{ 'Create a new aside activity type'|trans }}
-            </a>
-        </li>
-    </ul>
-    {% endblock %}
+	<ul class="record_actions">
+		<li>
+			<a href="{{ path('chill_crud_aside_activity_category_new') }}" class="btn btn-create">
+				{{ 'Create a new aside activity type'|trans }}
+			</a>
+		</li>
+	</ul>
+{% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
index 622102e34..ddb635084 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
@@ -1,3 +1,12 @@
 chill_asideactivities_controllers:
-    resource: "@ChillAsideActivityBundle/Controller"
-    type: annotation
\ No newline at end of file
+  resource: "@ChillAsideActivityBundle/Controller"
+  type: annotation
+
+chill_admin_aside_activity_redirect_to_admin_index:
+  path: /{_locale}/admin/activity_redirect_to_main
+  controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
+  options:
+    menus:
+      admin_aside_activity:
+        order: 0
+        label: Main admin menu
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
index 727efaa38..e69de29bb 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
@@ -1,8 +0,0 @@
-# services:
-#     chill.asideactivity.form.type.asideactivity:
-#         class: Chill\AsideActivityBundle\Form\AsideActivityFormType
-#         arguments:
-#             - "@chill.main.helper.translatable_string"
-#             # - "%chill_activity.form.time_duration%"
-#         tags:
-#             - { name: form.type, alias: chill_asideactivitybundle_asideactivity }
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 127268a1d..7e644392f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -83,3 +83,5 @@ The activity has been successfully removed.: L'activité a été supprimée.
 
 #Menu
 Create an aside activity: "Creér une activité annexe"
+Aside activity configuration menu: "Menu de configuration des activités annexes"
+Aside activity configuration: "Configuration des activités annexes"

From db92531257ebfea11b912588d725289e459a02ad Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 26 Aug 2021 14:50:01 +0200
Subject: [PATCH 094/217] dataFixtures fixed and executed + start of test
 script

---
 .../DataFixtures/ORM/LoadAsideActivity.php    | 102 ++++++++++++++++++
 .../ORM/LoadAsideActivityCategory.php         |  50 +++++++++
 .../ChillAsideActivityExtension.php           |   2 +-
 .../AsideActivityControllerTest.php           |  27 +++++
 4 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php

diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
new file mode 100644
index 000000000..a3de01baf
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Chill\AsideActivityBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Faker\Factory as FakerFactory;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\AsideActivityBundle\DataFixtures\ORM\LoadAsideActivityCategory;
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
+use DateTime;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+
+/**
+ * Load reports into DB
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadAsideActivity extends AbstractFixture implements DependentFixtureInterface, ContainerAwareInterface
+{
+    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+    /**
+     * @var \Faker\Generator
+     */
+    private $faker;
+
+    private array $cacheUsers = [];
+
+    private UserRepository $userRepository;
+
+    public function __construct(UserRepository $userRepository)
+    {
+        $this->faker = FakerFactory::create('fr_FR');
+        $this->userRepository = $userRepository;
+    }
+
+    public function getDependencies()
+    {
+        return [
+            LoadAsideActivityCategory::class,
+            LoadUsers::class,
+        ];
+    }
+
+    /**
+     * Return a random asideActivityCategory
+     *
+     * @return \Chill\AsideActivityBundle\Entity\AsideActivityCategory
+     */
+    private function getRandomAsideActivityCategory(): AsideActivityCategory
+    {
+        $catRef = LoadAsideActivityCategory::$references[array_rand(LoadAsideActivityCategory::$references)];
+
+        return $this->getReference($catRef);
+    }
+
+    /**
+     * Return a random user
+     *
+     * @return \Chill\MainBundle\Entity\User
+     */
+    private function getRandomUser(): User
+    {
+        if (0 === count($this->cacheUsers)){
+            $this->cacheUsers = $this->container->get('doctrine.orm.entity_manager')
+                ->getRepository('ChillMainBundle:User')
+                ->findAll();
+        }
+
+        return $this->cacheUsers[array_rand($this->cacheUsers)];
+    }
+
+    public function newRandomActivity()
+    {
+        $asideactivity = ($activity = new AsideActivity())
+            ->setAgent($this->getRandomUser())
+            ->setDate($this->faker->dateTimeThisYear())
+            ->setCreatedAt(new DateTime())
+            ->setCreatedBy($activity->getAgent())
+            //->setDuration(3600)
+            ->setType($this->getRandomAsideActivityCategory());
+
+        return $asideactivity;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        for($i = 0; $i < 100; $i ++) {
+            $asideactivity = $this->newRandomActivity();
+            $manager->persist($asideactivity);
+        }
+
+        $manager->flush();
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
new file mode 100644
index 000000000..76b6e3ff3
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -0,0 +1,50 @@
+<?php
+
+Namespace Chill\AsideActivityBundle\DataFixtures\ORM;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+
+/**
+ * Fixtures for AsideActivityCategory
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadAsideActivityCategory extends Fixture
+{
+    public static $references = array();
+
+    public function load(ObjectManager $manager)
+    {
+        $categories = [
+            [
+                'title' => ['fr' => 'Formation', 'en' => 'Training'],
+                'ref' => 'training',
+            ],
+            [
+                'title' => ['fr' => 'Team building', 'en' => 'Team building'],
+                'ref' => 'teambuilding',
+            ],
+        ];
+
+        foreach ($categories as $cat) {
+            print "Creating aside activity type category : " . $cat['ref'] . "\n";
+
+            $newCat = (new AsideActivityCategory())
+                ->setTitle(($cat['title']));
+
+            $manager->persist($newCat);
+            $reference = 'activity_type_cat_'.$cat['ref'];
+
+            $this->addReference($reference, $newCat);
+            static::$references[] = $reference;
+        }
+
+        $manager->flush();
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index a40be70ac..712649653 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -25,7 +25,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        // $loader->load('services.yaml');
+        $loader->load('services.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/menu.yaml');
     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
new file mode 100644
index 000000000..8d8ab9b46
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\AsideActivityBundle\Tests\Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+
+class AccompanyingCourseControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function setUp()
+    {
+        parent::setUp();
+        self::bootKernel();
+        $this->client = $this->getClientAuthenticated();
+    }
+
+   public function testNewWithoutUsers()
+    {
+        $this->client->request('GET', '/fr/asideactivity'); 
+
+        $this->assertResponseSuccessful();
+    }
+
+}
\ No newline at end of file

From 3fe7e131a25e3949dc610845a58b954789d96289 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Aug 2021 14:08:08 +0200
Subject: [PATCH 095/217] tests written and working

---
 .../AsideActivityControllerTest.php           | 50 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
index 8d8ab9b46..301da25e1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -4,6 +4,8 @@ namespace Chill\AsideActivityBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Doctrine\ORM\EntityManagerInterface;
 
 
 class AccompanyingCourseControllerTest extends WebTestCase
@@ -17,11 +19,55 @@ class AccompanyingCourseControllerTest extends WebTestCase
         $this->client = $this->getClientAuthenticated();
     }
 
-   public function testNewWithoutUsers()
+   public function testIndexWithoutUsers()
     {
         $this->client->request('GET', '/fr/asideactivity'); 
 
-        $this->assertResponseSuccessful();
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
     }
 
+    public function testNewWithoutUsers()
+    {
+        $this->client->request('GET', '/fr/asideactivity/new'); 
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    /**
+     * @dataProvider generateAsideActivityId
+     */
+
+    public function testEditWithoutUsers(int $asideActivityId)
+    {
+        $this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    public function generateAsideActivityId()
+    {
+        self::bootKernel();
+
+        $qb = self::$container->get(EntityManagerInterface::class)
+            ->createQueryBuilder();
+
+        $asideActivityIds = $qb
+            ->select('DISTINCT asideactivity.id')
+            ->from(AsideActivity::class, 'asideactivity')
+            ->innerJoin('asideactivity.agent', 'agent')
+            ->where($qb->expr()->eq('agent.username', ':center_name'))
+            ->setParameter('center_name', 'center a_social')
+            ->setMaxResults(100)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        \shuffle($asideActivityIds);
+
+        yield [ \array_pop($asideActivityIds)['id'] ];
+        yield [ \array_pop($asideActivityIds)['id'] ];
+        yield [ \array_pop($asideActivityIds)['id'] ];
+    }
+
+
 }
\ No newline at end of file

From 4525f01d5f393e26e3b04e5c52881b351ad64036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Sep 2021 15:23:02 +0200
Subject: [PATCH 096/217] fix loading of paginator factory in CRUDCONtroller

---
 src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 51325b3c5..adc0c071d 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -1141,7 +1141,7 @@ class CRUDController extends AbstractController
      */
     protected function getPaginatorFactory(): PaginatorFactory
     {
-        return $this->container->get(PaginatorFactory::class);
+        return $this->container->get('chill_main.paginator_factory');
     }
 
     /**
@@ -1196,7 +1196,7 @@ class CRUDController extends AbstractController
         return \array_merge(
             parent::getSubscribedServices(),
             [
-                PaginatorFactory::class => PaginatorFactory::class,
+                'chill_main.paginator_factory' => PaginatorFactory::class,
                 'translator' => TranslatorInterface::class,
                 AuthorizationHelper::class => AuthorizationHelper::class,
                 EventDispatcherInterface::class => EventDispatcherInterface::class,

From dc2f094ca269b0779d7f9ed12d22b5d10f909266 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 14:03:07 +0200
Subject: [PATCH 097/217] vue_household_members_editor: suggestions in
 bootstrap accordion style

---
 .../components/Household.vue                  | 95 +++++++++++--------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  2 +-
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index f9c241dfe..ec55484db 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -82,42 +82,54 @@
     </li>
   </ul>
 
-  <ul class="record_actions">
-   <li v-if="!showHouseholdSuggestion" class="cancel">
-      <button class="btn btn-misc" @click="toggleHouseholdSuggestion">
-         <i class="fa fa-fw fa-caret-right"></i>
-         {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
-      </button>
-   </li>
-   <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion" class="cancel">
-      <button class="btn btn-misc" @click="toggleHouseholdSuggestion">
-         <i class="fa fa-fw fa-caret-down"></i>
-         {{ $t('household_members_editor.hide_household_suggestion') }}
-      </button>
-   </li>
-   </ul>
+   <div v-if="hasHouseholdSuggestion" class="my-5">
+      <h4 class="mb-3">
+         {{ $t('household_members_editor.household_for_participants_accompanying_period') }} :
+      </h4>
 
-  <div class="householdSuggestions">
-    <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
-
-      <h3>{{ $t('household_members_editor.suggestions') }}</h3>
-      <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
-
-      <div class="flex-table householdSuggestionList">
-         <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod" class="item-bloc">
-          <household-render-box :household="h"></household-render-box>
-          <ul class="record_actions">
-            <li>
-              <button class="btn btn-sm btn-choose" @click="selectHousehold(h)">
-                {{ $t('household_members_editor.select_household') }}
-              </button>
-            </li>
-          </ul>
-        </div>
+      <div class="accordion" id="householdSuggestions">
+         <div class="accordion-item">
+            <h2 class="accordion-header" id="heading_suggestions">
+               <button v-if="!showHouseholdSuggestion"
+                  class="accordion-button collapsed"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  aria-expanded="false"
+                  @click="toggleHouseholdSuggestion">
+                  {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
+               </button>
+               <button v-if="showHouseholdSuggestion && hasHouseholdSuggestion"
+                  class="accordion-button"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  aria-expanded="true"
+                  @click="toggleHouseholdSuggestion">
+                  {{ $t('household_members_editor.hide_household_suggestion') }}
+               </button>
+               <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_suggestions" aria-controls="collapse_suggestions" -->
+            </h2>
+            <div class="accordion-collapse"
+               aria-labelledby="heading_suggestions"
+               data-bs-parent="#householdSuggestions"
+               id="collapse_suggestions">
+               <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
+                  <div class="flex-table householdSuggestionList">
+                     <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod" class="item-bloc">
+                        <household-render-box :household="h"></household-render-box>
+                        <ul class="record_actions">
+                           <li>
+                              <button class="btn btn-sm btn-choose" @click="selectHousehold(h)">
+                                 {{ $t('household_members_editor.select_household') }}
+                              </button>
+                           </li>
+                        </ul>
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
       </div>
-
-    </div>
-  </div>
+   </div>
 
 </template>
 <script>
@@ -245,12 +257,15 @@ export default {
 
 div#household_members_editor div,
 div.householdSuggestionList {
-   &.flex-table div.item-bloc div.item-row div.item-col {
-      &:first-child {
-         width: 25%;
-      }
-      &:last-child {
-         display: initial;
+   &.flex-table {
+      margin: 0;
+      div.item-bloc div.item-row div.item-col {
+         &:first-child {
+            width: 25%;
+         }
+         &:last-child {
+            display: initial;
+         }
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 794d664ca..7080728ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -36,7 +36,7 @@ const appMessages = {
       suggestions: "Suggestions",
       hide_household_suggestion: "Masquer les suggestions",
       show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
-      household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
+      household_for_participants_accompanying_period: "Des ménages partagent le même parcours",
       select_household: "Sélectionner",
       dates_title: "Période de validité",
       dates: {

From 6c61b2da3024dbba51f93714fc25cc41cbecd8a4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 12:56:20 +0200
Subject: [PATCH 098/217] translations

---
 .../Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 7080728ec..08a3d4f17 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -7,7 +7,7 @@ const appMessages = {
       household: {
         no_household_choose_one: "Aucun ménage de destination. Choisissez un ménage. Les usagers concernés par la modification apparaitront ensuite.",
         new_household: "Nouveau ménage",
-        create_household: "Créer un ménage de destination",
+        create_household: "Créer un nouveau ménage de destination",
         search_household: "Chercher un ménage",
         will_leave_any_household: "Ne rejoignent pas de ménage",
         leave_without_household: "Sans nouveau ménage",

From e4cfb4804b9663fc197f65ac46571a5aaeaaca51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Sep 2021 15:20:01 +0200
Subject: [PATCH 099/217] various improvements aside acdtivity

---
 .../Controller/AsideActivityController.php    | 34 +++++++++++++------
 .../src/Form/AsideActivityFormType.php        | 18 ++++++----
 .../src/Menu/SectionMenuBuilder.php           |  7 ++--
 .../layout_asideactivity.html.twig            |  0
 .../menu_asideactivity.html.twig              |  0
 .../views/asideActivity/_delete.html.twig     |  4 ++-
 .../views/asideActivity/delete.html.twig      |  4 +--
 .../views/asideActivity/edit.html.twig        |  1 +
 .../views/asideActivity/list.html.twig        | 31 ++++++-----------
 .../src/config/services/form.yaml             | 12 +++----
 .../src/config/services/menu.yaml             |  9 +++--
 .../src/translations/messages.fr.yml          | 18 ++--------
 .../ChillMainBundle/ChillMainBundle.php       |  5 +++
 tests/app                                     |  2 +-
 14 files changed, 71 insertions(+), 74 deletions(-)
 rename src/Bundle/ChillAsideActivityBundle/src/Resources/views/{admin => Admin}/layout_asideactivity.html.twig (100%)
 rename src/Bundle/ChillAsideActivityBundle/src/Resources/views/{admin => Admin}/menu_asideactivity.html.twig (100%)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index a458a02b0..88e53c8d2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -12,18 +12,30 @@ use Doctrine\Common\Collections\Criteria;
 
 final class AsideActivityController extends CRUDController
 {
-    /**
-     * @param QueryBuilder $query
-     */
-    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query) {
-        
-        $usr = $this->getUser();
-        $id = $usr->getId();
-        $criteria = Criteria::create()->andWhere(Criteria::expr()->eq('agent', $id));
+    protected function buildQueryEntities(string $action, Request $request)
+    {
+        $qb = parent::buildQueryEntities($action, $request);
 
-        $query
-            ->addCriteria($criteria);
+        if ('index' === $action) {
+            $qb->andWhere($qb->expr()->eq('e.agent', ':user'));
+            $qb->setParameter('user', $this->getUser());
+        }
+
+        return $qb;
     }
 
-    
+    protected function orderQuery(
+        string $action,
+        $query,
+        Request $request,
+        PaginatorInterface $paginator
+    ) {
+        if ('index' === $action) {
+           return $query->orderBy('e.date', 'DESC');
+        }
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 322108c8e..4bf5bbfdc 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -10,6 +10,7 @@ use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -27,15 +28,18 @@ final class AsideActivityFormType extends AbstractType
     private TranslatableStringHelper $translatableStringHelper;
     private TokenStorageInterface $storage;
 
-    public function __construct (TranslatableStringHelper $translatableStringHelper, array $timeChoices, TokenStorageInterface $storage){
-        $this->timeChoices = $timeChoices;
+    public function __construct (
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag,
+        TokenStorageInterface $storage
+    ){
+        $this->timeChoices = $parameterBag->get('chill_activity.form.time_duration');
         $this->translatableStringHelper = $translatableStringHelper;
         $this->storage = $storage;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        dump($options);
         $timeChoices = [];
 
         foreach ($this->timeChoices as $e) {
@@ -49,7 +53,7 @@ final class AsideActivityFormType extends AbstractType
         ];
 
         $builder
-            ->add('agent', EntityType::class, 
+            ->add('agent', EntityType::class,
             [
                 'label' => 'Agent',
                 'required' => true,
@@ -90,7 +94,7 @@ final class AsideActivityFormType extends AbstractType
                 'required' => false,
             ]);
 
-            foreach (['duration'] as $fieldName) 
+            foreach (['duration'] as $fieldName)
             {
                 $builder->get($fieldName)
                 ->addModelTransformer($durationTimeTransformer);
@@ -135,7 +139,7 @@ final class AsideActivityFormType extends AbstractType
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => AsideActivity::class, 
+            'data_class' => AsideActivity::class,
         ]);
     }
 
@@ -143,4 +147,4 @@ final class AsideActivityFormType extends AbstractType
     {
         return 'chill_asideactivitybundle_asideactivity';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index 09c2336e6..b9776b92b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -19,7 +19,7 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
     {
         $this->translator = $translator;
     }
-    
+
     /**
      * @param $menuId
      * @param MenuItem $menu
@@ -27,7 +27,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-
         $menu->addChild($this->translator->trans('Create an aside activity'), [
                 'route' => 'chill_crud_aside_activity_new'
             ])
@@ -36,7 +35,7 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'icons' => [ 'plus' ]
             ]);
     }
-    
+
     /**
      * @return array
      */
@@ -44,4 +43,4 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
     {
         return [ 'section' ];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
similarity index 100%
rename from src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/layout_asideactivity.html.twig
rename to src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/menu_asideactivity.html.twig
similarity index 100%
rename from src/Bundle/ChillAsideActivityBundle/src/Resources/views/admin/menu_asideactivity.html.twig
rename to src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/menu_asideactivity.html.twig
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
index 6871420aa..2f30b14cf 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
@@ -15,7 +15,9 @@
 				</a>
 			</li>
 		{% endblock %}
-		{% block content_form_actions_before %}{% endblock %}
+		{% block content_form_actions_before %}
+
+        {% endblock %}
 		{% block content_form_actions_confirm_delete %}
 			<li>
 				<button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
index 9c8a1ff59..4dd0a8415 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
@@ -3,6 +3,6 @@
 {# {% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %} #}
 
 {% block content %}
-    {% embed '@ChillAsideActivity/AsideActivity/_delete.html.twig' %}
+    {% embed '@ChillAsideActivity/asideActivity/_delete.html.twig' %}
     {% endembed %}
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
index b0b6fed0f..ad0a38f73 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig
@@ -9,5 +9,6 @@
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
     {# we do not have "view" page. We empty the corresponding block #}
     {% block content_form_actions_view %}{% endblock %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
index 8963d58f6..d0e02e3d2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
@@ -18,7 +18,7 @@
 			<div
 				class="flex-table my-4 list-records">
 				{# Sort activities according to date in descending order #}
-				{% for entity in entities|sort ((a, b) => b.date <=> a.date) %}
+				{% for entity in entities %}
 					{% set t = entity.type %}
 
 					<div class="item-bloc">
@@ -62,30 +62,18 @@
 												                    {{ entity.note|chill_markdown_to_html }}
 												                </div>
 												                {% endif %}
-												
+
 												            </div>
 												            {% endif %} #}
 						<div class="item-col">
 							<ul class="list-content">
 								<ul class="record_actions">
-									{# <li>
-																		                            <a href="{{ path('chill_crud_aside_activity_view', { 'id': entity.id} ) }}" class="btn btn-show "></a>
-																		                        </li> #}
-									{# TOOD
-																		                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-																		                        #}
-										<li><a href="{{ path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update "> </a>
-									</li>
-									{# TOOD
-																		                        {% endif %}
-																		                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-																		                        #}
+                                    <li>
+                                        <a href="{{ chill_path_add_return_path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update btn-mini "></a>
+                                    </li>
 									<li>
-										<a href="{{ path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete "></a>
+										<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete btn-mini"></a>
 									</li>
-									{#
-																		                        {% endif %}
-																		                        #}
 								</ul>
 							</ul>
 						</div>
@@ -93,10 +81,13 @@
 
 				{% endfor %}
 			</div>
+
+            {{ chill_pagination(paginator) }}
+
 			<ul class="record_actions">
 				<li>
-					<a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create">
-						{{ 'Add a new aside activity' | trans }}
+					<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
+						{{ 'Create' | trans }}
 					</a>
 				</li>
 			</ul>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/form.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/form.yaml
index ceb9dffc7..23c614937 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/form.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/form.yaml
@@ -1,10 +1,6 @@
 ---
 services:
-    chill.asideactivity.form.type.asideactivity:
-        class: Chill\AsideActivityBundle\Form\AsideActivityFormType
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "%chill_activity.form.time_duration%"
-            - "@security.token_storage"
-        tags:
-            - { name: form.type, alias: chill_asideactivitybundle_asideactivity }
\ No newline at end of file
+    Chill\AsideActivityBundle\Form\:
+        resource: './../../Form'
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
index 7969d2221..614391a0e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/menu.yaml
@@ -1,6 +1,5 @@
 services:
-  Chill\AsideActivityBundle\Menu\SectionMenuBuilder:
-    arguments:
-      $translator: '@Symfony\Component\Translation\TranslatorInterface'
-    tags:
-      - { name: "chill.menu_builder" }
+  Chill\AsideActivityBundle\Menu\:
+    resource: './../../Menu'
+    autowire: true
+    autoconfigure: true
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 7e644392f..a4ddec913 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -34,10 +34,10 @@ crud:
   aside_activity:
     title_view: Détail de l'activité annexe
     title_new: Nouvelle activité annexe
-    title_edit: Edition d'une activité annexe
-    title_delete: Supprimation d'une activité annexe
+    title_edit: Édition d'une activité annexe
+    title_delete: Supprimer une activité annexe
     button_delete: Supprimer
-    confirm_message_delete: Êtes-vous sûr de vouloir supprimer cet activité annexe?
+    confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
   aside_activity_category:
     title_new: Nouvelle catégorie d'activité annexe
     title_edit: Edition d'une catégorie de type d'activité
@@ -58,18 +58,6 @@ Agent: Utilisateur
 date: Date
 Duration: Durée
 Note: Note
-5 minutes: 5 minutes
-10 minutes: 10 minutes
-15 minutes: 15 minutes
-20 minutes: 20 minutes
-25 minutes: 25 minutes
-30 minutes: 30 minutes
-45 minutes: 45 minutes
-1 hour: 1 heure
-1 hour 15: 1 heure 15
-1 hour 30: 1 heure 30
-1 hour 45: 1 heure 45
-2 hours: 2 heures
 
 #list
 My aside activities: Mes activités annexes
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 51ef344f2..ee9523273 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -2,6 +2,7 @@
 
 namespace Chill\MainBundle;
 
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
@@ -23,6 +24,10 @@ class ChillMainBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
+
+        $container->registerForAutoconfiguration(LocalMenuBuilderInterface::class)
+            ->addTag('chill.menu_builder');
+
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());
         $container->addCompilerPass(new TimelineCompilerClass());
diff --git a/tests/app b/tests/app
index 8839b431f..bd95d3c96 160000
--- a/tests/app
+++ b/tests/app
@@ -1 +1 @@
-Subproject commit 8839b431f296733b792c788f2ef58e5ecd6419d3
+Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01

From 6fa0d229afbf5736a2a31dd7b8aebada32849ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Sep 2021 15:25:10 +0200
Subject: [PATCH 100/217] enable test suite for aside activity

---
 phpunit.xml.dist | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 25c5f0ff0..1cf89b91b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> 
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
 
@@ -31,6 +31,9 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
+        <testsuite name="AsideActivityBundle">
+            <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+        </testsuite>
     </testsuites>
 
     <listeners>

From 6fe78b71776bb1c9ae0bb1c7904b150e3796e5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Sep 2021 16:12:25 +0200
Subject: [PATCH 101/217] fix data provider

---
 .../src/DataFixtures/LoadAsideActivity.php    | 91 -----------------
 .../LoadAsideActivityCategory.php             | 53 ----------
 .../DataFixtures/ORM/LoadAsideActivity.php    | 97 +++++--------------
 .../ORM/LoadAsideActivityCategory.php         | 50 +++-------
 .../src/config/services.yaml                  |  5 +
 .../DataFixtures/ORM/LoadUsers.php            | 18 ++--
 6 files changed, 50 insertions(+), 264 deletions(-)
 delete mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
 delete mode 100644 src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php

diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
deleted file mode 100644
index 04163119a..000000000
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivity.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Faker\Factory as FakerFactory;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\AsideActivityBundle\DataFixtures\LoadAsideActivityCategory;
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
-/**
- * Load reports into DB
- *
- * @author Champs-Libres Coop
- */
-class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
-{
-    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
-
-    public function __construct()
-    {
-        $this->faker = FakerFactory::create('fr_FR');
-    }
-
-    public function getOrder()
-    {
-        return 16400;
-    }
-
-    /**
-     * Return a random asideActivityCategory
-     *
-     * @return \Chill\AsideActivityBundle\Entity\AsideActivityCategory
-     */
-    private function getRandomAsideActivityCategory()
-    {
-        $catRef = LoadAsideActivityCategory::$references[array_rand(LoadAsideActivityCategory::$references)];
-        return $this->getReference($catRef);
-    }
-
-    /**
-     * Return a random user
-     *
-     * @return \Chill\MainBundle\Entity\User
-     */
-    private function getRandomUser()
-    {
-        $userRef = array_rand(LoadUsers::$refs);
-        return $this->getReference($userRef);
-    }
-
-    public function newRandomActivity()
-    {
-        $asideactivity = (new AsideActivity())
-            ->setAgent($this->getRandomUser())
-            ->setDate($this->faker->dateTimeThisYear())
-            ->setDuration($this->faker->dateTime(36000))
-            ->setType($this->getRandomAsideActivityCategory());
-
-        return $asideactivity;
-    }
-
-    public function load(ObjectManager $manager)
-    {
-        $users = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillMainBundle:User')
-            ->findAll();
-
-        foreach($users as $user) {
-            $activityNbr = rand(0,3);
-            $ref = 'activity_'.$user->getUsernameCanonical();
-
-            for($i = 0; $i < $activityNbr; $i ++) {
-                print "Creating an aside activity for  : ".$user." (ref: ".$ref.")  \n";
-                $asideactivity = $this->newRandomActivity($user);
-                $manager->persist($asideactivity);
-            }
-
-            $this->setReference($ref, $asideactivity);
-        }
-        $manager->flush();
-    }
-}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php
deleted file mode 100644
index 8df2ec5f9..000000000
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/LoadAsideActivityCategory.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-Namespace Chill\AsideActivityBundle\DataFixtures;
-
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-
-/**
- * Fixtures for AsideActivityCategory
- *
- * @author Champs-Libres Coop
- */
-class LoadAsideActivityCategory extends Fixture implements OrderedFixtureInterface
-{
-    public static $references = array();
-
-    public function getOrder()
-    {
-        return 16050;
-    }
-
-    public function load(ObjectManager $manager)
-    {
-        $categories = [
-            [
-                'title' => ['fr' => 'Formation', 'en' => 'Training'],
-                'ref' => 'training',
-            ],
-            [
-                'title' => ['fr' => 'Team building', 'en' => 'Team building'],
-                'ref' => 'teambuilding',
-            ],
-        ];
-
-        foreach ($categories as $cat) {
-            print "Creating aside activity type category : " . $cat['ref'] . "\n";
-
-            $newCat = (new AsideActivityCategory())
-                ->setTitle(($cat['title']));
-
-            $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
-
-            $this->addReference($reference, $newCat);
-            static::$references[] = $reference;
-        }
-
-        $manager->flush();
-    }
-}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index a3de01baf..2764db282 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -2,99 +2,50 @@
 
 namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Faker\Factory as FakerFactory;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\AsideActivityBundle\DataFixtures\ORM\LoadAsideActivityCategory;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Repository\UserRepository;
-use DateTime;
-use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Doctrine\Persistence\ObjectManager;
 
-/**
- * Load reports into DB
- *
- * @author Champs-Libres Coop
- */
-class LoadAsideActivity extends AbstractFixture implements DependentFixtureInterface, ContainerAwareInterface
+class LoadAsideActivity extends Fixture implements DependentFixtureInterface
 {
-    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
-
-    private array $cacheUsers = [];
-
     private UserRepository $userRepository;
 
     public function __construct(UserRepository $userRepository)
     {
-        $this->faker = FakerFactory::create('fr_FR');
         $this->userRepository = $userRepository;
     }
 
-    public function getDependencies()
+    public function getDependencies(): array
     {
         return [
-            LoadAsideActivityCategory::class,
             LoadUsers::class,
+            LoadAsideActivityCategory::class
         ];
     }
 
-    /**
-     * Return a random asideActivityCategory
-     *
-     * @return \Chill\AsideActivityBundle\Entity\AsideActivityCategory
-     */
-    private function getRandomAsideActivityCategory(): AsideActivityCategory
-    {
-        $catRef = LoadAsideActivityCategory::$references[array_rand(LoadAsideActivityCategory::$references)];
-
-        return $this->getReference($catRef);
-    }
-
-    /**
-     * Return a random user
-     *
-     * @return \Chill\MainBundle\Entity\User
-     */
-    private function getRandomUser(): User
-    {
-        if (0 === count($this->cacheUsers)){
-            $this->cacheUsers = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:User')
-                ->findAll();
-        }
-
-        return $this->cacheUsers[array_rand($this->cacheUsers)];
-    }
-
-    public function newRandomActivity()
-    {
-        $asideactivity = ($activity = new AsideActivity())
-            ->setAgent($this->getRandomUser())
-            ->setDate($this->faker->dateTimeThisYear())
-            ->setCreatedAt(new DateTime())
-            ->setCreatedBy($activity->getAgent())
-            //->setDuration(3600)
-            ->setType($this->getRandomAsideActivityCategory());
-
-        return $asideactivity;
-    }
-
     public function load(ObjectManager $manager)
     {
-        for($i = 0; $i < 100; $i ++) {
-            $asideactivity = $this->newRandomActivity();
-            $manager->persist($asideactivity);
+        $user = $this->userRepository->findOneBy(['username' => 'center a_social']);
+
+        for ($i = 0; $i < 50; $i++) {
+            $activity = new AsideActivity();
+            $activity
+                ->setAgent($user)
+                ->setCreatedAt(new \DateTimeImmutable('now'))
+                ->setCreatedBy($user)
+                ->setUpdatedAt(new \DateTimeImmutable('now'))
+                ->setUpdatedBy($user)
+                ->setType(
+                    $this->getReference('aside_activity_category_0')
+                )
+                ->setDate((new \DateTimeImmutable('today'))
+                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')))
+            ;
+
+            $manager->persist($activity);
         }
 
         $manager->flush();
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
index 76b6e3ff3..497b260ad 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -1,50 +1,24 @@
 <?php
 
-Namespace Chill\AsideActivityBundle\DataFixtures\ORM;
+namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 
-/**
- * Fixtures for AsideActivityCategory
- *
- * @author Champs-Libres Coop
- */
-class LoadAsideActivityCategory extends Fixture
+class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
 {
-    public static $references = array();
-
     public function load(ObjectManager $manager)
     {
-        $categories = [
-            [
-                'title' => ['fr' => 'Formation', 'en' => 'Training'],
-                'ref' => 'training',
-            ],
-            [
-                'title' => ['fr' => 'Team building', 'en' => 'Team building'],
-                'ref' => 'teambuilding',
-            ],
-        ];
-
-        foreach ($categories as $cat) {
-            print "Creating aside activity type category : " . $cat['ref'] . "\n";
-
-            $newCat = (new AsideActivityCategory())
-                ->setTitle(($cat['title']));
-
-            $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
-
-            $this->addReference($reference, $newCat);
-            static::$references[] = $reference;
+        foreach ([
+            'Appel téléphonique',
+            'Formation'
+                 ] as $key => $label) {
+            $category = new AsideActivityCategory();
+            $category->setTitle(['fr' => $label]);
+            $manager->persist($category);
+            $this->setReference('aside_activity_category_'.$key, $category);
         }
 
         $manager->flush();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
index e69de29bb..8ff656fdc 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services.yaml
@@ -0,0 +1,5 @@
+services:
+    Chill\AsideActivityBundle\DataFixtures\:
+        resource: './../DataFixtures'
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index 21b9341c7..02f1bfd18 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 
 /**
  * Load fixtures users into database
- * 
+ *
  * create a user for each permission_group and center.
  * username and password are identicals.
  *
@@ -28,12 +28,12 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
      * @var ContainerInterface
      */
     private $container;
-    
+
     public function getOrder()
     {
         return 1000;
     }
-    
+
     public static $refs = array(
         'center a_social' => array(
             'groupCenterRefs' => ['centerA_permission_group_social']
@@ -54,10 +54,10 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
             'groupCenterRefs' => ['centerB_permission_group_direction']
         ),
         'multi_center' => array(
-            'groupCenterRefs' => ['centerA_permission_group_social', 
+            'groupCenterRefs' => ['centerA_permission_group_social',
                 'centerB_permission_group_social']
         )
-        
+
     );
 
     public function load(ObjectManager $manager)
@@ -67,11 +67,11 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
             $user = new User();
 
             $defaultEncoder = new MessageDigestPasswordEncoder('sha512', true, 5000);
-            
+
             $encoderFactory = new EncoderFactory([
                 User::class => $defaultEncoder
             ]);
-            
+
             $user
                 ->setUsername($username)
                 ->setPassword($encoderFactory
@@ -84,7 +84,7 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
             foreach ($params['groupCenterRefs'] as $groupCenterRef) {
                 $user->addGroupCenter($this->getReference($groupCenterRef));
             }
-            
+
             echo 'Creating user ' . $username ."... \n";
             $manager->persist($user);
             $this->addReference($username, $user);
@@ -98,7 +98,7 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
         if (NULL === $container) {
             throw new \LogicException('$container should not be null');
         }
-        
+
         $this->container = $container;
     }
 

From ee01020ae64833481e250244c418f3e9d2258351 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 16:38:43 +0200
Subject: [PATCH 102/217] fix multiselect calendarUserSelector badge appearance

---
 .../public/vuejs/AccompanyingCourse/components/SocialIssue.vue  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 32ee00b71..a73872953 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -78,6 +78,7 @@ export default {
 @import 'ChillMainAssets/module/bootstrap/shared';
 @import 'ChillPersonAssets/chill/scss/mixins';
 
+div#accompanying-course {
    span.multiselect__tag {
       @include badge_social_issue;
       background: $chill-l-gray;
@@ -93,6 +94,7 @@ export default {
          }
       }
    }
+}
 </style>
 
 

From 7dc85b84743a73d7735b42e894597dcdfd48a8a7 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 13 Sep 2021 19:15:04 +0200
Subject: [PATCH 103/217] vue_household_members_editor: address suggestions in
 bootstrap accordion style

+ store manage show/hide suggestions toggle (like householdSuggestions)
---
 .../components/Concerned.vue                  |   2 +-
 .../components/Household.vue                  | 113 ++++++++++++------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |   6 +-
 .../HouseholdMembersEditor/store/index.js     |  10 ++
 4 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index b8ca3be30..1d119ce40 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2>{{ $t('household_members_editor.concerned.title') }}</h2>
+  <h2 class="mt-4">{{ $t('household_members_editor.concerned.title') }}</h2>
 
   <h3 v-if="needsPositionning">
     {{ $t('household_members_editor.concerned.persons_to_positionnate') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index ec55484db..d1aa166b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -1,30 +1,71 @@
 <template>
-  <h2>{{ $t('household_members_editor.household_part') }}</h2>
+
+  <h2 class="mt-4">{{ $t('household_members_editor.household_part') }}</h2>
 
   <div v-if="hasHousehold">
+
     <div class="flex-table">
        <div class="item-bloc">
           <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
        </div>
     </div>
+
     <div v-if="isHouseholdNew && !hasHouseholdAddress">
 
-      <h3>{{ $t('household_members_editor.household.where_live_the_household') }}</h3>
-
-      <div v-if="filterAddressesSuggestion.length > 0" class="flex-table householdAddressSuggestionList">
-        <div v-for="a in filterAddressesSuggestion" class="item-bloc">
-          <address-render-box :address="a"></address-render-box>
-           <ul class="record_actions">
-              <li>
-                  <button class="btn btn-action" @click="setHouseholdAddress(a)">
-                     {{ $t('household_members_editor.household.household_live_to_this_address') }}
-                  </button>
-               </li>
-           </ul>
-        </div>
-      </div>
-      <div v-else>
-        <span class="chill-no-data-statement">{{ $t('household_members_editor.household.no_suggestions') }}</span>
+      <div v-if="hasAddressSuggestion" class="householdAddressSuggestion my-5">
+          <h4 class="mb-3">
+             {{ $t('household_members_editor.household.where_live_the_household') }}
+          </h4>
+          <div class="accordion" id="addressSuggestions">
+             <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_address_suggestions">
+                   <button v-if="!showAddressSuggestion"
+                      class="accordion-button collapsed"
+                      type="button"
+                      data-bs-toggle="collapse"
+                      aria-expanded="false"
+                      @click="toggleAddressSuggestion">
+                      {{ $tc('household_members_editor.show_household_suggestion', countAddressSuggestion) }}
+                   </button>
+                   <button v-if="showAddressSuggestion"
+                      class="accordion-button"
+                      type="button"
+                      data-bs-toggle="collapse"
+                      aria-expanded="true"
+                      @click="toggleAddressSuggestion">
+                      {{ $t('household_members_editor.hide_household_suggestion') }}
+                   </button>
+                </h2>
+                <div class="accordion-collapse" id="collapse_address_suggestions"
+                   aria-labelledby="heading_address_suggestions" data-bs-parent="#addressSuggestions">
+                   <div v-if="showAddressSuggestion">
+                      <div class="flex-table householdAddressSuggestionList">
+                         <div v-for="a in filterAddressesSuggestion" class="item-bloc">
+                            <div class="float-button bottom">
+                               <div class="box">
+                                  <div class="action">
+                                     <ul class="record_actions">
+                                        <li>
+                                           <button class="btn btn-sm btn-choose" @click="setHouseholdAddress(a)">
+                                              {{ $t('household_members_editor.household.household_live_to_this_address') }}
+                                           </button>
+                                        </li>
+                                     </ul>
+                                  </div>
+                                  <ul class="list-content fa-ul">
+                                     <li>
+                                        <i class="fa fa-li fa-map-marker"></i>
+                                        <address-render-box :address="a"></address-render-box>
+                                     </li>
+                                  </ul>
+                               </div>
+                            </div>
+                         </div>
+                      </div>
+                   </div>
+                </div>
+             </div>
+          </div>
       </div>
 
       <ul class="record_actions">
@@ -39,8 +80,8 @@
           </add-address>
         </li>
       </ul>
-
     </div>
+
     <div v-if="isHouseholdNew && hasHouseholdAddress">
       <ul class="record_actions">
         <li >
@@ -49,15 +90,13 @@
           </button>
         </li>
       </ul>
-
     </div>
+
   </div>
   <div v-else-if="isForceLeaveWithoutHousehold">
       {{ $t('household_members_editor.household.will_leave_any_household') }}
   </div>
-  <div v-else>
-    <div class="alert alert-info">{{ $t('household_members_editor.household.no_household_choose_one') }}</div>
-  </div>
+  <div v-else class="alert alert-info">{{ $t('household_members_editor.household.no_household_choose_one') }}</div>
 
   <ul v-if="allowChangeHousehold" class="record_actions">
     <li v-if="allowHouseholdCreate">
@@ -82,14 +121,13 @@
     </li>
   </ul>
 
-   <div v-if="hasHouseholdSuggestion" class="my-5">
+   <div v-if="hasHouseholdSuggestion" class="householdSuggestions my-5">
       <h4 class="mb-3">
          {{ $t('household_members_editor.household_for_participants_accompanying_period') }} :
       </h4>
-
       <div class="accordion" id="householdSuggestions">
          <div class="accordion-item">
-            <h2 class="accordion-header" id="heading_suggestions">
+            <h2 class="accordion-header" id="heading_household_suggestions">
                <button v-if="!showHouseholdSuggestion"
                   class="accordion-button collapsed"
                   type="button"
@@ -98,7 +136,7 @@
                   @click="toggleHouseholdSuggestion">
                   {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
                </button>
-               <button v-if="showHouseholdSuggestion && hasHouseholdSuggestion"
+               <button v-if="showHouseholdSuggestion"
                   class="accordion-button"
                   type="button"
                   data-bs-toggle="collapse"
@@ -106,13 +144,11 @@
                   @click="toggleHouseholdSuggestion">
                   {{ $t('household_members_editor.hide_household_suggestion') }}
                </button>
-               <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_suggestions" aria-controls="collapse_suggestions" -->
+               <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_household_suggestions" aria-controls="collapse_household_suggestions" -->
             </h2>
-            <div class="accordion-collapse"
-               aria-labelledby="heading_suggestions"
-               data-bs-parent="#householdSuggestions"
-               id="collapse_suggestions">
-               <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
+            <div class="accordion-collapse" id="collapse_household_suggestions"
+                 aria-labelledby="heading_household_suggestions" data-bs-parent="#householdSuggestions">
+               <div v-if="showHouseholdSuggestion">
                   <div class="flex-table householdSuggestionList">
                      <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod" class="item-bloc">
                         <household-render-box :household="h"></household-render-box>
@@ -132,6 +168,7 @@
    </div>
 
 </template>
+
 <script>
 import { mapGetters, mapState } from 'vuex';
 import HouseholdRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue';
@@ -164,12 +201,12 @@ export default {
           },
           button: {
             text:  {
-              create: null,
+              create: 'household_members_editor.household.or_create_new_address',
               edit: null,
             }
           },
           title: {
-            create: null,
+            create: 'household_members_editor.household.create_new_address',
             edit: null,
           },
         }
@@ -183,11 +220,14 @@ export default {
       'hasHouseholdSuggestion',
       'countHouseholdSuggestion',
       'filterHouseholdSuggestionByAccompanyingPeriod',
+      'hasAddressSuggestion',
+      'countAddressSuggestion',
       'filterAddressesSuggestion',
       'hasHouseholdAddress',
     ]),
     ...mapState([
       'showHouseholdSuggestion',
+      'showAddressSuggestion'
     ]),
     household() {
       return this.$store.state.household;
@@ -228,6 +268,9 @@ export default {
     toggleHouseholdSuggestion() {
       this.$store.commit('toggleHouseholdSuggestion');
     },
+    toggleAddressSuggestion() {
+      this.$store.commit('toggleAddressSuggestion');
+    },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
       this.toggleHouseholdSuggestion();
@@ -247,7 +290,7 @@ export default {
     },
     removeHouseholdAddress() {
       this.$store.commit('removeHouseholdAddress');
-    }
+    },
   },
 };
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 08a3d4f17..635f9788c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -12,9 +12,11 @@ const appMessages = {
         will_leave_any_household: "Ne rejoignent pas de ménage",
         leave_without_household: "Sans nouveau ménage",
         where_live_the_household: "À quelle adresse habite ce ménage ?",
-        household_live_to_this_address: "Le ménage habite cette adresse",
+        household_live_to_this_address: "Sélectionner l'adresse",
         no_suggestions: "Aucune adresse à suggérer",
         delete_this_address: "Supprimer cette adresse",
+        create_new_address: "Créer une nouvelle adresse",
+        or_create_new_address: "Ou créer une nouvelle adresse",
       },
       concerned: {
         title: "Nouveaux membres du ménage",
@@ -37,7 +39,7 @@ const appMessages = {
       hide_household_suggestion: "Masquer les suggestions",
       show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
       household_for_participants_accompanying_period: "Des ménages partagent le même parcours",
-      select_household: "Sélectionner",
+      select_household: "Sélectionner le ménage",
       dates_title: "Période de validité",
       dates: {
         start_date: "Début de validité",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index f66e68514..ce9ee9340 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -36,6 +36,7 @@ const store = createStore({
     householdSuggestionByAccompanyingPeriod: [],
     showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
     addressesSuggestion: [],
+    showAddressSuggestion: true,
     warnings: [],
     errors: []
   },
@@ -73,6 +74,12 @@ const store = createStore({
         .filter(h => h.id !== state.household.id)
         ;
     },
+    hasAddressSuggestion(state, getters) {
+      return getters.filterAddressesSuggestion.length > 0;
+    },
+    countAddressSuggestion(state, getters) {
+      return getters.filterAddressesSuggestion.length;
+    },
     filterAddressesSuggestion(state) {
       if (state.household === null) {
         return state.addressesSuggestion;
@@ -260,6 +267,9 @@ const store = createStore({
     toggleHouseholdSuggestion(state) {
       state.showHouseholdSuggestion = !state.showHouseholdSuggestion;
     },
+    toggleAddressSuggestion(state) {
+      state.showAddressSuggestion = !state.showAddressSuggestion;
+    },
     setWarnings(state, warnings) {
       state.warnings = warnings;
       // reset errors, which should come from servers

From f7cb93fdac337c10c3efd8a57db1c4a2966153cb Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 14 Sep 2021 10:30:52 +0200
Subject: [PATCH 104/217] Update controller and the way they are autoloaded

---
 .../config/services/controller.yaml            | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/config/services/controller.yaml b/src/Bundle/ChillDocStoreBundle/config/services/controller.yaml
index 9899ffa2e..6675102d9 100644
--- a/src/Bundle/ChillDocStoreBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/services/controller.yaml
@@ -1,11 +1,9 @@
 services:
-    Chill\DocStoreBundle\Controller\:
-        resource: '../../Controller'
-        tags: ['controller.service_arguments']
-        
-    Chill\DocStoreBundle\Controller\DocumentPersonController:
-        arguments:
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-        tags: ['controller.service_arguments']
\ No newline at end of file
+  _defaults:
+    autowire: true
+    autoconfigure: true
+
+  Chill\DocStoreBundle\Controller\:
+    resource: "../../Controller"
+    tags: ["controller.service_arguments"]
+

From b80d109d8e8fe6a5af0515a99b4283487f4fb4fd Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 14 Sep 2021 11:51:36 +0200
Subject: [PATCH 105/217] fix vue_calendar encore_entry_link_tags

---
 .../Resources/views/Calendar/newAccompanyingCourse.html.twig    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig
index 35b2d9e63..37fcc43df 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig
@@ -31,7 +31,7 @@
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/vue_calendar.css') }}"/>
+    {{ encore_entry_link_tags('vue_calendar') }}
 {% endblock %}
 
 {% block block_post_menu %}

From 6c47ce53e7ef3848861eb329c6497381da9dcb0c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 14 Sep 2021 15:06:22 +0200
Subject: [PATCH 106/217] chore: Remove duplicated entry from composer.json.

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 88e3c520a..ab244d40d 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,6 @@
         "symfony/validator": "4.*",
         "sensio/framework-extra-bundle": "^5.5",
         "symfony/yaml": "4.*",
-        "symfony/webpack-encore-bundle": "^1.11",
         "knplabs/knp-menu": "^3.1",
         "knplabs/knp-menu-bundle": "^3.0",
         "symfony/templating": "4.*",

From fe533bc716105660d8c98ee1f2b1a98dacab1676 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 14 Sep 2021 15:07:23 +0200
Subject: [PATCH 107/217] chore: Normalize `composer.json` file.

---
 composer.json | 116 +++++++++++++++++++++++++-------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/composer.json b/composer.json
index ab244d40d..a2aa29a5a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,69 @@
 {
     "name": "chill-project/chill-bundles",
-    "license": "AGPL-3.0-only",
     "type": "library",
     "description": "Most used bundles for chill-project",
     "keywords": [
         "chill",
         "social worker"
     ],
+    "license": "AGPL-3.0-only",
+    "require": {
+        "champs-libres/async-uploader-bundle": "dev-sf4",
+        "champs-libres/wopi-bundle": "dev-master",
+        "composer/package-versions-deprecated": "^1.10",
+        "doctrine/doctrine-bundle": "^2.1",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/orm": "^2.7",
+        "erusev/parsedown": "^1.7",
+        "graylog2/gelf-php": "^1.5",
+        "knplabs/knp-menu": "^3.1",
+        "knplabs/knp-menu-bundle": "^3.0",
+        "knplabs/knp-time-bundle": "^1.12",
+        "league/csv": "^9.7.1",
+        "nyholm/psr7": "^1.4",
+        "phpoffice/phpspreadsheet": "^1.16",
+        "sensio/framework-extra-bundle": "^5.5",
+        "symfony/asset": "4.*",
+        "symfony/browser-kit": "^5.2",
+        "symfony/css-selector": "^5.2",
+        "symfony/expression-language": "4.*",
+        "symfony/form": "4.*",
+        "symfony/intl": "4.*",
+        "symfony/monolog-bundle": "^3.5",
+        "symfony/security-bundle": "4.*",
+        "symfony/serializer": "^5.2",
+        "symfony/swiftmailer-bundle": "^3.5",
+        "symfony/templating": "4.*",
+        "symfony/translation": "4.*",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/validator": "4.*",
+        "symfony/webpack-encore-bundle": "^1.11",
+        "symfony/workflow": "4.*",
+        "symfony/yaml": "4.*",
+        "twig/extra-bundle": "^2.12 || ^3.0",
+        "twig/intl-extra": "^3.0",
+        "twig/markdown-extra": "^3.3",
+        "twig/twig": "^2.12 || ^3.0"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "fakerphp/faker": "^1.13",
+        "nelmio/alice": "^3.8",
+        "phpunit/phpunit": "^7.0",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/dotenv": "^5.1",
+        "symfony/maker-bundle": "^1.20",
+        "symfony/phpunit-bridge": "^5.2",
+        "symfony/stopwatch": "^5.1",
+        "symfony/var-dumper": "4.*",
+        "symfony/web-profiler-bundle": "^5.0"
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
@@ -33,67 +90,10 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "require": {
-        "champs-libres/async-uploader-bundle": "dev-sf4",
-        "champs-libres/wopi-bundle": "dev-master",
-        "nyholm/psr7": "^1.4",
-        "graylog2/gelf-php": "^1.5",
-        "symfony/form": "4.*",
-        "symfony/twig-bundle": "^4.4",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
-        "composer/package-versions-deprecated": "^1.10",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.7",
-        "symfony/asset": "4.*",
-        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "4.*",
-        "symfony/translation": "4.*",
-        "symfony/validator": "4.*",
-        "sensio/framework-extra-bundle": "^5.5",
-        "symfony/yaml": "4.*",
-        "knplabs/knp-menu": "^3.1",
-        "knplabs/knp-menu-bundle": "^3.0",
-        "symfony/templating": "4.*",
-        "twig/intl-extra": "^3.0",
-        "symfony/workflow": "4.*",
-        "symfony/expression-language": "4.*",
-        "knplabs/knp-time-bundle": "^1.12",
-        "symfony/intl": "4.*",
-        "symfony/swiftmailer-bundle": "^3.5",
-        "league/csv": "^9.7.1",
-        "phpoffice/phpspreadsheet": "^1.16",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "twig/markdown-extra": "^3.3",
-        "erusev/parsedown": "^1.7",
-        "symfony/serializer": "^5.2",
-        "symfony/webpack-encore-bundle": "^1.11"
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "require-dev": {
-        "fakerphp/faker": "^1.13",
-        "phpunit/phpunit": "^7.0",
-        "symfony/dotenv": "^5.1",
-        "symfony/maker-bundle": "^1.20",
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "symfony/stopwatch": "^5.1",
-        "symfony/web-profiler-bundle": "^5.0",
-        "symfony/var-dumper": "4.*",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/phpunit-bridge": "^5.2",
-        "nelmio/alice": "^3.8"
-    },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
-    },
-    "config": {
-        "bin-dir": "bin"
     }
 }

From 951d686366cd778374f32e9a835a13d2fc79725a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 14 Sep 2021 15:08:00 +0200
Subject: [PATCH 108/217] refactor: Update WOPI related stuff based on upstream
 changes.

---
 src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 2 +-
 src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index a40796607..455e658e2 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -10,7 +10,7 @@ declare(strict_types=1);
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
-use ChampsLibres\WopiLib\WopiInterface;
+use ChampsLibres\WopiLib\Service\Contract\WopiInterface;
 use Chill\WopiBundle\Service\Wopi\ChillWopi;
 
 return static function (ContainerConfigurator $container) {
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index bb0dfb8e2..fc4e526a1 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -11,7 +11,7 @@ namespace Chill\WopiBundle\Service\Wopi;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
 use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface;
-use ChampsLibres\WopiLib\WopiInterface;
+use ChampsLibres\WopiLib\Service\Contract\WopiInterface;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
 use Exception;
 use loophp\psr17\Psr17Interface;
@@ -228,7 +228,7 @@ final class ChillWopi implements WopiInterface
             ->withBody($this->psr17->createStream((string) json_encode([])));
     }
 
-    public function putRelativeFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface
+    public function putRelativeFile(string $fileId, string $accessToken, ?string $suggestedTarget, ?string $relativeTarget, bool $overwriteRelativeTarget, int $size, RequestInterface $request): ResponseInterface
     {
         return $this->getDebugResponse(__FUNCTION__, $request);
     }

From a4f446c6b92e2040b191294d97b259812ab16bd8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 11:42:02 +0200
Subject: [PATCH 109/217] fix flashbag double col-8

---
 src/Bundle/ChillMainBundle/Resources/views/layout.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index b11a4101f..dc500642c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -59,19 +59,19 @@
                 <div class="col-8 mb-5 flash_message">
 
                     {% for flashMessage in app.session.flashbag.get('success') %}
-                        <div class="col-8 alert alert-success flash_message">
+                        <div class="alert alert-success flash_message">
                             <span>{{ flashMessage|raw }}</span>
                         </div>
                     {% endfor %}
 
                     {% for flashMessage in app.session.flashbag.get('error') %}
-                        <div class="col-8 alert alert-danger flash_message">
+                        <div class="alert alert-danger flash_message">
                             <span>{{ flashMessage|raw }}</span>
                         </div>
                     {% endfor %}
 
                     {% for flashMessage in app.session.flashbag.get('notice') %}
-                        <div class="col-8 alert alert-warning flash_message">
+                        <div class="alert alert-warning flash_message">
                             <span>{{ flashMessage|raw }}</span>
                         </div>
                     {% endfor %}

From 910016f72279db2cfa2a3a816d5739fe57055fdb Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 11:50:03 +0200
Subject: [PATCH 110/217] tp: prepare address to be managed by vue (adapt
 formType) + add aliases methods isChild and isParent

---
 .../Entity/ThirdParty.php                     | 21 +++++++++-
 .../Form/ThirdPartyType.php                   | 38 ++++++++++++++-----
 .../config/services/form.yaml                 |  1 +
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 75da7ad78..0b0b3e56b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -152,6 +152,7 @@ class ThirdParty
     private $address;
 
     /**
+     * Soft-delete flag
      * @var boolean
      * @ORM\Column(name="active", type="boolean", options={"defaut": true})
      */
@@ -498,11 +499,28 @@ class ThirdParty
         return $this;
     }
 
+    /**
+     * Mechanism to differentiate children and parents
+     */
     public function isLeaf(): bool
     {
         return $this->children->count() !== 0;
     }
 
+    /**
+     * isLeaf aliases
+     */
+    public function isChild():bool
+    {
+        return $this->isLeaf();
+    }
+
+    public function isParent():bool
+    {
+        return !$this->isLeaf();
+    }
+
+
     /**
      * @return Collection
      */
@@ -527,7 +545,8 @@ class ThirdParty
      */
     public function removeChild(ThirdParty $child): self
     {
-        $this->categories->removeElement($child);
+        $this->children->removeElement($child);
+        $this->active = false;
         return $this;
     }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 9db5013c3..30323794e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -2,6 +2,7 @@
 
 namespace Chill\ThirdPartyBundle\Form;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
@@ -9,7 +10,9 @@ use Chill\ThirdPartyBundle\Entity\ThirdPartyCivility;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -21,8 +24,7 @@ use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Chill\MainBundle\Form\Type\AddressType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 
 class ThirdPartyType extends AbstractType
@@ -35,16 +37,20 @@ class ThirdPartyType extends AbstractType
 
     protected TranslatableStringHelper $translatableStringHelper;
 
+    protected ObjectManager $om;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         ThirdPartyTypeManager $typesManager,
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelper $translatableStringHelper,
+        ObjectManager $om
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->typesManager = $typesManager;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->om = $om;
     }
 
     /**
@@ -88,11 +94,6 @@ class ThirdPartyType extends AbstractType
             ->add('email', EmailType::class, [
                 'required' => false
             ])
-            ->add('address', AddressType::class, [
-                'has_valid_from' => false,
-                'null_if_empty' => true,
-                'required' => false
-            ])
             ->add('active', ChoiceType::class, [
                 'label' => 'thirdparty.Status',
                 'choices' => [
@@ -112,9 +113,28 @@ class ThirdPartyType extends AbstractType
                 'attr' => ['class' => 'select2']
             ])
         ;
+        $builder->add('address', HiddenType::class);
+        $builder->get('address')
+            ->addModelTransformer(new CallbackTransformer(
+                function (?Address $address): string {
+                    if (null === $address) {
+                        return '';
+                    }
+                    return $address->getId();
+                },
+                function (string $addressId): ?Address {
+                    if ('' === $addressId) {
+                        return null;
+                    }
+                    return $this->om
+                        ->getRepository(Address::class)
+                        ->findOneBy(['id' => (int) $addressId]);
+                }
+            ))
+        ;
 
         // Contact Person ThirdParty (child)
-        if ($options['data']->isLeaf()) {
+        if ($options['data']->isChild()) {
             $builder
                 ->add('civility', EntityType::class, [
                     'label' => 'thirdparty.Civility',
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
index de62b197c..8ff604769 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/form.yaml
@@ -5,6 +5,7 @@ services:
             $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
             $typesManager: '@Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
+            $om: '@doctrine.orm.entity_manager'
         tags:
             - { name: form.type }
 

From 4046a7ca9bbfef514a12d1b560150277e0aa90ce Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 12:14:03 +0200
Subject: [PATCH 111/217] before resume dashboards: disable accompanyingCourse
 resume persons, requestor, and resources

---
 .../views/AccompanyingCourse/index.html.twig         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index f210c4a49..be66abe73 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -34,6 +34,9 @@
         </div>
     {% endif %}
 
+    <pre>WIP .. AccompanyingCourse Resume dashboard</pre>
+
+    {#
     <h1>{{ 'Resume Accompanying Course'|trans }}</h1>
 
     <div class="associated-persons mb-5">
@@ -50,11 +53,13 @@
                 {% endif %}
             {% endfor %}
         </div>
+    #}
         {% if 'DRAFT' != accompanyingCourse.step %}
             {% if withoutHousehold|length > 0 %}
                 {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
             {% endif %}
         {% endif %}
+    {#
     </div>
 
     <div class="location mb-5">
@@ -75,12 +80,11 @@
                 </div>
             </div>
         {% endif %}
-
+    #}
         {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
             {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
         {% endif %}
-
-
+    {#
     </div>
 
     <div class="requestor mb-5">
@@ -128,6 +132,8 @@
             </div>
         {% endif %}
     </div>
+    #}
+    <div class="mt-5"></div>
 
     <div class="social-actions mb-5">
         <h2 class="mb-3">{{ 'Social actions'|trans }}</h2>

From 92fae5cba26ccb64c927d4e68ad3eb2bc21b1e37 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 12:54:46 +0200
Subject: [PATCH 112/217] tp list: table chill appearance, small action buttons

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

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index 265931e81..fa9ad8b8b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -26,7 +26,7 @@
                     <span>{{ pagination.totalItems }}</span> {{ 'third parties'|trans }}
                 </label>
 
-                <table class="table table-striped table-hover align-middle">
+                <table class="table table-bordered border-dark table-striped align-middle">
                     <thead>
                         <tr>
                             <th class="chill-pink" style="width: 35px;"></th>
@@ -69,12 +69,12 @@
                                 <ul class="record_actions">
                                     {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
                                         <li>
-                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="btn btn-update"></a>
+                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="btn btn-sm btn-update"></a>
                                         </li>
                                     {% endif %}
                                     {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
                                         <li>
-                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="btn btn-show"></a>
+                                            <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="btn btn-sm btn-show"></a>
                                         </li>
                                     {% endif %}
                                 </ul>

From e94790b8abb5c6a2d2cd0433898648c175d169f2 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 12:57:37 +0200
Subject: [PATCH 113/217] tp form: call vue_address to manage address, wip

show some limits with AddAddress:
* bug with option buttonText overriding default
* need to improve step1
---
 .../translations/messages.fr.yml              |  1 +
 .../Address/_insert_vue_address.html.twig     | 77 +++++++++++++++++++
 .../Resources/views/ThirdParty/new.html.twig  | 31 +++++++-
 .../views/ThirdParty/update.html.twig         | 27 ++++++-
 4 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig

diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b230b6ac1..750c99618 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -74,6 +74,7 @@ address:
     address_homeless: L'adresse est-elle celle d'un domicile fixe ?
     real address: Adresse d'un domicile
     consider homeless: N'est pas l'adresse d'un domicile (SDF)
+Create a new address: Créer une nouvelle adresse
 
 #serach
 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche.
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
new file mode 100644
index 000000000..379f71638
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -0,0 +1,77 @@
+{#
+    This Twig template include load vue_address component.
+    It push all variables from context in Address/App.vue.
+
+    OPTIONS
+    * mode          string ['edit*'|'new'|'create']
+    * address_id    integer
+    * backUrl       twig route:   path('route', {parameters})
+    * modalTitle    twig translated chain
+    * buttonText    twig translated chain
+    * buttonSize    bootstrap class like 'btn-sm'
+    * buttonDisplayText     bool
+    * binModalStep1         bool
+    * binModalStep2         bool
+
+#}
+<div id="address"></div>
+
+<script type="text/javascript">
+    window.vueRootComponent = 'app';
+
+    window.entityType = 'thirdParty';
+    window.entityId = {{ thirdParty.id|e('js') }};
+
+    {% if 'edit' in app.request.get('_route') %}
+        window.addressId = {{ app.request.get('address_id')|e('js') }};
+        window.mode = 'edit';
+    {% elseif mode is defined and mode == 'edit' %}
+        window.addressId = {{ address_id|e('js') }};
+        window.mode = 'edit';
+    {% endif %}
+
+    {% if backUrl is not defined %}
+        window.backUrl = '{{ path('chill_3party_3party_show', { 'thirdparty_id': thirdParty.id })|e('js') }}';
+    {% else %}
+        window.backUrl = '{{ backUrl|e('js') }}';
+    {% endif %}
+
+    {% if modalTitle is defined %}
+        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
+    {% endif %}
+
+
+    {% if buttonText is defined %}
+        window.buttonText = '{{ buttonText|trans|e('js') }}';
+    {% endif %}
+
+    {% if buttonSize is defined %}
+        window.buttonSize = '{{ buttonSize|e('js') }}';
+    {% endif %}
+
+    {% if buttonDisplayText is defined and buttonDisplayText == false %}
+        window.buttonDisplayText = false;
+    {% endif %}
+
+    {% if binModalStep1 is defined and binModalStep1 == false %}
+        window.binModalStep1 = false;
+    {% endif %}
+
+    {% if binModalStep2 is defined and binModalStep2 == false %}
+        window.binModalStep2 = false;
+    {% endif %}
+</script>
+
+{{ encore_entry_script_tags('vue_address') }}
+{{ encore_entry_link_tags('vue_address') }}
+
+{# TODO
+    * un seul fichier include twig qui fais la liaison avec vue_address
+        * dans main
+        * enlever les références à household, person, thirdparty
+    * addAddress
+        * option buttonText est buggée
+        * gestion du step1
+            *
+
+#}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 1997466c2..fc0bb1a88 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -31,7 +31,36 @@
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}
-            {{ form_row(form.address) }}
+
+            <div class="mb-3 row">
+                {{ form_label(form.address) }}
+                {{ form_widget(form.address) }}
+                <div class="col-sm-8">
+                    new tp =>
+                    {% if thirdParty.address %}
+                        edit address
+                        {# include vue_address component #}
+                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                            mode: 'edit',
+                            address_id: thirdParty.address.id,
+                            buttonSize: 'btn-sm',
+                            binModalStep1: false,
+                            backUrl: path('chill_3party_3party_new')
+                        } %}
+                    {% else %}
+                        create address
+                        {# include vue_address component #}
+                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                            mode: 'create',
+                            buttonSize: 'btn-sm',
+                            buttonText: 'Create a new address',
+                            modalTitle: 'Create a new address',
+                            binModalStep1: false,
+                            backUrl: path('chill_3party_3party_new')
+                        } %}
+                    {% endif %}
+                </div>
+            </div>
 
             {{ form_row(form.comment) }}
             {{ form_row(form.centers) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 85c8dd41d..ccc624e0c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -48,7 +48,32 @@
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}
-            {{ form_row(form.address) }}
+
+            <div class="mb-3 row">
+                {{ form_label(form.address) }}
+                {{ form_widget(form.address) }}
+                <div class="col-sm-8">
+                    update tp =>
+                    {% if thirdParty.address %}
+                        edit address
+                        {# include vue_address component #}
+                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                            mode: 'edit',
+                            address_id: thirdParty.address.id,
+                            buttonSize: 'btn-sm',
+                            binModalStep1: false
+                        } %}
+                    {% else %}
+                        create address
+                        {# include vue_address component #}
+                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                            mode: 'create',
+                            buttonSize: 'btn-sm',
+                            binModalStep1: false
+                        } %}
+                    {% endif %}
+                </div>
+            </div>
 
             {{ form_row(form.comment) }}
             {{ form_row(form.centers) }}

From 6e31e01e5158dce1f24f541afd03d6f099721db0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 16:11:25 +0200
Subject: [PATCH 114/217] tp: rename field translation

---
 .../Resources/public/module/ckeditor5/index.js                | 4 ++--
 .../Resources/views/ThirdParty/update.html.twig               | 2 +-
 src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
index 678f418b0..ddbc4afa7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
@@ -52,10 +52,10 @@ Fields.forEach(function(field) {
     ClassicEditor
         .create( field )
         .then( editor => {
-            console.log( 'CkEditor was initialized', editor );
+            //console.log( 'CkEditor was initialized', editor );
         })
         .catch( error => {
             console.error( error.stack );
         })
     ;
-});
\ No newline at end of file
+});
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index ccc624e0c..768f4369e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="thirdparty-edit my-5">
     <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
+        <div class="col-md-10">
 
             <h1>
                 {{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index dd4cef51f..7878ec196 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -12,7 +12,7 @@ thirdparty.No_phonenumber: Aucun numéro de téléphone
 thirdparty.No_email: Aucun email
 thirdparty.No_comment: Aucun commentaire
 
-thirdparty.NameCompany:  Raison sociale
+thirdparty.NameCompany:  Service/Département
 thirdparty.Acronym:  Sigle
 thirdparty.Categories:  Catégories
 thirdparty.Child:  Personne de contact

From 683eac91d8e91d6bfcccd35e55992d5d9b752908 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 16:06:15 +0200
Subject: [PATCH 115/217] thirdparty, manage case with only one type

in that case, type field is hidden, uniq type is automatically written in table
---
 .../Form/ThirdPartyType.php                   | 71 +++++++++++++------
 .../Resources/views/ThirdParty/new.html.twig  |  2 +-
 .../views/ThirdParty/update.html.twig         |  2 +-
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 30323794e..2ec113eb9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -62,6 +62,35 @@ class ThirdPartyType extends AbstractType
         foreach ($this->typesManager->getProviders() as $key => $provider) {
             $types['chill_3party.key_label.'.$key] = $key;
         }
+        if (count($types) === 1) {
+            $builder
+                ->add('type', HiddenType::class, [
+                    'data' => array_values($types)
+                ])
+                ->get('type')
+                    ->addModelTransformer(new CallbackTransformer(
+                    function (?array $typeArray): ?string {
+                        if (null === $typeArray) {
+                            return null;
+                        }
+                        return implode(',', $typeArray);
+                    },
+                    function (?string $typeStr): ?array {
+                        if (null === $typeStr) {
+                            return null;
+                        }
+                        return explode(',', $typeStr);
+                    }
+                ))
+            ;
+        } else {
+            $builder->add('type', ChoiceType::class, [
+                'choices' => $types,
+                'expanded' => true,
+                'multiple' => true,
+                'label'    => 'thirdparty.Type'
+            ]);
+        }
 
         $builder
             ->add('name', TextType::class, [
@@ -81,12 +110,6 @@ class ThirdPartyType extends AbstractType
                 'multiple' => true,
                 'attr' => ['class' => 'select2']
             ])
-            ->add('type', ChoiceType::class, [
-                'choices' => $types,
-                'expanded' => true,
-                'multiple' => true,
-                'label'    => 'thirdparty.Type'
-            ])
             ->add('telephone', TextType::class, [
                 'label' => 'Phonenumber',
                 'required' => false
@@ -113,24 +136,26 @@ class ThirdPartyType extends AbstractType
                 'attr' => ['class' => 'select2']
             ])
         ;
-        $builder->add('address', HiddenType::class);
-        $builder->get('address')
-            ->addModelTransformer(new CallbackTransformer(
-                function (?Address $address): string {
-                    if (null === $address) {
-                        return '';
+
+        $builder
+            ->add('address', HiddenType::class)
+            ->get('address')
+                ->addModelTransformer(new CallbackTransformer(
+                    function (?Address $address): string {
+                        if (null === $address) {
+                            return '';
+                        }
+                        return $address->getId();
+                    },
+                    function (?string $addressId): ?Address {
+                        if (null === $addressId) {
+                            return null;
+                        }
+                        return $this->om
+                            ->getRepository(Address::class)
+                            ->findOneBy(['id' => (int) $addressId]);
                     }
-                    return $address->getId();
-                },
-                function (string $addressId): ?Address {
-                    if ('' === $addressId) {
-                        return null;
-                    }
-                    return $this->om
-                        ->getRepository(Address::class)
-                        ->findOneBy(['id' => (int) $addressId]);
-                }
-            ))
+                ))
         ;
 
         // Contact Person ThirdParty (child)
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index fc0bb1a88..4fa9847c0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -26,8 +26,8 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.categories) }}
             {{ form_row(form.type) }}
+            {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 768f4369e..340ecf15b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -43,8 +43,8 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.categories) }}
             {{ form_row(form.type) }}
+            {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
             {{ form_row(form.email) }}

From c2f75654dd8b683da68d9f22e3a9342628502766 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 18:17:06 +0200
Subject: [PATCH 116/217] move _insert_vue_address include template in main,
 make it more generic

because it is used with person and household,
but prepare to extend for thirdparty
---
 .../Address/_insert_vue_address.html.twig     | 30 +++++++------------
 .../Resources/views/Address/edit.html.twig    |  4 ++-
 .../Resources/views/Address/list.html.twig    | 18 +++++++----
 .../Resources/views/Address/new.html.twig     |  4 ++-
 .../views/Household/address_edit.html.twig    |  4 ++-
 .../views/Household/address_move.html.twig    |  4 ++-
 .../views/Household/addresses.html.twig       |  7 +++--
 .../views/Household/summary.html.twig         |  4 ++-
 8 files changed, 42 insertions(+), 33 deletions(-)
 rename src/Bundle/{ChillPersonBundle => ChillMainBundle}/Resources/views/Address/_insert_vue_address.html.twig (67%)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
similarity index 67%
rename from src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index e235aae15..fabfc69cb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -3,8 +3,12 @@
     It push all variables from context in Address/App.vue.
 
     OPTIONS
-    * mode          string ['edit*'|'new'|'create']
-    * address_id    integer
+    * targetEntity  {
+          name:     string
+          id:       integer
+      }
+    * mode          string ['edit*'|'create']
+    * addressId     integer
     * backUrl       twig route:   path('route', {parameters})
     * modalTitle    twig translated chain
     * buttonText    twig translated chain
@@ -19,29 +23,18 @@
 <script type="text/javascript">
     window.vueRootComponent = 'app';
 
-    {% if person is defined %}
-        window.entityType = 'person';
-        window.entityId = {{ person.id|e('js') }};
-    {% elseif household is defined %}
-        window.entityType = 'household';
-        window.entityId = {{ household.id|e('js') }};
-    {% endif %}
+    window.entityType = '{{ targetEntity.name|e('js') }}';
+    window.entityId = '{{ targetEntity.id|e('js') }}';
 
     {% if 'edit' in app.request.get('_route') %}
+        window.mode = 'edit';
         window.addressId = {{ app.request.get('address_id')|e('js') }};
-        window.mode = 'edit';
     {% elseif mode is defined and mode == 'edit' %}
-        window.addressId = {{ address_id|e('js') }};
         window.mode = 'edit';
+        window.addressId = {{ addressId|e('js') }};
     {% endif %}
 
-    {% if backUrl is not defined %}
-        {% if person is defined %}
-            window.backUrl = '{{ path('chill_person_address_list', { 'person_id': person.id })|e('js') }}';
-        {% elseif household is defined %}
-            window.backUrl = '{{ path('chill_person_household_addresses', { 'household_id': household.id })|e('js') }}';
-        {% endif %}
-    {% else %}
+    {% if backUrl is defined %}
         window.backUrl = '{{ backUrl|e('js') }}';
     {% endif %}
 
@@ -49,7 +42,6 @@
         window.modalTitle = '{{ modalTitle|trans|e('js') }}';
     {% endif %}
 
-
     {% if buttonText is defined %}
         window.buttonText = '{{ buttonText|trans|e('js') }}';
     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 50bc14171..954bbf348 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -27,7 +27,9 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'person', id: person.id },
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index db136592f..2c2da145f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -29,8 +29,10 @@
         <li style="margin: auto;">
 
             {# include vue_address component #}
-            {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                mode: 'new',
+            {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                targetEntity: { name: 'person', id: person.id },
+                backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+                mode: 'create',
                 buttonSize: 'btn-lg',
                 buttonText: 'Add an address',
                 modalTitle: 'Add an address',
@@ -67,9 +69,11 @@
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'person', id: person.id },
+                            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
+                            addressId: address.id,
                             binModalStep1: false,
                             binModalStep2: false,
                         } %}
@@ -81,9 +85,11 @@
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
                     {#
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                            address_id: address.id,
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'person', id: person.id },
+                            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
+                            addressId: address.id,
                             binModalStep1: false,
                             binModalStep2: false,
                         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 3abd650f5..d5a55c760 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -27,7 +27,9 @@
         <h1>{{ block('title') }}</h1>
 
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'person', id: person.id },
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 446cd769b..63ff0a041 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -7,7 +7,9 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'household', id: household.id },
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index b2da2097a..f744f5d9f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -7,7 +7,9 @@
 
     <div>
         {# include vue_address component #}
-        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+            targetEntity: { name: 'household', id: household.id },
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
             binModalStep1: false,
             binModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 2acd68731..087e8be11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -15,9 +15,10 @@
             <li style="margin: auto;">
 
                 {# include vue_address component #}
-                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                    mode: 'new',
-                    backUrl: chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }),
+                {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                    targetEntity: { name: 'household', id: household.id },
+                    backUrl: path('chill_person_household_address_move', { 'household_id': household.id }),
+                    mode: 'create',
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 9b553f0f0..faf9f13d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -30,7 +30,9 @@
                 <ul class="list-inline text-right mt-2">
                     <li class="list-inline-item">
                         {# include vue_address component #}
-                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'household', id: household.id },
+                            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             buttonText: 'Move household',

From 9725970c56458a66087c84242fda618f5ad5b925 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 18:21:18 +0200
Subject: [PATCH 117/217] tp: adapt _insert_vue_address include parameters

---
 .../components/CourseLocation.vue             |  1 -
 .../Resources/views/Address/list.html.twig    |  6 +-
 .../views/Household/addresses.html.twig       |  3 -
 .../Address/_insert_vue_address.html.twig     | 77 -------------------
 .../Resources/views/ThirdParty/new.html.twig  | 12 +--
 .../views/ThirdParty/update.html.twig         | 10 ++-
 6 files changed, 16 insertions(+), 93 deletions(-)
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 8538db3bc..fab49a20b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -4,7 +4,6 @@
          {{ $t('courselocation.title') }}
       </h2>
 
-      <!-- {# include vue_address component #} -->
       <div v-for="error in displayErrors" class="alert alert-danger my-2">
          {{ error }}
       </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 2c2da145f..811858f97 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -66,8 +66,8 @@
             {% if address.validTo is not empty and address.validTo < previousRowFrom %}
                 <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'person', id: person.id },
@@ -82,8 +82,8 @@
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {# include vue_address component #}
                     {#
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'person', id: person.id },
@@ -115,7 +115,6 @@
                     }) }}
                     <ul class="record_actions">
 
-                        {# include vue_address component #}
                         <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
 
                     </ul>
@@ -166,7 +165,6 @@
             </a>
         </li>
         <li>
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
                 {{ 'Add an address'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 087e8be11..7f35b7ae9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -42,7 +42,6 @@
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
-                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
 
                 <div class="date">
@@ -65,7 +64,6 @@
                 <ul class="record_actions">
                     <li>
 
-                        {# include vue_address component #}
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
@@ -92,7 +90,6 @@
         </li>
         <li>
 
-            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
                 {{ 'Move household'|trans }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
deleted file mode 100644
index 379f71638..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ /dev/null
@@ -1,77 +0,0 @@
-{#
-    This Twig template include load vue_address component.
-    It push all variables from context in Address/App.vue.
-
-    OPTIONS
-    * mode          string ['edit*'|'new'|'create']
-    * address_id    integer
-    * backUrl       twig route:   path('route', {parameters})
-    * modalTitle    twig translated chain
-    * buttonText    twig translated chain
-    * buttonSize    bootstrap class like 'btn-sm'
-    * buttonDisplayText     bool
-    * binModalStep1         bool
-    * binModalStep2         bool
-
-#}
-<div id="address"></div>
-
-<script type="text/javascript">
-    window.vueRootComponent = 'app';
-
-    window.entityType = 'thirdParty';
-    window.entityId = {{ thirdParty.id|e('js') }};
-
-    {% if 'edit' in app.request.get('_route') %}
-        window.addressId = {{ app.request.get('address_id')|e('js') }};
-        window.mode = 'edit';
-    {% elseif mode is defined and mode == 'edit' %}
-        window.addressId = {{ address_id|e('js') }};
-        window.mode = 'edit';
-    {% endif %}
-
-    {% if backUrl is not defined %}
-        window.backUrl = '{{ path('chill_3party_3party_show', { 'thirdparty_id': thirdParty.id })|e('js') }}';
-    {% else %}
-        window.backUrl = '{{ backUrl|e('js') }}';
-    {% endif %}
-
-    {% if modalTitle is defined %}
-        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
-    {% endif %}
-
-
-    {% if buttonText is defined %}
-        window.buttonText = '{{ buttonText|trans|e('js') }}';
-    {% endif %}
-
-    {% if buttonSize is defined %}
-        window.buttonSize = '{{ buttonSize|e('js') }}';
-    {% endif %}
-
-    {% if buttonDisplayText is defined and buttonDisplayText == false %}
-        window.buttonDisplayText = false;
-    {% endif %}
-
-    {% if binModalStep1 is defined and binModalStep1 == false %}
-        window.binModalStep1 = false;
-    {% endif %}
-
-    {% if binModalStep2 is defined and binModalStep2 == false %}
-        window.binModalStep2 = false;
-    {% endif %}
-</script>
-
-{{ encore_entry_script_tags('vue_address') }}
-{{ encore_entry_link_tags('vue_address') }}
-
-{# TODO
-    * un seul fichier include twig qui fais la liaison avec vue_address
-        * dans main
-        * enlever les références à household, person, thirdparty
-    * addAddress
-        * option buttonText est buggée
-        * gestion du step1
-            *
-
-#}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 4fa9847c0..682764f7c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -40,23 +40,25 @@
                     {% if thirdParty.address %}
                         edit address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_new')
                             mode: 'edit',
-                            address_id: thirdParty.address.id,
+                            addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                             binModalStep1: false,
-                            backUrl: path('chill_3party_3party_new')
                         } %}
                     {% else %}
                         create address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_new')
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
                             modalTitle: 'Create a new address',
                             binModalStep1: false,
-                            backUrl: path('chill_3party_3party_new')
                         } %}
                     {% endif %}
                 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 340ecf15b..b2cc7f56d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -57,16 +57,20 @@
                     {% if thirdParty.address %}
                         edit address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
                             mode: 'edit',
-                            address_id: thirdParty.address.id,
+                            addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                             binModalStep1: false
                         } %}
                     {% else %}
                         create address
                         {# include vue_address component #}
-                        {% include '@ChillThirdParty/Address/_insert_vue_address.html.twig' with {
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'thirdparty', id: thirdParty.id },
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             binModalStep1: false

From 310e9f5a82b4b89e031159a5643cac2dcce16270 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 15 Sep 2021 18:41:14 +0200
Subject: [PATCH 118/217] tp: adapt _insert_vue_address include parameters

---
 .../Resources/views/ThirdParty/update.html.twig               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index b2cc7f56d..820330f95 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -59,7 +59,7 @@
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
@@ -70,7 +70,7 @@
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty_id }),
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             binModalStep1: false

From 17a3f45247a07f74a26e5425b34058314a7e1d38 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 15:48:45 +0200
Subject: [PATCH 119/217] AddAddress final submit, managed by callback and not
 an event

---
 .../Resources/public/vuejs/Address/App.vue    | 20 +++---
 .../vuejs/Address/components/AddAddress.vue   | 70 ++++++++++++-------
 .../Address/components/ShowAddressPane.vue    | 13 ++--
 .../Resources/views/ThirdParty/show.html.twig |  4 +-
 4 files changed, 63 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 249b53588..b79840998 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -4,7 +4,7 @@
       v-bind:context="context"
       v-bind:options="addAddress.options"
       v-bind:result="addAddress.result"
-      @submitAddress="submitAddress"
+      v-bind:addressChanged="submitAddress"
       ref="addAddress">
    </add-address>
 </template>
@@ -73,13 +73,11 @@ export default {
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },
-      submitAddress() {
-         console.log('@@@ click on Submit Address Button');
-         let payload = this.$refs.addAddress.submitNewAddress(); // Cast child method
-         this.addDateToAddressAndPostAddressTo(payload);
+      submitAddress(payload) {
+         console.log('@@@ click on Submit Address Button', payload);
+         this.addDateToAddressAndPostAddressTo(payload); // !!
       },
-      addDateToAddressAndPostAddressTo(payload)
-      {
+      addDateToAddressAndPostAddressTo(payload) {
          payload.body = {
             validFrom: {
                datetime: `${this.context.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
@@ -100,11 +98,9 @@ export default {
                this.$refs.addAddress.flag.loading = false;
             });
       },
-
-      postAddressTo(payload)
-      {
+      postAddressTo(payload) {
          console.log('postAddressTo', payload.entity);
-         if (!this.context.edit) {
+         if (!this.context.edit) { // !!
             switch (payload.entity) {
                case 'household':
                   postAddressToHousehold(payload.entityId, payload.addressId)
@@ -141,7 +137,7 @@ export default {
             }
          } else {
             // address is already linked, just finish !
-            window.location.assign(this.context.backUrl);
+            //window.location.assign(this.context.backUrl);
          }
       },
    }
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 19d35381c..8faaa4e5a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -57,9 +57,9 @@
          v-bind:entity="this.entity"
          v-bind:valid="this.context.valid"
          v-bind:flag="this.flag"
-         ref="showAddress"
-         v-bind:insideModal="false" @openEditPane="openEditPane"
-         @submitAddress="$emit('submitAddress')">
+         v-bind:insideModal="false"
+         @openEditPane="openEditPane"
+         ref="showAddress">
       </show-address-pane>
    </div>
 
@@ -110,7 +110,8 @@
          v-bind:default="this.default"
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
-         v-bind:insideModal="false" @closeEditPane="closeEditPane"
+         v-bind:insideModal="false"
+         @closeEditPane="closeEditPane"
          @getCities="getCities"
          @getReferenceAddresses="getReferenceAddresses">
       </edit-address-pane>
@@ -127,8 +128,7 @@ import EditAddressPane from './EditAddressPane.vue';
 
 export default {
    name: "AddAddress",
-   props: ['context', 'options', 'result'],
-   emits: ['submitAddress'],
+   props: ['context', 'options', 'addressChanged'],
    components: {
       Modal,
       ShowAddressPane,
@@ -249,7 +249,7 @@ export default {
             this.getInitialAddress(this.context.addressId);
          }
 
-         // when create new address, start first with editPane
+         // when create new address, start first with editPane !!
          if ( this.context.edit === false
             && this.flag.editPane === false
          ) {
@@ -407,10 +407,19 @@ export default {
             this.updateAddress({
                addressId: this.context.addressId,
                newAddress: newAddress
-            });
+            })
+            .then(payload => {
+                  console.log('payload', payload);
+                  this.addressChanged(payload);
+               }
+            );
+
          } else {
-            this.addNewAddress(newAddress);
+            this.addNewAddress(newAddress)
+            .then(payload => this.addressChanged(payload));
          }
+
+
       },
 
       /*
@@ -428,25 +437,30 @@ export default {
             if (this.context.entity.type === 'person') {
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
-            postPostalCode(postcodeBody)
+            return postPostalCode(postcodeBody)
                .then(postalCode =>  {
                   payload.postcode = {'id': postalCode.id };
-                  this.postNewAddress(payload);
+                  return this.postNewAddress(payload);
                });
 
          } else {
-            this.postNewAddress(payload);
+            return this.postNewAddress(payload);
          }
       },
 
       postNewAddress(payload) {
          //console.log('postNewAddress', payload);
-         postAddress(payload)
+         return postAddress(payload)
             .then(address => new Promise((resolve, reject) => {
                this.entity.address = address;
                this.flag.loading = false;
                this.flag.success = true;
-               resolve();
+               resolve({
+                  entity: this.context.entity.type,
+                  entityId: this.context.entity.id,
+                  addressId: this.entity.address.address_id
+                  }
+               );
             }))
             .catch((error) => {
                this.errorMsg.push(error);
@@ -463,31 +477,37 @@ export default {
          this.flag.loading = true;
 
          // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-         if ('newPostcode' in payload.newAddress) {
 
+         if ('newPostcode' in payload.newAddress) {
             let postcodeBody = payload.newAddress.newPostcode;
             postcodeBody = Object.assign(postcodeBody, {'origin': 3});
 
-            postPostalCode(postcodeBody)
+            return postPostalCode(postcodeBody)
                .then(postalCode => {
+                  console.log('create new postcode', postalCode.id);
                   payload.newAddress.postcode = {'id': postalCode.id };
-                  this.patchExistingAddress(payload);
+                  return this.patchExistingAddress(payload);
                });
 
          } else {
-            this.patchExistingAddress(payload);
+            return this.patchExistingAddress(payload);
          }
       },
 
       patchExistingAddress(payload) {
          console.log('patchExistingAddress', payload);
-         patchAddress(payload.addressId, payload.newAddress)
+         return patchAddress(payload.addressId, payload.newAddress)
             .then(address => new Promise((resolve, reject) => {
-               this.entity.address = address;
-               this.flag.loading = false;
-               this.flag.success = true;
-               resolve();
-            }))
+                  this.entity.address = address;
+                  this.flag.loading = false;
+                  this.flag.success = true;
+                  return resolve({
+                     entity: this.context.entity.type,
+                     entityId: this.context.entity.id,
+                     addressId: this.entity.address.address_id
+                  });
+               })
+            )
             .catch((error) => {
                this.errorMsg.push(error);
                this.flag.loading = false;
@@ -497,7 +517,6 @@ export default {
       /*
       *  Method called by parent when submitting address
       *  (get out step1 show pane, submit button)
-      */
       submitNewAddress()
       {
          let payload = {
@@ -513,6 +532,7 @@ export default {
 
          return payload;
       }
+      */
    }
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index d3894f972..25811f7be 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -4,9 +4,11 @@
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
       <span class="sr-only">{{ $t('loading') }}</span>
    </div>
+
    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
       {{ errorMsg }}
    </div>
+
    <div v-if="flag.success" class="alert alert-success">
       {{ $t(getSuccessText) }}
    </div>
@@ -26,23 +28,24 @@
    </div>
 
    <ul v-if="insideModal == false"
-      class="record_actions sticky-form-buttons">
+      class="record_actions">
+      <!--
       <li class="cancel">
          <a class="btn btn-cancel" v-bind:href="context.backUrl">
             {{ $t('back_to_the_list') }}</a>
-      </li>
+      </li>-->
       <li>
          <a @click.prevent="$emit('openEditPane')"
             class="btn btn-update">
             {{ $t('action.edit')}}
          </a>
       </li>
-      <li>
+      <!--<li>
          <a class="btn btn-save"
             @click.prevent="$emit('submitAddress')">
             {{ $t('action.save')}}
          </a>
-      </li>
+      </li>-->
    </ul>
 </template>
 
@@ -65,7 +68,7 @@ export default {
       'errorMsg',
       'insideModal'
    ],
-   emits: ['openEditPane', 'submitAddress'], //?
+   emits: ['openEditPane'], // 'submitAddress'
    computed: {
       address() {
          return this.entity.address;
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
index 6f647f6b6..d711bdefa 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
@@ -82,7 +82,7 @@
                     {% if thirdParty.address == null %}
                         <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
                     {%  else %}
-                        {{ thirdParty.address|chill_entity_render_box({'with_valid_from': false }) }}
+                        {{ thirdParty.address|chill_entity_render_box({'with_valid_from': false, 'extended_infos': true }) }}
                     {% endif %}
                 </dd>
 
@@ -103,7 +103,7 @@
             <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_3party_3party_index') }}">
-                        {{ 'Cancel'|trans }}
+                        {{ 'Back to the list'|trans }}
                     </a>
                 </li>
 

From a5ceb551eba4965560116570961dde46df148006 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:05:36 +0200
Subject: [PATCH 120/217] twig pass arguments to vue_address with dataset
 attributes

---
 .../Resources/public/vuejs/Address/App.vue    | 62 ++++---------------
 .../Resources/public/vuejs/Address/index.js   | 62 ++++++++++++++++---
 .../Address/_insert_vue_address.html.twig     | 41 ++++++------
 .../Resources/views/Address/edit.html.twig    |  4 +-
 .../Resources/views/Address/list.html.twig    |  8 +--
 .../Resources/views/Address/new.html.twig     |  4 +-
 .../views/Household/address_edit.html.twig    |  4 +-
 .../views/Household/address_move.html.twig    |  4 +-
 8 files changed, 98 insertions(+), 91 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index b79840998..1cde88830 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -2,21 +2,13 @@
    <add-address
       v-bind:key="context.entity.type"
       v-bind:context="context"
-      v-bind:options="addAddress.options"
-      v-bind:result="addAddress.result"
+      v-bind:options="options"
       v-bind:addressChanged="submitAddress"
       ref="addAddress">
    </add-address>
 </template>
 
 <script>
-/*
-*  Address component is a uniq component for many contexts.
-*  Allow to create/attach/edit an address to
-*  - a person (new or edit address),
-*  - a household (move or edit address)
-*
-* */
 import AddAddress from './components/AddAddress.vue';
 import { patchAddress } from "./api";
 import { postAddressToHousehold, postAddressToPerson } from "ChillPersonAssets/vuejs/_api/AddAddress";
@@ -26,49 +18,19 @@ export default {
    components: {
       AddAddress
    },
-   data() {
-      return {
-         context: {
-            edit: window.mode === 'edit',
-            entity: {
-               type: window.entityType,
-               id: window.entityId
-            },
-            addressId: window.addressId | null,
-            backUrl: window.backUrl,
-            valid: {
-               from: new Date()
-            },
-         },
-         addAddress: {
-            options: {
-
-               /// Options override default.
-               /// null value take default component value defined in AddAddress data()
-               button: {
-                  text:  {
-                     create: window.buttonText || null,
-                     edit: window.buttonText || null
-                  },
-                  size: window.buttonSize || null,
-                  displayText: window.buttonDisplayText   //boolean, default: true
-               },
-
-               /// Modal title text if create or edit address (trans chain, see i18n)
-               title: {
-                  create: window.modalTitle || null,
-                  edit: window.modalTitle || null
-               },
-
-               /// Display each step in page or Modal
-               bindModal: {
-                  step1: window.binModalStep1,  //boolean, default: true
-                  step2: window.binModalStep2   //boolean, default: true
-               }
-            }
-         }
+   props: ['addAddress'],
+   computed: {
+      context() {
+         return this.addAddress.context;
+      },
+      options() {
+         return this.addAddress.options;
       }
    },
+   mounted() {
+      console.log('AddAddress: data context', this.context);
+      console.log('AddAddress: data options', this.options);
+   },
    methods: {
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index bb2dd6543..31c84ecf3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -1,13 +1,61 @@
 import { createApp } from 'vue';
-import App from './App.vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
 import { addressMessages } from './i18n';
+import App from './App.vue';
 
 const i18n = _createI18n( addressMessages );
 
-const app = createApp({
-    template: `<app></app>`,
-})
-.use(i18n)
-.component('app', App)
-.mount('#address');
+let containers = document.querySelectorAll('.address-container');
+containers.forEach((container) => {
+    const app = createApp({
+        template: `<app v-bind:addAddress="this.addAddress" ></app>`,
+        data() {
+            return {
+                addAddress: {
+                    context: {
+                        edit: container.dataset.mode === 'edit',
+                        entity: {
+                            type: container.dataset.targetEntityName,
+                            id: container.dataset.targetEntityId
+                        },
+                        addressId: container.dataset.addressId | null,
+                        backUrl: container.dataset.backUrl,
+                        valid: {
+                            from: new Date()
+                        },
+                    },
+                    options: {
+
+                        /// Options override default.
+                        /// null value take default component value defined in AddAddress data()
+                        button: {
+                            text:  {
+                                create: container.dataset.buttonText || null,
+                                edit: container.dataset.buttonText || null
+                            },
+                            size: container.dataset.buttonSize || null,
+                            displayText: container.dataset.buttonDisplayText   //boolean, default: true
+                        },
+
+                        /// Modal title text if create or edit address (trans chain, see i18n)
+                        title: {
+                            create: container.dataset.modalTitle || null,
+                            edit: container.dataset.modalTitle || null
+                        },
+
+                        /// Display each step in page or Modal
+                        bindModal: {
+                            step1: container.dataset.bindModalStep1,  //boolean, default: true
+                            step2: container.dataset.bindModalStep2   //boolean, default: true
+                        }
+                    }
+                }
+            }
+        }
+    })
+    .use(i18n)
+    .component('app', App)
+    .mount(container);
+
+    console.log('container dataset', container.dataset);
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index fabfc69cb..2d521ccae 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -14,54 +14,51 @@
     * buttonText    twig translated chain
     * buttonSize    bootstrap class like 'btn-sm'
     * buttonDisplayText     bool
-    * binModalStep1         bool
-    * binModalStep2         bool
+    * bindModalStep1         bool
+    * bindModalStep2         bool
 
 #}
-<div id="address"></div>
+<div class="address-container"
 
-<script type="text/javascript">
-    window.vueRootComponent = 'app';
-
-    window.entityType = '{{ targetEntity.name|e('js') }}';
-    window.entityId = '{{ targetEntity.id|e('js') }}';
+     data-target-entity-name="{{ targetEntity.name|e('html_attr') }}"
+     data-target-entity-id="{{ targetEntity.id|e('html_attr') }}"
 
     {% if 'edit' in app.request.get('_route') %}
-        window.mode = 'edit';
-        window.addressId = {{ app.request.get('address_id')|e('js') }};
+        data-mode="edit"
+        data-address-id="{{ app.request.get('address_id')|e('html_attr') }}"
     {% elseif mode is defined and mode == 'edit' %}
-        window.mode = 'edit';
-        window.addressId = {{ addressId|e('js') }};
+        data-mode="edit"
+        data-address-id="{{ addressId|e('html_attr') }}"
     {% endif %}
 
     {% if backUrl is defined %}
-        window.backUrl = '{{ backUrl|e('js') }}';
+        data-back-url="{{ backUrl|e('html_attr') }}"
     {% endif %}
 
     {% if modalTitle is defined %}
-        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
+        data-modal-title="{{ modalTitle|trans|e('html_attr') }}"
     {% endif %}
 
     {% if buttonText is defined %}
-        window.buttonText = '{{ buttonText|trans|e('js') }}';
+        data-button-text="{{ buttonText|trans|e('html_attr') }}"
     {% endif %}
 
     {% if buttonSize is defined %}
-        window.buttonSize = '{{ buttonSize|e('js') }}';
+        data-button-size="{{ buttonSize|e('html_attr') }}"
     {% endif %}
 
     {% if buttonDisplayText is defined and buttonDisplayText == false %}
-        window.buttonDisplayText = false;
+        data-button-display-text=false
     {% endif %}
 
-    {% if binModalStep1 is defined and binModalStep1 == false %}
-        window.binModalStep1 = false;
+    {% if bindModalStep1 is defined and bindModalStep1 == false %}
+        data-bind-modal-step1=false
     {% endif %}
 
-    {% if binModalStep2 is defined and binModalStep2 == false %}
-        window.binModalStep2 = false;
+    {% if bindModalStep2 is defined and bindModalStep2 == false %}
+        data-bind-modal-step2=false
     {% endif %}
-</script>
+></div>
 
 {{ encore_entry_script_tags('vue_address') }}
 {{ encore_entry_link_tags('vue_address') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 954bbf348..20713ec49 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -30,8 +30,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 2c2da145f..3719e0ebe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -74,8 +74,8 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            bindModalStep1: false,
+                            bindModalStep2: false,
                         } %}
                     #}
 
@@ -90,8 +90,8 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            bindModalStep1: false,
+                            bindModalStep2: false,
                         } %}
                     #}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index d5a55c760..96c317234 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,8 +30,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 63ff0a041..353ba09a5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,8 +10,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index f744f5d9f..b6fc39dd9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,8 +10,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
     </div>
 

From da32afeb3fe2edede24eca017ced43a9477e763e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:06:39 +0200
Subject: [PATCH 121/217] addAddress: improve boolean variables

---
 .../vuejs/Address/components/AddAddress.vue      |  3 +++
 .../Resources/public/vuejs/Address/index.js      | 16 +++++++---------
 .../views/Address/_insert_vue_address.html.twig  | 12 ++++++------
 .../Resources/views/Household/summary.html.twig  |  6 +++++-
 4 files changed, 21 insertions(+), 16 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 8faaa4e5a..57ee15a06 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -187,6 +187,9 @@ export default {
    },
    computed: {
       step1WithModal() {
+         console.log('options displayText', this.options.button.displayText);
+         console.log('options bindModal.step1', this.options.bindModal.step1);
+         console.log('options bindModal.step2', this.options.bindModal.step2);
          return (this.options.bindModal !== null && typeof this.options.bindModal.step1 !== 'undefined') ?
             this.options.bindModal.step1 : this.default.bindModal.step1;
       },
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 31c84ecf3..5443601e1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -7,25 +7,25 @@ const i18n = _createI18n( addressMessages );
 
 let containers = document.querySelectorAll('.address-container');
 containers.forEach((container) => {
+
     const app = createApp({
         template: `<app v-bind:addAddress="this.addAddress" ></app>`,
         data() {
             return {
                 addAddress: {
                     context: {
-                        edit: container.dataset.mode === 'edit',
                         entity: {
                             type: container.dataset.targetEntityName,
                             id: container.dataset.targetEntityId
                         },
-                        addressId: container.dataset.addressId | null,
-                        backUrl: container.dataset.backUrl,
+                        edit: container.dataset.mode === 'edit',  //boolean
+                        addressId: container.dataset.addressId || null,
+                        backUrl: container.dataset.backUrl || null,
                         valid: {
                             from: new Date()
                         },
                     },
                     options: {
-
                         /// Options override default.
                         /// null value take default component value defined in AddAddress data()
                         button: {
@@ -34,19 +34,17 @@ containers.forEach((container) => {
                                 edit: container.dataset.buttonText || null
                             },
                             size: container.dataset.buttonSize || null,
-                            displayText: container.dataset.buttonDisplayText   //boolean, default: true
+                            displayText: container.dataset.buttonDisplayText !== 'false'  //boolean, default: true
                         },
-
                         /// Modal title text if create or edit address (trans chain, see i18n)
                         title: {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
-
                         /// Display each step in page or Modal
                         bindModal: {
-                            step1: container.dataset.bindModalStep1,  //boolean, default: true
-                            step2: container.dataset.bindModalStep2   //boolean, default: true
+                            step1: container.dataset.bindModalStep1 !== 'false',  //boolean, default: true
+                            step2: container.dataset.bindModalStep2 !== 'false'   //boolean, default: true
                         }
                     }
                 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 2d521ccae..4b38f288f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -47,16 +47,16 @@
         data-button-size="{{ buttonSize|e('html_attr') }}"
     {% endif %}
 
-    {% if buttonDisplayText is defined and buttonDisplayText == false %}
-        data-button-display-text=false
+    {% if buttonDisplayText is defined and buttonDisplayText != 1 %}
+        data-button-display-text="false"
     {% endif %}
 
-    {% if bindModalStep1 is defined and bindModalStep1 == false %}
-        data-bind-modal-step1=false
+    {% if bindModalStep1 is defined and bindModalStep1 != 1 %}
+        data-bind-modal-step1="false"
     {% endif %}
 
-    {% if bindModalStep2 is defined and bindModalStep2 == false %}
-        data-bind-modal-step2=false
+    {% if bindModalStep2 is defined and bindModalStep2 != 1 %}
+        data-bind-modal-step2="false"
     {% endif %}
 ></div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index faf9f13d6..a680f18f2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -37,8 +37,12 @@
                             buttonSize: 'btn-sm',
                             buttonText: 'Move household',
                             modalTitle: 'Move household',
-                            buttonDisplayText: false
+                            buttonDisplayText: false,
                         } %}
+                        {#
+                            bindModalStep1: false,
+                            bindModalStep2: true,
+                        #}
                     </li>
                     <li class="list-inline-item">
                         <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"

From 9ff58fe0c393e78de30f21fcdd60d53ae5175120 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:12:32 +0200
Subject: [PATCH 122/217] Address: replace variable entity.type by entity.name

---
 .../Resources/public/vuejs/Address/App.vue                | 2 +-
 .../public/vuejs/Address/components/AddAddress.vue        | 8 ++++----
 .../public/vuejs/Address/components/ShowAddressPane.vue   | 4 ++--
 .../Resources/public/vuejs/Address/index.js               | 2 +-
 .../AccompanyingCourse/components/ButtonLocation.vue      | 2 +-
 .../AccompanyingCourse/components/CourseLocation.vue      | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 1cde88830..21b4ce5ef 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,6 +1,6 @@
 <template>
    <add-address
-      v-bind:key="context.entity.type"
+      v-bind:key="context.entity.name"
       v-bind:context="context"
       v-bind:options="options"
       v-bind:addressChanged="submitAddress"
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 57ee15a06..3ab9fe12e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -437,7 +437,7 @@ export default {
          if ('newPostcode' in payload) {
 
             let postcodeBody = payload.newPostcode;
-            if (this.context.entity.type === 'person') {
+            if (this.context.entity.name === 'person') {
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
             return postPostalCode(postcodeBody)
@@ -459,7 +459,7 @@ export default {
                this.flag.loading = false;
                this.flag.success = true;
                resolve({
-                  entity: this.context.entity.type,
+                  entity: this.context.entity.name,
                   entityId: this.context.entity.id,
                   addressId: this.entity.address.address_id
                   }
@@ -505,7 +505,7 @@ export default {
                   this.flag.loading = false;
                   this.flag.success = true;
                   return resolve({
-                     entity: this.context.entity.type,
+                     entity: this.context.entity.name,
                      entityId: this.context.entity.id,
                      addressId: this.entity.address.address_id
                   });
@@ -523,7 +523,7 @@ export default {
       submitNewAddress()
       {
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             addressId: this.entity.address.address_id
          };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index 25811f7be..4e9e59874 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -82,10 +82,10 @@ export default {
          }
       },
       getValidFromDateText() {
-         return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';
+         return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
       },
       getSuccessText() {
-         switch (this.context.entity.type) {
+         switch (this.context.entity.name) {
             /*
             case 'household':
                return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 5443601e1..a4d933cdd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -15,7 +15,7 @@ containers.forEach((container) => {
                 addAddress: {
                     context: {
                         entity: {
-                            type: container.dataset.targetEntityName,
+                            name: container.dataset.targetEntityName,
                             id: container.dataset.targetEntityId
                         },
                         edit: container.dataset.mode === 'edit',  //boolean
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index f4f2f1c78..86f9cb4f8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -54,7 +54,7 @@ export default {
       assignAddress() {
         //console.log('assignAddress id', this.person.current_household_address);
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'person',
             personId: this.person.id
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 8538db3bc..d19449253 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -119,7 +119,7 @@ export default {
       initAddressContext() {
          let context = {
             entity: {
-               type: this.accompanyingCourse.type,
+               name: this.accompanyingCourse.type,
                id: this.accompanyingCourse.id
             },
             edit: false,
@@ -134,7 +134,7 @@ export default {
       removeAddress() {
         //console.log('remove address');
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'none'
          };

From 8dbdc28df1c89f5d6e8a25c53d8f83f75523ea2e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:25:34 +0200
Subject: [PATCH 123/217] vue_accourse: AddAddress final submit, managed by
 callback and not an event

---
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index d19449253..293d8db75 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -42,7 +42,7 @@
                   :key="addAddress.type"
                   :options="addAddress.options"
                   :result="addAddress.result"
-                  @submitAddress="submitTemporaryAddress"
+                  :addressChanged="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
             </li>
@@ -143,9 +143,8 @@ export default {
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },
-      submitTemporaryAddress() {
+      submitTemporaryAddress(payload) {
         //console.log('@@@ click on Submit Temporary Address Button');
-         let payload = this.$refs.addAddress.submitNewAddress();
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
          this.$store.commit('setEditContextTrue');

From aae2ee32f6abadec05c2ab18deb6cd0a3977c103 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 19:33:34 +0200
Subject: [PATCH 124/217] add-address sub-component key

---
 .../ChillMainBundle/Resources/public/vuejs/Address/App.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 21b4ce5ef..15635842d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,6 +1,6 @@
 <template>
    <add-address
-      v-bind:key="context.entity.name"
+      v-bind:key="key"
       v-bind:context="context"
       v-bind:options="options"
       v-bind:addressChanged="submitAddress"
@@ -25,7 +25,12 @@ export default {
       },
       options() {
          return this.addAddress.options;
+      },
+      key() {
+         return (this.context.edit) ? 'address_' + this.context.addressId
+            : this.context.entity.name + '_' + this.context.entity.id ;
       }
+
    },
    mounted() {
       console.log('AddAddress: data context', this.context);

From 2aa0bbf371895bb1785173a54e99f1b4399bb824 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 20:00:46 +0200
Subject: [PATCH 125/217] tp: fix bindModalStep variable rename with
 _insert_vue_address

---
 .../Resources/views/ThirdParty/new.html.twig              | 8 ++++----
 .../Resources/views/ThirdParty/update.html.twig           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 682764f7c..cbccc8ad2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -42,23 +42,23 @@
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_new')
+                            backUrl: path('chill_3party_3party_new'),
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            binModalStep1: false,
+                            bindModalStep1: false,
                         } %}
                     {% else %}
                         create address
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_new')
+                            backUrl: path('chill_3party_3party_new'),
                             mode: 'create',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
                             modalTitle: 'Create a new address',
-                            binModalStep1: false,
+                            bindModalStep1: false,
                         } %}
                     {% endif %}
                 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 820330f95..579c73d26 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -63,7 +63,7 @@
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            binModalStep1: false
+                            bindModalStep1: false
                         } %}
                     {% else %}
                         create address
@@ -73,7 +73,7 @@
                             backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'create',
                             buttonSize: 'btn-sm',
-                            binModalStep1: false
+                            bindModalStep1: false
                         } %}
                     {% endif %}
                 </div>

From f66df3b77c7ac99939f3973a9dd18c5337a4e34c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 20:36:11 +0200
Subject: [PATCH 126/217] fix include parameters missing comma

---
 .../Resources/views/Household/address_edit.html.twig            | 2 +-
 .../Resources/views/Household/address_move.html.twig            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 353ba09a5..2bc2b6cd0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -9,7 +9,7 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             bindModalStep1: false,
             bindModalStep2: false,
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index b6fc39dd9..6d65c0a7f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -9,7 +9,7 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             bindModalStep1: false,
             bindModalStep2: false,
         } %}

From c58d1eccc5c03e6e8115c1cffd528804f9102d1c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 20:49:46 +0200
Subject: [PATCH 127/217] AddAddress: rename callback method

---
 .../Resources/public/vuejs/Address/App.vue    |  2 +-
 .../vuejs/Address/components/AddAddress.vue   | 27 +++++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 15635842d..e4d332289 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -3,7 +3,7 @@
       v-bind:key="key"
       v-bind:context="context"
       v-bind:options="options"
-      v-bind:addressChanged="submitAddress"
+      v-bind:addressChangedCallback="submitAddress"
       ref="addAddress">
    </add-address>
 </template>
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 3ab9fe12e..88e4d8be3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -128,7 +128,7 @@ import EditAddressPane from './EditAddressPane.vue';
 
 export default {
    name: "AddAddress",
-   props: ['context', 'options', 'addressChanged'],
+   props: ['context', 'options', 'addressChangedCallback'],
    components: {
       Modal,
       ShowAddressPane,
@@ -413,16 +413,14 @@ export default {
             })
             .then(payload => {
                   console.log('payload', payload);
-                  this.addressChanged(payload);
+                  this.closePaneAndCallbackSubmit(payload);
                }
             );
 
          } else {
             this.addNewAddress(newAddress)
-            .then(payload => this.addressChanged(payload));
+            .then(payload => this.closePaneAndCallbackSubmit(payload));
          }
-
-
       },
 
       /*
@@ -518,24 +516,19 @@ export default {
       },
 
       /*
-      *  Method called by parent when submitting address
+      *  Method just add closing pane to the callback method
       *  (get out step1 show pane, submit button)
-      submitNewAddress()
+      */
+      closePaneAndCallbackSubmit(payload)
       {
-         let payload = {
-            entity: this.context.entity.name,
-            entityId: this.context.entity.id,
-            addressId: this.entity.address.address_id
-         };
+         console.log('close pane and call parent callback method', payload);
 
-         console.log('submitNewAddress return', payload);
-
-         this.initForm();
+         //this.initForm();
          this.flag.showPane = false;
 
-         return payload;
+         // callback props method from parent
+         this.addressChangedCallback(payload);
       }
-      */
    }
 }
 </script>

From 6ab1391bd898b751c8b1bbbbba7a719ae00d701c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 21:21:40 +0200
Subject: [PATCH 128/217] addAddress: allow other rootcomponent to not precise
 bindmodal options

---
 .../public/vuejs/Address/components/AddAddress.vue     | 10 +++++-----
 .../Resources/public/vuejs/Address/index.js            |  4 +++-
 2 files changed, 8 insertions(+), 6 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 88e4d8be3..17e1a1a27 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -187,14 +187,14 @@ export default {
    },
    computed: {
       step1WithModal() {
-         console.log('options displayText', this.options.button.displayText);
-         console.log('options bindModal.step1', this.options.bindModal.step1);
-         console.log('options bindModal.step2', this.options.bindModal.step2);
-         return (this.options.bindModal !== null && typeof this.options.bindModal.step1 !== 'undefined') ?
+         //console.log('options displayText', this.options.button.displayText);
+         //console.log('options bindModal.step1', this.options.bindModal.step1);
+         //console.log('options bindModal.step2', this.options.bindModal.step2);
+         return (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step1 !== 'undefined') ?
             this.options.bindModal.step1 : this.default.bindModal.step1;
       },
       step2WithModal() {
-         let step2 = (this.options.bindModal !== null && typeof this.options.bindModal.step2 !== 'undefined') ?
+         let step2 = (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step2 !== 'undefined') ?
             this.options.bindModal.step2 : this.default.bindModal.step2;
 
          if (step2 === false && this.step1WithModal === true) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index a4d933cdd..8da0856de 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -45,7 +45,9 @@ containers.forEach((container) => {
                         bindModal: {
                             step1: container.dataset.bindModalStep1 !== 'false',  //boolean, default: true
                             step2: container.dataset.bindModalStep2 !== 'false'   //boolean, default: true
-                        }
+                        },
+                        // Hide ValidFrom Date fields
+                        //hideDateFrom: true
                     }
                 }
             }

From 7ab57eba9a1d40dfb5facaf3fe23e9f48e1f42ad Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 22:01:10 +0200
Subject: [PATCH 129/217] AddAddress: adding useDate.validFrom/validTo options

---
 .../vuejs/Address/components/AddAddress.vue   | 20 ++++++++---
 .../Address/components/ShowAddressPane.vue    | 33 ++++++++++++++++---
 .../Resources/public/vuejs/Address/i18n.js    |  1 +
 .../Resources/public/vuejs/Address/index.js   | 12 +++----
 .../Address/_insert_vue_address.html.twig     |  8 +++++
 .../components/CourseLocation.vue             |  5 ++-
 .../components/Household.vue                  |  5 ++-
 .../Resources/views/Address/new.html.twig     |  2 ++
 8 files changed, 67 insertions(+), 19 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 17e1a1a27..2a210e992 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -29,7 +29,6 @@
                v-bind:options="this.options"
                v-bind:default="this.default"
                v-bind:entity="this.entity"
-               v-bind:valid="this.context.valid"
                v-bind:flag="this.flag"
                ref="showAddress">
             </show-address-pane>
@@ -55,7 +54,6 @@
          v-bind:options="this.options"
          v-bind:default="this.default"
          v-bind:entity="this.entity"
-         v-bind:valid="this.context.valid"
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
          @openEditPane="openEditPane"
@@ -153,6 +151,10 @@ export default {
                step1: true,
                step2: true,
             },
+            useDate: {
+               validFrom: false,
+               validTo: false
+            }
          },
          entity: {
             address: {}, // <== loaded and returned
@@ -173,6 +175,10 @@ export default {
                writeNew: {
                   address: false,
                   postcode: false
+               },
+               valid: {
+                  from: new Date(),
+                  to:  new Date()
                }
             },
             addressMap: {
@@ -187,9 +193,6 @@ export default {
    },
    computed: {
       step1WithModal() {
-         //console.log('options displayText', this.options.button.displayText);
-         //console.log('options bindModal.step1', this.options.bindModal.step1);
-         //console.log('options bindModal.step2', this.options.bindModal.step2);
          return (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step1 !== 'undefined') ?
             this.options.bindModal.step1 : this.default.bindModal.step1;
       },
@@ -236,6 +239,13 @@ export default {
       }
    },
    mounted() {
+
+      //console.log('options displayText', this.options.button.displayText);
+      //console.log('options bindModal.step1', this.options.bindModal.step1);
+      //console.log('options bindModal.step2', this.options.bindModal.step2);
+      console.log('options useDate.validFrom', this.options.useDate.validFrom);
+      console.log('options useDate.validTo', this.options.useDate.validTo);
+
       if (!this.step1WithModal) {
          //console.log('Mounted now !');
          this.openShowPane();
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index 4e9e59874..7e55f0c1b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -27,6 +27,18 @@
       </div>
    </div>
 
+   <div v-if="showDateTo" class='address-valid date-until'>
+      <h3>{{ $t(getValidToDateText) }}</h3>
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
+         <input type="date" class="form-control form-control-lg" name="validTo"
+                v-bind:placeholder="$t(getValidToDateText)"
+                v-model="validTo"
+                aria-describedby="validTo"
+         />
+      </div>
+   </div>
+
    <ul v-if="insideModal == false"
       class="record_actions">
       <!--
@@ -64,7 +76,6 @@ export default {
       'default',
       'flag',
       'entity',
-      'valid',
       'errorMsg',
       'insideModal'
    ],
@@ -75,15 +86,26 @@ export default {
       },
       validFrom: {
          set(value) {
-            this.valid.from = ISOToDate(value);
+            this.entity.selected.valid.from = ISOToDate(value);
          },
          get() {
-            return dateToISO(this.valid.from);
+            return dateToISO(this.entity.selected.valid.from);
+         }
+      },
+      validTo: {
+         set(value) {
+            this.entity.selected.valid.to = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.entity.selected.valid.from);
          }
       },
       getValidFromDateText() {
          return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
       },
+      getValidToDateText() {
+         return 'validTo';
+      },
       getSuccessText() {
          switch (this.context.entity.name) {
             /*
@@ -97,7 +119,10 @@ export default {
          }
       },
       showDateFrom() {
-         return !this.context.edit && !this.options.hideDateFrom;
+         return !this.context.edit && this.options.useDate.validFrom;
+      },
+      showDateTo() {
+         return !this.context.edit && this.options.useDate.validTo;
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index c938ae86d..b41da821f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -30,6 +30,7 @@ const addressMessages = {
         postalCode_code: 'Code postal',
         date: "Date de la nouvelle adresse",
         validFrom: "L'adresse est valable à partir du",
+        validTo: "L'adresse est valable jusqu'au",
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
         address_new_success: 'La nouvelle adresse est enregistrée',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 8da0856de..cb628586a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -20,10 +20,7 @@ containers.forEach((container) => {
                         },
                         edit: container.dataset.mode === 'edit',  //boolean
                         addressId: container.dataset.addressId || null,
-                        backUrl: container.dataset.backUrl || null,
-                        valid: {
-                            from: new Date()
-                        },
+                        backUrl: container.dataset.backUrl || null
                     },
                     options: {
                         /// Options override default.
@@ -46,8 +43,11 @@ containers.forEach((container) => {
                             step1: container.dataset.bindModalStep1 !== 'false',  //boolean, default: true
                             step2: container.dataset.bindModalStep2 !== 'false'   //boolean, default: true
                         },
-                        // Hide ValidFrom Date fields
-                        //hideDateFrom: true
+                        // Use Date fields
+                        useDate: {
+                            validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
+                            validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
+                        }
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 4b38f288f..05f557d44 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -58,6 +58,14 @@
     {% if bindModalStep2 is defined and bindModalStep2 != 1 %}
         data-bind-modal-step2="false"
     {% endif %}
+
+    {% if useValidFrom is defined and useValidFrom == 1 %}
+        data-use-valid-from="true"
+    {% endif %}
+
+    {% if useValidTo is defined and useValidTo == 1 %}
+        data-use-valid-to="true"
+    {% endif %}
 ></div>
 
 {{ encore_entry_script_tags('vue_address') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 293d8db75..df2febe3f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -92,7 +92,10 @@ export default {
                bindModal: {
                   //step1: false, step2: false
                },
-               hideDateFrom: true
+               // Use Date fields
+               useDate: {
+                  validFrom: true
+               }
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index d1aa166b2..50f20a714 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -195,9 +195,8 @@ export default {
         },
         key: 'household_new',
         options: {
-          hideDateFrom: true,
-          bindModal: {
-
+          useDate: {
+             validFrom: true
           },
           button: {
             text:  {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 96c317234..d3102fda5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -32,6 +32,8 @@
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             bindModalStep1: false,
             bindModalStep2: false,
+            useValidFrom: true,
+            useValidTo: false
         } %}
 
     {% endblock %}

From 6e42b0862715105b6666f6257688a485432cee5e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 08:19:12 +0200
Subject: [PATCH 130/217] Address: remove unused file

---
 .../AddAddress/SelectHouseholdAddress.vue     | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
deleted file mode 100644
index 74ce14c3c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-   <div class="container">
-      <VueMultiselect
-         v-model="value"
-         @select="selectAddress"
-         name="field"
-         track-by="id"
-         label="value"
-         :custom-label="transName"
-         :multiple="false"
-         :placeholder="$t('select_address')"
-         :options="addresses">
-      </VueMultiselect>
-   </div>
-</template>
-
-<script>
-import VueMultiselect from 'vue-multiselect';
-
-export default {
-   name: 'SelectHouseholdAddress',
-   components: { VueMultiselect },
-   props: ['address'],
-   data() {
-      return {
-         value: null
-      }
-   },
-   computed: {
-      addresses() {
-         return this.address.loaded.addresses;
-      }
-   },
-   methods: {
-      transName(value) {
-         return `${value.text} ${value.postcode.name}`
-      },
-      selectAddress(value) {
-         this.address.selected.address = value;
-      }
-   }
-};
-</script>
-
-<style src="vue-multiselect/dist/vue-multiselect.css"></style>
-
-

From 4bafa83b65297ccf621c2c8775ceb7d5cfec3da4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 08:27:58 +0200
Subject: [PATCH 131/217] Address: rename [Show|Edit]AddressPane files

---
 .../vuejs/Address/components/AddAddress.vue   | 24 +++++++++----------
 .../{EditAddressPane.vue => EditPane.vue}     |  2 +-
 .../{ShowAddressPane.vue => ShowPane.vue}     |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/{EditAddressPane.vue => EditPane.vue} (99%)
 rename src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/{ShowAddressPane.vue => ShowPane.vue} (99%)

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 2a210e992..248e7da2b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -24,14 +24,14 @@
          </template>
 
          <template v-slot:body>
-            <show-address-pane
+            <show-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
                v-bind:default="this.default"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
                ref="showAddress">
-            </show-address-pane>
+            </show-pane>
          </template>
 
          <template v-slot:footer>
@@ -49,7 +49,7 @@
    </teleport>
    <div class="mt-4" v-else>
 
-      <show-address-pane v-if="flag.showPane"
+      <show-pane v-if="flag.showPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
          v-bind:default="this.default"
@@ -58,7 +58,7 @@
          v-bind:insideModal="false"
          @openEditPane="openEditPane"
          ref="showAddress">
-      </show-address-pane>
+      </show-pane>
    </div>
 
    <!-- step 2 -->
@@ -77,7 +77,7 @@
          </template>
 
          <template v-slot:body>
-            <edit-address-pane
+            <edit-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
                v-bind:default="this.default"
@@ -85,7 +85,7 @@
                v-bind:flag="this.flag"
                @getCities="getCities"
                @getReferenceAddresses="getReferenceAddresses">
-            </edit-address-pane>
+            </edit-pane>
          </template>
 
          <template v-slot:footer>
@@ -102,7 +102,7 @@
    </teleport>
    <div class="mt-4" v-else>
 
-      <edit-address-pane v-if="flag.editPane"
+      <edit-pane v-if="flag.editPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
          v-bind:default="this.default"
@@ -112,7 +112,7 @@
          @closeEditPane="closeEditPane"
          @getCities="getCities"
          @getReferenceAddresses="getReferenceAddresses">
-      </edit-address-pane>
+      </edit-pane>
    </div>
 
 </template>
@@ -121,16 +121,16 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import { getAddress, fetchCountries, fetchCities, fetchReferenceAddresses, patchAddress, postAddress, postPostalCode } from '../api';
 import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
-import ShowAddressPane from './ShowAddressPane.vue';
-import EditAddressPane from './EditAddressPane.vue';
+import ShowPane from './ShowPane.vue';
+import EditPane from './EditPane.vue';
 
 export default {
    name: "AddAddress",
    props: ['context', 'options', 'addressChangedCallback'],
    components: {
       Modal,
-      ShowAddressPane,
-      EditAddressPane,
+      ShowPane,
+      EditPane,
    },
    data() {
       return {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
similarity index 99%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 7bbad3db5..8cacf9981 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -85,7 +85,7 @@ import AddressMap from './AddAddress/AddressMap';
 import AddressMore from './AddAddress/AddressMore'
 
 export default {
-   name: "EditAddressPane",
+   name: "EditPane",
    components: {
       CountrySelection,
       CitySelection,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
similarity index 99%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 7e55f0c1b..eace3f6d2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -66,7 +66,7 @@ import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/da
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
-   name: 'ShowAddressPane',
+   name: 'ShowPane',
    components: {
       AddressRenderBox
    },

From 782f0bc3326a6ac145b9ef82afb2defc0fd33964 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 10:43:59 +0200
Subject: [PATCH 132/217] twig _insert_vue_address, rename mode create

---
 .../Resources/views/Address/_insert_vue_address.html.twig       | 2 +-
 .../ChillPersonBundle/Resources/views/Address/list.html.twig    | 2 +-
 .../Resources/views/Household/addresses.html.twig               | 2 +-
 .../Resources/views/Household/summary.html.twig                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 05f557d44..fa08286f8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -7,7 +7,7 @@
           name:     string
           id:       integer
       }
-    * mode          string ['edit*'|'create']
+    * mode          string ['edit*'|'new']
     * addressId     integer
     * backUrl       twig route:   path('route', {parameters})
     * modalTitle    twig translated chain
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 3719e0ebe..ce68e4da8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -32,7 +32,7 @@
             {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                 targetEntity: { name: 'person', id: person.id },
                 backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-                mode: 'create',
+                mode: 'new',
                 buttonSize: 'btn-lg',
                 buttonText: 'Add an address',
                 modalTitle: 'Add an address',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 087e8be11..3bee011dd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -18,7 +18,7 @@
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
                     backUrl: path('chill_person_household_address_move', { 'household_id': household.id }),
-                    mode: 'create',
+                    mode: 'new',
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index a680f18f2..e8b0c7b78 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -33,7 +33,7 @@
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'household', id: household.id },
                             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                            mode: 'create',
+                            mode: 'new',
                             buttonSize: 'btn-sm',
                             buttonText: 'Move household',
                             modalTitle: 'Move household',

From 6a60758c0d322c733c39952a86b41ee373581c1d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 10:50:57 +0200
Subject: [PATCH 133/217] AddAddress: openPanesInModal, uniq option to
 enable/disable all step123 in Modal

---
 .../vuejs/Address/components/AddAddress.vue   | 25 +++++--------------
 .../Resources/public/vuejs/Address/index.js   |  7 ++----
 .../Address/_insert_vue_address.html.twig     | 10 +++-----
 .../components/CourseLocation.vue             |  4 +--
 .../Resources/views/Address/edit.html.twig    |  3 +--
 .../Resources/views/Address/list.html.twig    |  6 ++---
 .../Resources/views/Address/new.html.twig     |  3 +--
 .../views/Household/address_edit.html.twig    |  3 +--
 .../views/Household/address_move.html.twig    |  3 +--
 .../views/Household/summary.html.twig         |  3 +--
 10 files changed, 19 insertions(+), 48 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 248e7da2b..69f764284 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -9,8 +9,8 @@
    </button>
 
    <!-- step 1 -->
-   <teleport to="body" v-if="step1WithModal">
       <modal v-if="flag.showPane"
+   <teleport to="body" v-if="InModal">
          modalDialogClass="modal-dialog-scrollable modal-xl"
          @close="flag.showPane = false">
 
@@ -62,7 +62,7 @@
    </div>
 
    <!-- step 2 -->
-   <teleport to="body" v-if="step2WithModal">
+   <teleport to="body" v-if="InModal">
       <modal v-if="flag.editPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
          @close="flag.editPane = false">
@@ -147,10 +147,7 @@ export default {
                displayText: true
             },
             title: { create: 'add_an_address_title', edit: 'edit_address' },
-            bindModal: {
-               step1: true,
-               step2: true,
-            },
+            openPanesInModal: true,
             useDate: {
                validFrom: false,
                validTo: false
@@ -192,19 +189,9 @@ export default {
       }
    },
    computed: {
-      step1WithModal() {
-         return (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step1 !== 'undefined') ?
-            this.options.bindModal.step1 : this.default.bindModal.step1;
-      },
-      step2WithModal() {
-         let step2 = (typeof this.options.bindModal !== 'undefined' && typeof this.options.bindModal.step2 !== 'undefined') ?
-            this.options.bindModal.step2 : this.default.bindModal.step2;
-
-         if (step2 === false && this.step1WithModal === true) {
-            console.log("step2 must open in a Modal");
-            return true;
-         }
-         return step2;
+      InModal() {
+         return (typeof this.options.openPanesInModal !== 'undefined') ?
+            this.options.openPanesInModal : this.default.openPanesInModal;
       },
       getTextTitle() {
          if ( typeof this.options.title !== 'undefined'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index cb628586a..4e49b2207 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -38,12 +38,9 @@ containers.forEach((container) => {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
-                        /// Display each step in page or Modal
-                        bindModal: {
-                            step1: container.dataset.bindModalStep1 !== 'false',  //boolean, default: true
-                            step2: container.dataset.bindModalStep2 !== 'false'   //boolean, default: true
-                        },
                         // Use Date fields
+                        /// Display panes in Modal for step123
+                        openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index fa08286f8..052cdbec9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -14,9 +14,8 @@
     * buttonText    twig translated chain
     * buttonSize    bootstrap class like 'btn-sm'
     * buttonDisplayText     bool
-    * bindModalStep1         bool
-    * bindModalStep2         bool
 
+    * openPanesInModal      bool (default: true)
 #}
 <div class="address-container"
 
@@ -51,13 +50,10 @@
         data-button-display-text="false"
     {% endif %}
 
-    {% if bindModalStep1 is defined and bindModalStep1 != 1 %}
-        data-bind-modal-step1="false"
+    {% if openPanesInModal is defined and openPanesInModal != 1 %}
+        data-open-panes-in-modal="false"
     {% endif %}
 
-    {% if bindModalStep2 is defined and bindModalStep2 != 1 %}
-        data-bind-modal-step2="false"
-    {% endif %}
 
     {% if useValidFrom is defined and useValidFrom == 1 %}
         data-use-valid-from="true"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index df2febe3f..a7638a5f1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -89,9 +89,7 @@ export default {
                   edit: 'courselocation.edit_temporary_address'
                },
                /// Display each step in page or Modal
-               bindModal: {
-                  //step1: false, step2: false
-               },
+               openPanesInModal: true,
                // Use Date fields
                useDate: {
                   validFrom: true
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index 20713ec49..dd7679cc2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -30,8 +30,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index ce68e4da8..205b9aab7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -74,8 +74,7 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            bindModalStep1: false,
-                            bindModalStep2: false,
+                            openPanesInModal: false,
                         } %}
                     #}
 
@@ -90,8 +89,7 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            bindModalStep1: false,
-                            bindModalStep2: false,
+                            openPanesInModal: false,
                         } %}
                     #}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index d3102fda5..53c785dda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,8 +30,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
             useValidFrom: true,
             useValidTo: false
         } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 2bc2b6cd0..2bfedaee7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,8 +10,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 6d65c0a7f..2b7dfa8f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,8 +10,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            bindModalStep1: false,
-            bindModalStep2: false,
+            openPanesInModal: false,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index e8b0c7b78..d8c53dbf5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -40,8 +40,7 @@
                             buttonDisplayText: false,
                         } %}
                         {#
-                            bindModalStep1: false,
-                            bindModalStep2: true,
+                            openPanesInModal: false
                         #}
                     </li>
                     <li class="list-inline-item">

From f048395a892b641148933b7c21c50bddfceb8229 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 10:57:13 +0200
Subject: [PATCH 134/217] AddAddress: reorganize 4 steps Pane: show, suggest,
 edit, and date

---
 .../Address/components/ActionButtons.vue      |  30 +++++
 .../vuejs/Address/components/AddAddress.vue   | 123 ++++++++++++------
 .../vuejs/Address/components/DatePane.vue     | 121 +++++++++++++++++
 .../vuejs/Address/components/EditPane.vue     |  42 +++---
 .../vuejs/Address/components/ShowPane.vue     | 101 ++++----------
 .../vuejs/Address/components/SuggestPane.vue  |  60 +++++++++
 6 files changed, 338 insertions(+), 139 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
new file mode 100644
index 000000000..94d6ab105
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -0,0 +1,30 @@
+<template>
+   <ul class="record_actions"
+      :class="{ 'sticky-form-buttons': isStickyForm }">
+
+      <li v-if="isStickyForm" class="cancel">
+         <a class="btn btn-cancel" v-bind:href="context.backUrl">
+            {{ $t('back_to_the_list') }}
+         </a>
+      </li>
+
+      <slot name="action"></slot>
+
+      <li v-if="isStickyForm">
+         <a class="btn btn-save">
+            {{ $t('action.save')}}
+         </a>
+      </li>
+   </ul>
+</template>
+
+<script>
+export default {
+   name: "ActionButtons",
+   props: [ 'options', 'default' ],
+   computed: {
+      isStickyForm() {
+      }
+   }
+}
+</script>
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 69f764284..1948535dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,18 +1,21 @@
 <template>
 
-   <!-- start with a button -->
-   <button v-if="step1WithModal"
-      @click="openShowPane"
-      class="btn" :class="getClassButton"
-      type="button" name="button" :title="$t(getTextButton)">
-      <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
-   </button>
+   <!-- step0 -->
+   <show-pane v-if="flag.showPane"
+      v-bind:context="this.context"
+      v-bind:options="this.options"
+      v-bind:default="this.default"
+      v-bind:entity="this.entity"
+      v-bind:flag="this.flag"
+      @openEditPane="openEditPane"
+      ref="showAddress">
+   </show-pane>
 
    <!-- step 1 -->
-      <modal v-if="flag.showPane"
    <teleport to="body" v-if="InModal">
+      <modal v-if="flag.suggestPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
-         @close="flag.showPane = false">
+         @close="flag.suggestPane = false">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -24,14 +27,14 @@
          </template>
 
          <template v-slot:body>
-            <show-pane
+            <suggest-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
                v-bind:default="this.default"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
-               ref="showAddress">
-            </show-pane>
+               ref="suggestAddress">
+            </suggest-pane>
          </template>
 
          <template v-slot:footer>
@@ -39,8 +42,7 @@
                class="btn btn-update">
                {{ $t('action.edit')}}
             </button>
-            <button class="btn btn-save"
-               @click.prevent="$emit('submitAddress')">
+            <button class="btn btn-save">
                {{ $t('action.save')}}
             </button>
          </template>
@@ -48,8 +50,7 @@
       </modal>
    </teleport>
    <div class="mt-4" v-else>
-
-      <show-pane v-if="flag.showPane"
+      <suggest-pane v-if="flag.suggestPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
          v-bind:default="this.default"
@@ -57,8 +58,8 @@
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
          @openEditPane="openEditPane"
-         ref="showAddress">
-      </show-pane>
+         ref="suggestAddress">
+      </suggest-pane>
    </div>
 
    <!-- step 2 -->
@@ -101,7 +102,6 @@
       </modal>
    </teleport>
    <div class="mt-4" v-else>
-
       <edit-pane v-if="flag.editPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
@@ -115,6 +115,57 @@
       </edit-pane>
    </div>
 
+   <!-- step 3 -->
+   <teleport to="body" v-if="InModal">
+      <modal v-if="flag.datePane"
+             modalDialogClass="modal-dialog-scrollable modal-xl"
+             @close="flag.datePane = false">
+
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
+               <span v-if="flag.loading" class="loading">
+                  <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
+                  <span class="sr-only">{{ $t('loading') }}</span>
+               </span>
+            </h2>
+         </template>
+
+         <template v-slot:body>
+            <date-pane
+               v-bind:context="this.context"
+               v-bind:options="this.options"
+               v-bind:default="this.default"
+               v-bind:entity="this.entity"
+               v-bind:flag="this.flag"
+               ref="dateAddress">
+            </date-pane>
+         </template>
+
+         <template v-slot:footer>
+            <button @click="openEditPane"
+                    class="btn btn-update">
+               {{ $t('action.edit')}}
+            </button>
+            <button class="btn btn-save">
+               {{ $t('action.save')}}
+            </button>
+         </template>
+
+      </modal>
+   </teleport>
+   <div class="mt-4" v-else>
+      <date-pane v-if="flag.datePane"
+         v-bind:context="this.context"
+         v-bind:options="this.options"
+         v-bind:default="this.default"
+         v-bind:entity="this.entity"
+         v-bind:flag="this.flag"
+         v-bind:insideModal="false"
+         @openEditPane="openEditPane"
+         ref="dateAddress">
+      </date-pane>
+   </div>
+
 </template>
 
 <script>
@@ -122,7 +173,9 @@ import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import { getAddress, fetchCountries, fetchCities, fetchReferenceAddresses, patchAddress, postAddress, postPostalCode } from '../api';
 import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
 import ShowPane from './ShowPane.vue';
+import SuggestPane from './SuggestPane.vue';
 import EditPane from './EditPane.vue';
+import DatePane from './DatePane.vue';
 
 export default {
    name: "AddAddress",
@@ -130,13 +183,17 @@ export default {
    components: {
       Modal,
       ShowPane,
+      SuggestPane,
       EditPane,
+      DatePane
    },
    data() {
       return {
          flag: {
-            showPane: false,
+            showPane: true, // begin with showPane
+            suggestPane: false,
             editPane: false,
+            datePane: false,
             loading: false,
             success: false
          },
@@ -148,6 +205,7 @@ export default {
             },
             title: { create: 'add_an_address_title', edit: 'edit_address' },
             openPanesInModal: true,
+            stickyActions: false,
             useDate: {
                validFrom: false,
                validTo: false
@@ -202,28 +260,9 @@ export default {
          }
          return (this.context.edit) ? this.default.title.edit : this.default.title.create;
       },
-      getTextButton() {
-         if ( typeof this.options.button.text !== 'undefined'
-            && ( this.options.button.text.edit !== null
-               || this.options.button.text.create !== null
-            )) {
-            return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
-         }
-         return (this.context.edit) ? this.default.button.text.edit : this.default.button.text.create;
-      },
-      getClassButton() {
-         let type = (this.context.edit) ? this.default.button.type.edit : this.default.button.type.create;
-         let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
-            `${this.options.button.size} ` : '';
-         return `${size}${type}`;
-      },
-      displayTextButton() {
-         return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
-            this.options.button.displayText : this.default.button.displayText;
-      },
-      context() {
-         return this.context;
-      }
+      //context() {
+      //   return this.context;
+      //}
    },
    mounted() {
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
new file mode 100644
index 000000000..d91bec958
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -0,0 +1,121 @@
+<template>
+
+   <div v-if="insideModal === false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+      <span class="sr-only">{{ $t('loading') }}</span>
+   </div>
+
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+      {{ errorMsg }}
+   </div>
+
+   <div v-if="flag.success" class="alert alert-success">
+      {{ $t(getSuccessText) }}
+   </div>
+
+   <address-render-box :address="address"></address-render-box>
+
+   <div v-if="showDateFrom" class='address-valid date-since'>
+      <h3>{{ $t(getValidFromDateText) }}</h3>
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+         <input type="date" class="form-control form-control-lg" name="validFrom"
+                v-bind:placeholder="$t(getValidFromDateText)"
+                v-model="validFrom"
+                aria-describedby="validFrom"
+         />
+      </div>
+   </div>
+
+   <div v-if="showDateTo" class='address-valid date-until'>
+      <h3>{{ $t(getValidToDateText) }}</h3>
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
+         <input type="date" class="form-control form-control-lg" name="validTo"
+                v-bind:placeholder="$t(getValidToDateText)"
+                v-model="validTo"
+                aria-describedby="validTo"
+         />
+      </div>
+   </div>
+
+   <action-buttons v-if="insideModal === false">
+      <template v-slot:action>
+         <li>
+            <a @click.prevent="$emit('openEditPane')"
+               class="btn btn-update">
+               {{ $t('action.edit')}}
+            </a>
+         </li>
+         <!--
+         <li>
+            <a class="btn btn-save">
+               {{ $t('action.save')}}
+            </a>
+         </li>
+         -->
+      </template>
+   </action-buttons>
+
+</template>
+
+<script>
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
+
+export default {
+   name: "DatePane",
+   components: {
+      AddressRenderBox,
+      ActionButtons
+   },
+   props: [
+      'context',
+      'options',
+      'default',
+      'flag',
+      'entity',
+      'errorMsg',
+      'insideModal'
+   ],
+   emits: ['openEditPane'],
+   computed: {
+      address() {
+         return this.entity.address;
+      },
+      validFrom: {
+         set(value) {
+            this.entity.selected.valid.from = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.entity.selected.valid.from);
+         }
+      },
+      validTo: {
+         set(value) {
+            this.entity.selected.valid.to = ISOToDate(value);
+         },
+         get() {
+            return dateToISO(this.entity.selected.valid.from);
+         }
+      },
+      getValidFromDateText() {
+         return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
+      },
+      getValidToDateText() {
+         return 'validTo';
+      },
+      showDateFrom() {
+         return !this.context.edit && this.options.useDate.validFrom;
+      },
+      showDateTo() {
+         return !this.context.edit && this.options.useDate.validTo;
+      }
+   }
+}
+</script>
+
+<style scoped>
+
+</style>
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 8cacf9981..0009df622 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -2,7 +2,7 @@
    <div class="address-form">
 
       <!-- Not display in modal -->
-      <div v-if="insideModal == false" class="loading">
+      <div v-if="insideModal === false" class="loading">
          <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
          <span class="sr-only">Loading...</span>
       </div>
@@ -55,24 +55,22 @@
       </address-more>
 
       <!-- Not display in modal -->
-      <ul v-if="insideModal == false"
-          class="record_actions sticky-form-buttons">
-         <li class="cancel">
-            <a class="btn btn-cancel" v-bind:href="context.backUrl">
-               {{ $t('back_to_the_list') }}
-            </a>
-         </li>
-         <li>
-            <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
-               {{ $t('action.cancel') }}
-            </a>
-         </li>
-         <li>
-            <a class="btn btn-update" @click.prevent="$emit('closeEditPane')">
-               {{ $t('action.valid_and_see')}}
-            </a>
-         </li>
-      </ul>
+      <action-buttons v-if="insideModal === false">
+         <template v-slot:action>
+            <li>
+               <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
+                  {{ $t('action.cancel') }}
+               </a>
+            </li>
+            <!--
+            <li>
+               <a class="btn btn-update" @click.prevent="$emit('closeEditPane')">
+                  {{ $t('action.valid_and_see')}}
+               </a>
+            </li>
+            -->
+         </template>
+      </action-buttons>
 
    </div>
 </template>
@@ -82,7 +80,8 @@ import CountrySelection from './AddAddress/CountrySelection';
 import CitySelection from './AddAddress/CitySelection';
 import AddressSelection from './AddAddress/AddressSelection';
 import AddressMap from './AddAddress/AddressMap';
-import AddressMore from './AddAddress/AddressMore'
+import AddressMore from './AddAddress/AddressMore';
+import ActionButtons from './ActionButtons.vue';
 
 export default {
    name: "EditPane",
@@ -91,7 +90,8 @@ export default {
       CitySelection,
       AddressSelection,
       AddressMap,
-      AddressMore
+      AddressMore,
+      ActionButtons
    },
    props: [
       'context',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index eace3f6d2..f57340bf0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -1,68 +1,27 @@
 <template>
 
-   <div v-if="insideModal == false" class="loading">
+   <div class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
       <span class="sr-only">{{ $t('loading') }}</span>
    </div>
-
    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
       {{ errorMsg }}
    </div>
-
    <div v-if="flag.success" class="alert alert-success">
       {{ $t(getSuccessText) }}
    </div>
 
    <address-render-box :address="address"></address-render-box>
 
-   <div v-if="showDateFrom" class='address-valid date-since'>
-      <h3>{{ $t(getValidFromDateText) }}</h3>
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validFrom"
-                v-bind:placeholder="$t(getValidFromDateText)"
-                v-model="validFrom"
-                aria-describedby="validFrom"
-         />
-      </div>
-   </div>
+   <button @click.prevent="$emit('openEditPane')"
+      class="btn" :class="getClassButton"
+      type="button" name="button" :title="$t(getTextButton)">
+      <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+   </button>
 
-   <div v-if="showDateTo" class='address-valid date-until'>
-      <h3>{{ $t(getValidToDateText) }}</h3>
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validTo"
-                v-bind:placeholder="$t(getValidToDateText)"
-                v-model="validTo"
-                aria-describedby="validTo"
-         />
-      </div>
-   </div>
-
-   <ul v-if="insideModal == false"
-      class="record_actions">
-      <!--
-      <li class="cancel">
-         <a class="btn btn-cancel" v-bind:href="context.backUrl">
-            {{ $t('back_to_the_list') }}</a>
-      </li>-->
-      <li>
-         <a @click.prevent="$emit('openEditPane')"
-            class="btn btn-update">
-            {{ $t('action.edit')}}
-         </a>
-      </li>
-      <!--<li>
-         <a class="btn btn-save"
-            @click.prevent="$emit('submitAddress')">
-            {{ $t('action.save')}}
-         </a>
-      </li>-->
-   </ul>
 </template>
 
 <script>
-import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
 export default {
@@ -76,35 +35,31 @@ export default {
       'default',
       'flag',
       'entity',
-      'errorMsg',
-      'insideModal'
+      'errorMsg'
    ],
-   emits: ['openEditPane'], // 'submitAddress'
+   emits: ['openEditPane'],
    computed: {
       address() {
          return this.entity.address;
       },
-      validFrom: {
-         set(value) {
-            this.entity.selected.valid.from = ISOToDate(value);
-         },
-         get() {
-            return dateToISO(this.entity.selected.valid.from);
+      displayTextButton() {
+         return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
+            this.options.button.displayText : this.default.button.displayText;
+      },
+      getClassButton() {
+         let type = (this.context.edit) ? this.default.button.type.edit : this.default.button.type.create;
+         let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
+            `${this.options.button.size} ` : '';
+         return `${size}${type}`;
+      },
+      getTextButton() {
+         if ( typeof this.options.button.text !== 'undefined'
+            && ( this.options.button.text.edit !== null
+               || this.options.button.text.create !== null
+            )) {
+            return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
          }
-      },
-      validTo: {
-         set(value) {
-            this.entity.selected.valid.to = ISOToDate(value);
-         },
-         get() {
-            return dateToISO(this.entity.selected.valid.from);
-         }
-      },
-      getValidFromDateText() {
-         return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
-      },
-      getValidToDateText() {
-         return 'validTo';
+         return (this.context.edit) ? this.default.button.text.edit : this.default.button.text.create;
       },
       getSuccessText() {
          switch (this.context.entity.name) {
@@ -117,12 +72,6 @@ export default {
             default:
                return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
          }
-      },
-      showDateFrom() {
-         return !this.context.edit && this.options.useDate.validFrom;
-      },
-      showDateTo() {
-         return !this.context.edit && this.options.useDate.validTo;
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
new file mode 100644
index 000000000..f276c3f96
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -0,0 +1,60 @@
+<template>
+
+   <div v-if="insideModal === false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+      <span class="sr-only">{{ $t('loading') }}</span>
+   </div>
+
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+      {{ errorMsg }}
+   </div>
+
+   <div v-if="flag.success" class="alert alert-success">
+      {{ $t(getSuccessText) }}
+   </div>
+
+   suggestions
+
+   <action-buttons v-if="insideModal === false">
+      <template v-slot:action>
+         <li>
+            <a @click.prevent="$emit('openEditPane')"
+               class="btn btn-update">
+               {{ $t('action.edit')}}
+            </a>
+         </li>
+      </template>
+   </action-buttons>
+</template>
+
+<script>
+import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
+
+export default {
+   name: "SuggestPane",
+   components: {
+      AddressRenderBox,
+      ActionButtons
+   },
+   props: [
+      'context',
+      'options',
+      'default',
+      'flag',
+      'entity',
+      'errorMsg',
+      'insideModal'
+   ],
+   emits: ['openEditPane'],
+   computed: {
+   },
+   methods: {
+
+   }
+}
+</script>
+
+<style scoped>
+
+</style>

From 331dd286e79e7c8c395234070261b7b553227da0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 10:59:06 +0200
Subject: [PATCH 135/217] AddAddress: adding a new stickyActions option

---
 .../public/vuejs/Address/components/ActionButtons.vue    | 1 +
 .../Resources/public/vuejs/Address/index.js              | 4 +++-
 .../views/Address/_insert_vue_address.html.twig          | 9 +++++++--
 .../Resources/views/Address/new.html.twig                | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
index 94d6ab105..a0bb66f33 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -24,6 +24,7 @@ export default {
    props: [ 'options', 'default' ],
    computed: {
       isStickyForm() {
+         return (typeof this.options.stickyActions !== 'undefined') ? this.options.stickyActions : this.default.stickyActions;
       }
    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 4e49b2207..7ecf4847a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -38,9 +38,11 @@ containers.forEach((container) => {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
-                        // Use Date fields
                         /// Display panes in Modal for step123
                         openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
+                        /// Display actions buttons of panes in a sticky-form-button navbar
+                        stickyActions: container.dataset.stickyActions === 'true',  //boolean, default: false
+                        /// Use Date fields
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 052cdbec9..bf996f593 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -13,9 +13,11 @@
     * modalTitle    twig translated chain
     * buttonText    twig translated chain
     * buttonSize    bootstrap class like 'btn-sm'
-    * buttonDisplayText     bool
-
+    * buttonDisplayText     bool (default: true)
     * openPanesInModal      bool (default: true)
+    * stickyActions         bool (default: false)
+    * useValidFrom          bool (default: false)
+    * useValidTo            bool (default: false)
 #}
 <div class="address-container"
 
@@ -54,6 +56,9 @@
         data-open-panes-in-modal="false"
     {% endif %}
 
+    {% if stickyActions is defined and stickyActions == 1 %}
+        data-sticky-actions="true"
+    {% endif %}
 
     {% if useValidFrom is defined and useValidFrom == 1 %}
         data-use-valid-from="true"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 53c785dda..235c0c7b4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -31,6 +31,7 @@
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
+            stickyActions: true,
             useValidFrom: true,
             useValidTo: false
         } %}

From 3f3b7af42b9352f251b029539616c1820213324a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 13:09:18 +0200
Subject: [PATCH 136/217] AddAddress: adjust Open and Close methods for each
 step

---
 .../Resources/public/vuejs/Address/App.vue    |   4 +-
 .../Address/components/ActionButtons.vue      |  17 ++-
 .../vuejs/Address/components/AddAddress.vue   | 110 +++++++++++++-----
 .../vuejs/Address/components/DatePane.vue     |   5 +-
 .../vuejs/Address/components/EditPane.vue     |  12 +-
 .../vuejs/Address/components/ShowPane.vue     |  20 +++-
 .../vuejs/Address/components/SuggestPane.vue  |   5 +-
 .../Resources/public/vuejs/Address/index.js   |   2 +-
 .../Resources/views/Address/new.html.twig     |   5 +-
 .../views/Household/address_edit.html.twig    |   1 +
 10 files changed, 132 insertions(+), 49 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index e4d332289..a1496e7d6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -33,8 +33,8 @@ export default {
 
    },
    mounted() {
-      console.log('AddAddress: data context', this.context);
-      console.log('AddAddress: data options', this.options);
+      //console.log('AddAddress: data context', this.context);
+      //console.log('AddAddress: data options', this.options);
    },
    methods: {
       displayErrors() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
index a0bb66f33..afe059da6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -2,19 +2,23 @@
    <ul class="record_actions"
       :class="{ 'sticky-form-buttons': isStickyForm }">
 
+      <!--
       <li v-if="isStickyForm" class="cancel">
-         <a class="btn btn-cancel" v-bind:href="context.backUrl">
+         <a class="btn btn-cancel" @click="resetPane">
             {{ $t('back_to_the_list') }}
          </a>
       </li>
+      -->
 
       <slot name="action"></slot>
 
+      <!--
       <li v-if="isStickyForm">
          <a class="btn btn-save">
             {{ $t('action.save')}}
          </a>
       </li>
+      -->
    </ul>
 </template>
 
@@ -24,7 +28,16 @@ export default {
    props: [ 'options', 'default' ],
    computed: {
       isStickyForm() {
-         return (typeof this.options.stickyActions !== 'undefined') ? this.options.stickyActions : this.default.stickyActions;
+         return (typeof this.options.stickyActions !== 'undefined') ?
+            this.options.stickyActions : this.default.stickyActions;
+      },
+   },
+   methods: {
+      resetPane() {
+         this.flag.suggestPane = false;
+         this.flag.editPane = false;
+         this.flag.datePane = false;
+         this.flag.showPane = true;
       }
    }
 }
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 1948535dc..259266c92 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -12,10 +12,10 @@
    </show-pane>
 
    <!-- step 1 -->
-   <teleport to="body" v-if="InModal">
+   <teleport to="body" v-if="inModal">
       <modal v-if="flag.suggestPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
-         @close="flag.suggestPane = false">
+         @close="resetPane">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -42,9 +42,11 @@
                class="btn btn-update">
                {{ $t('action.edit')}}
             </button>
+            <!--
             <button class="btn btn-save">
                {{ $t('action.save')}}
             </button>
+            -->
          </template>
 
       </modal>
@@ -63,10 +65,10 @@
    </div>
 
    <!-- step 2 -->
-   <teleport to="body" v-if="InModal">
+   <teleport to="body" v-if="inModal">
       <modal v-if="flag.editPane"
          modalDialogClass="modal-dialog-scrollable modal-xl"
-         @close="flag.editPane = false">
+         @close="resetPane">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -116,10 +118,10 @@
    </div>
 
    <!-- step 3 -->
-   <teleport to="body" v-if="InModal">
+   <teleport to="body" v-if="inModal">
       <modal v-if="flag.datePane"
              modalDialogClass="modal-dialog-scrollable modal-xl"
-             @close="flag.datePane = false">
+             @close="resetPane">
 
          <template v-slot:header>
             <h2 class="modal-title">{{ $t(getTextTitle) }}
@@ -247,10 +249,24 @@ export default {
       }
    },
    computed: {
-      InModal() {
+      inModal() {
          return (typeof this.options.openPanesInModal !== 'undefined') ?
             this.options.openPanesInModal : this.default.openPanesInModal;
       },
+      useDatePane() {
+         let vFrom = (typeof this.options.useDate !== 'undefined'
+            && typeof this.options.useDate.validFrom !== 'undefined') ?
+            this.options.useDate.validFrom : this.default.useDate.validFrom ;
+         let vTo = (typeof this.options.useDate !== 'undefined'
+            && typeof this.options.useDate.validTo !== 'undefined') ?
+            this.options.useDate.validTo : this.default.useDate.validTo ;
+         return (vFrom || vTo) ? true : false;
+      },
+      hasSuggestions() {
+         // TODO
+         //return addressSuggestions.length > 0
+         return true;
+      },
       getTextTitle() {
          if ( typeof this.options.title !== 'undefined'
             && ( this.options.title.edit !== null
@@ -260,22 +276,23 @@ export default {
          }
          return (this.context.edit) ? this.default.title.edit : this.default.title.create;
       },
-      //context() {
-      //   return this.context;
-      //}
+      bypassFirstStep() {
+         // exception: passing step0 if new address and pane are not in modal
+         return !this.context.edit && !this.inModal && this.flag.editPane === false
+      }
    },
    mounted() {
 
       //console.log('options displayText', this.options.button.displayText);
       //console.log('options bindModal.step1', this.options.bindModal.step1);
       //console.log('options bindModal.step2', this.options.bindModal.step2);
-      console.log('options useDate.validFrom', this.options.useDate.validFrom);
-      console.log('options useDate.validTo', this.options.useDate.validTo);
+      //console.log('options useDate.validFrom', this.options.useDate.validFrom);
+      //console.log('options useDate.validTo', this.options.useDate.validTo);
+      console.log('useDatePane', this.useDatePane);
+
+      //console.log('Mounted now !');
+      this.openShowPane();
 
-      if (!this.step1WithModal) {
-         //console.log('Mounted now !');
-         this.openShowPane();
-      }
    },
    methods: {
 
@@ -283,35 +300,72 @@ export default {
       *  Opening and closing Panes when interacting with buttons
       */
       openShowPane() {
-
          if (this.context.edit) {
+            console.log('getInitialAddress');
             this.getInitialAddress(this.context.addressId);
          }
 
-         // when create new address, start first with editPane !!
-         if ( this.context.edit === false
-            && this.flag.editPane === false
-         ) {
+         if (this.bypassFirstStep) {
+            this.closeShowPane();
             this.openEditPane();
-            this.flag.editPane = true;
 
          } else {
             this.flag.showPane = true;
-            console.log('step1: open the Show Panel');
+            console.log('step0: open the Show Panel');
          }
       },
-
+      closeShowPane() {
+         // Show pane can be closed only when openPanesInModal is false
+         if (!this.inModal) {
+            this.flag.showPane = false;
+            console.log('step0: close the Show Panel');
+         }
+      },
+      openSuggestPane() {
+         this.flag.suggestPane = true;
+         console.log('step1: open the Suggestion Panel');
+      },
+      closeSuggestPane() {
+         this.flag.suggestPane = false;
+         console.log('step1: close the Suggestion Panel');
+      },
       openEditPane() {
-         console.log('step2: open the Edit panel');
+         /*
+         if (!this.context.edit && this.hasSuggestions) {
+            this.openSuggestPane();
+         } else {
+         }
+         */
          this.initForm();
          this.getCountries();
+         this.flag.editPane = true;
+         console.log('step2: open the Edit panel');
       },
-
       closeEditPane() {
-         console.log('step2: close the Edit Panel');
          this.applyChanges();
-         this.flag.showPane = true;
          this.flag.editPane = false;
+         console.log('step2: close the Edit Panel');
+         /*
+         if (!this.context.edit && this.useDatePane) {
+            this.openDatePane();
+         } else {
+         }
+         */
+         this.openShowPane()
+      },
+      openDatePane() {
+         this.flag.datePane = true;
+         console.log('step3: open the Date Panel');
+      },
+      closeDatePane() {
+         this.flag.datePane = false;
+         console.log('step3: close the Date Panel');
+      },
+      resetPane() {
+         this.flag.suggestPane = false;
+         this.flag.editPane = false;
+         this.flag.datePane = false;
+         this.flag.showPane = true;
       },
 
       /*
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index d91bec958..ed461ffb5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -39,7 +39,10 @@
       </div>
    </div>
 
-   <action-buttons v-if="insideModal === false">
+   <action-buttons v-if="insideModal === false"
+      :flag="this.flag"
+      :options="this.options"
+      :default="this.default">
       <template v-slot:action>
          <li>
             <a @click.prevent="$emit('openEditPane')"
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 0009df622..16fc335c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -54,21 +54,21 @@
          v-bind:entity="entity">
       </address-more>
 
-      <!-- Not display in modal -->
-      <action-buttons v-if="insideModal === false">
+      <action-buttons v-if="insideModal === false"
+         :flag="this.flag"
+         :options="this.options"
+         :default="this.default">
          <template v-slot:action>
             <li>
                <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
                   {{ $t('action.cancel') }}
                </a>
             </li>
-            <!--
             <li>
-               <a class="btn btn-update" @click.prevent="$emit('closeEditPane')">
-                  {{ $t('action.valid_and_see')}}
+               <a class="btn btn-save" @click.prevent="$emit('closeEditPane')">
+                  {{ $t('action.save')}}
                </a>
             </li>
-            -->
          </template>
       </action-buttons>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index f57340bf0..2738f7775 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -13,21 +13,29 @@
 
    <address-render-box :address="address"></address-render-box>
 
-   <button @click.prevent="$emit('openEditPane')"
-      class="btn" :class="getClassButton"
-      type="button" name="button" :title="$t(getTextButton)">
-      <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
-   </button>
+   <action-buttons :flag="this.flag" :options="this.options" :default="this.default">
+      <template v-slot:action>
+         <li>
+            <button @click.prevent="$emit('openEditPane')"
+               class="btn" :class="getClassButton"
+               type="button" name="button" :title="$t(getTextButton)">
+               <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+            </button>
+         </li>
+      </template>
+   </action-buttons>
 
 </template>
 
 <script>
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import ActionButtons from './ActionButtons.vue';
 
 export default {
    name: 'ShowPane',
    components: {
-      AddressRenderBox
+      AddressRenderBox,
+      ActionButtons
    },
    props: [
       'context',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index f276c3f96..b3abe5128 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -15,7 +15,10 @@
 
    suggestions
 
-   <action-buttons v-if="insideModal === false">
+   <action-buttons v-if="insideModal === false"
+      :flag="this.flag"
+      :options="this.options"
+      :default="this.default">
       <template v-slot:action>
          <li>
             <a @click.prevent="$emit('openEditPane')"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 7ecf4847a..f54aaa407 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -56,5 +56,5 @@ containers.forEach((container) => {
     .component('app', App)
     .mount(container);
 
-    console.log('container dataset', container.dataset);
+    //console.log('container dataset', container.dataset);
 });
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 235c0c7b4..21e858615 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,11 +30,12 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+            useValidFrom: true,
             openPanesInModal: false,
             stickyActions: true,
-            useValidFrom: true,
-            useValidTo: false
         } %}
+        {#
+        #}
 
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 2bfedaee7..49dad3619 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -11,6 +11,7 @@
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             openPanesInModal: false,
+            stickyActions: true
         } %}
     </div>
 

From 210d819125db968ded3ac8445aacff4f02bce8d0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 13:26:57 +0200
Subject: [PATCH 137/217] tp: adapt variables for include _insert_vue_address

---
 .../Resources/views/ThirdParty/new.html.twig                | 6 +++---
 .../Resources/views/ThirdParty/update.html.twig             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index cbccc8ad2..e6ab52be5 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -46,7 +46,7 @@
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            bindModalStep1: false,
+                            openPanesInModal: false,
                         } %}
                     {% else %}
                         create address
@@ -54,11 +54,11 @@
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
                             backUrl: path('chill_3party_3party_new'),
-                            mode: 'create',
+                            mode: 'new',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
                             modalTitle: 'Create a new address',
-                            bindModalStep1: false,
+                            openPanesInModal: false,
                         } %}
                     {% endif %}
                 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 579c73d26..f59f5d0cc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -63,7 +63,7 @@
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            bindModalStep1: false
+                            openPanesInModal: false
                         } %}
                     {% else %}
                         create address
@@ -71,9 +71,9 @@
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
                             backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
-                            mode: 'create',
+                            mode: 'new',
                             buttonSize: 'btn-sm',
-                            bindModalStep1: false
+                            openPanesInModal: false
                         } %}
                     {% endif %}
                 </div>

From c440d8a2bd7b376d0ae3155d596bd2d1a22f6130 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 15:32:36 +0200
Subject: [PATCH 138/217] tp: adapt variables for include _insert_vue_address

---
 .../Resources/views/ThirdParty/new.html.twig                 | 5 -----
 .../Resources/views/ThirdParty/update.html.twig              | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index e6ab52be5..8b7a38fea 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -36,9 +36,7 @@
                 {{ form_label(form.address) }}
                 {{ form_widget(form.address) }}
                 <div class="col-sm-8">
-                    new tp =>
                     {% if thirdParty.address %}
-                        edit address
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
@@ -46,10 +44,8 @@
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            openPanesInModal: false,
                         } %}
                     {% else %}
-                        create address
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
@@ -58,7 +54,6 @@
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
                             modalTitle: 'Create a new address',
-                            openPanesInModal: false,
                         } %}
                     {% endif %}
                 </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index f59f5d0cc..862eea893 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -53,9 +53,7 @@
                 {{ form_label(form.address) }}
                 {{ form_widget(form.address) }}
                 <div class="col-sm-8">
-                    update tp =>
                     {% if thirdParty.address %}
-                        edit address
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
@@ -63,17 +61,14 @@
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
-                            openPanesInModal: false
                         } %}
                     {% else %}
-                        create address
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
                             backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'new',
                             buttonSize: 'btn-sm',
-                            openPanesInModal: false
                         } %}
                     {% endif %}
                 </div>

From 4855ec2065302249fd56048796eb42479f59b826 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 15:55:10 +0200
Subject: [PATCH 139/217] AddAddress: adding a forceRedirect option

---
 .../Resources/public/vuejs/Address/App.vue    | 96 +++++++++++--------
 .../vuejs/Address/components/AddAddress.vue   |  2 -
 .../Resources/public/vuejs/Address/index.js   |  4 +-
 .../Address/_insert_vue_address.html.twig     |  5 +
 4 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index a1496e7d6..e72e26c14 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -42,8 +42,24 @@ export default {
       },
       submitAddress(payload) {
          console.log('@@@ click on Submit Address Button', payload);
-         this.addDateToAddressAndPostAddressTo(payload); // !!
+
+         // Existing address
+         if (this.context.edit) {
+
+            // address is already linked, just finish !
+            if (this.options.forceRedirect === true) {
+               window.location.assign(this.context.backUrl);
+            }
+
+         // New created address
+         } else {
+            this.postAddressTo(payload);
+         }
       },
+
+      /*
+      * Patch date
+      * TO MOVE in DatePane
       addDateToAddressAndPostAddressTo(payload) {
          payload.body = {
             validFrom: {
@@ -65,48 +81,48 @@ export default {
                this.$refs.addAddress.flag.loading = false;
             });
       },
+      */
+
+      /*
+      *  Post new created address to targetEntity
+      */
       postAddressTo(payload) {
          console.log('postAddressTo', payload.entity);
-         if (!this.context.edit) { // !!
-            switch (payload.entity) {
-               case 'household':
-                  postAddressToHousehold(payload.entityId, payload.addressId)
-                     .then(household => new Promise((resolve, reject) => {
-                        console.log('..toHousehold', household);
-                        this.$refs.addAddress.flag.loading = false;
-                        this.$refs.addAddress.flag.success = true;
-                        window.location.assign(this.context.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.$refs.addAddress.errorMsg.push(error);
-                        this.$refs.addAddress.flag.loading = false;
-                     })
-                  ;
-                  break;
-               case 'person':
-                  postAddressToPerson(payload.entityId, payload.addressId)
-                     .then(person => new Promise((resolve, reject) => {
-                        console.log('..toPerson', person);
-                        this.$refs.addAddress.flag.loading = false;
-                        this.$refs.addAddress.flag.success = true;
-                        window.location.assign(this.context.backUrl);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        this.$refs.addAddress.errorMsg.push(error);
-                        this.$refs.addAddress.flag.loading = false;
-                     })
-                  ;
-                  break;
-               default:
-                  this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
-            }
-         } else {
-            // address is already linked, just finish !
-            //window.location.assign(this.context.backUrl);
+         switch (payload.entity) {
+            case 'household':
+               postAddressToHousehold(payload.entityId, payload.addressId)
+                  .then(household => new Promise((resolve, reject) => {
+                     console.log('..toHousehold', household);
+                     this.$refs.addAddress.flag.loading = false;
+                     this.$refs.addAddress.flag.success = true;
+                     window.location.assign(this.context.backUrl);
+                     resolve();
+                  }))
+                  .catch((error) => {
+                     this.$refs.addAddress.errorMsg.push(error);
+                     this.$refs.addAddress.flag.loading = false;
+                  })
+               ;
+               break;
+            case 'person':
+               postAddressToPerson(payload.entityId, payload.addressId)
+                  .then(person => new Promise((resolve, reject) => {
+                     console.log('..toPerson', person);
+                     this.$refs.addAddress.flag.loading = false;
+                     this.$refs.addAddress.flag.success = true;
+                     window.location.assign(this.context.backUrl);
+                     resolve();
+                  }))
+                  .catch((error) => {
+                     this.$refs.addAddress.errorMsg.push(error);
+                     this.$refs.addAddress.flag.loading = false;
+                  })
+               ;
+               break;
+            default:
+               this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
          }
-      },
+      }
    }
 }
 </script>
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 259266c92..27a9b6299 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -304,11 +304,9 @@ export default {
             console.log('getInitialAddress');
             this.getInitialAddress(this.context.addressId);
          }
-
          if (this.bypassFirstStep) {
             this.closeShowPane();
             this.openEditPane();
-
          } else {
             this.flag.showPane = true;
             console.log('step0: open the Show Panel');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index f54aaa407..193900c21 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -46,7 +46,9 @@ containers.forEach((container) => {
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
-                        }
+                        },
+                        /// Force redirection after last step (cfr. backUrl)
+                        forceRedirect: container.dataset.forceRedirect === 'true'  //boolean, default: false
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index bf996f593..ef8a9795c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -18,6 +18,7 @@
     * stickyActions         bool (default: false)
     * useValidFrom          bool (default: false)
     * useValidTo            bool (default: false)
+    * forceRedirect         bool (default: false)
 #}
 <div class="address-container"
 
@@ -67,6 +68,10 @@
     {% if useValidTo is defined and useValidTo == 1 %}
         data-use-valid-to="true"
     {% endif %}
+
+    {% if forceRedirect is defined and forceRedirect == 1 %}
+        data-force-redirect="true"
+    {% endif %}
 ></div>
 
 {{ encore_entry_script_tags('vue_address') }}

From 1b4e5c495685c6dfbcc4e3417fb0fe037b4945b8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 18 Sep 2021 16:51:08 +0200
Subject: [PATCH 140/217] tp: adapt variables for _insert_vue_address

---
 .../Resources/views/ThirdParty/update.html.twig                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 862eea893..e13fca14a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -69,6 +69,8 @@
                             backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'new',
                             buttonSize: 'btn-sm',
+                            buttonText: 'Create a new address',
+                            modalTitle: 'Create a new address',
                         } %}
                     {% endif %}
                 </div>

From 2788170f031761db2875674f59d2c95a06436328 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Sep 2021 16:50:27 +0200
Subject: [PATCH 141/217] slot buttons up from actionButtons to addAddress

---
 .../Resources/public/vuejs/Address/App.vue    |   2 -
 .../Address/components/ActionButtons.vue      |  23 +---
 .../vuejs/Address/components/AddAddress.vue   | 129 +++++++++++-------
 .../vuejs/Address/components/DatePane.vue     |  28 ++--
 .../vuejs/Address/components/EditPane.vue     |  26 ++--
 .../vuejs/Address/components/ShowPane.vue     |  18 ++-
 .../vuejs/Address/components/SuggestPane.vue  |  43 +++---
 .../Resources/public/vuejs/Address/i18n.js    |   1 +
 .../Resources/public/vuejs/Address/index.js   |   4 +-
 .../components/CourseLocation.vue             |   3 +-
 .../views/Household/address_edit.html.twig    |   6 +-
 .../views/Household/address_move.html.twig    |   1 +
 .../views/Household/addresses.html.twig       |   4 +-
 13 files changed, 149 insertions(+), 139 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index e72e26c14..884849ba6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -10,7 +10,6 @@
 
 <script>
 import AddAddress from './components/AddAddress.vue';
-import { patchAddress } from "./api";
 import { postAddressToHousehold, postAddressToPerson } from "ChillPersonAssets/vuejs/_api/AddAddress";
 
 export default {
@@ -30,7 +29,6 @@ export default {
          return (this.context.edit) ? 'address_' + this.context.addressId
             : this.context.entity.name + '_' + this.context.entity.id ;
       }
-
    },
    mounted() {
       //console.log('AddAddress: data context', this.context);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
index afe059da6..501d14e03 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -2,43 +2,30 @@
    <ul class="record_actions"
       :class="{ 'sticky-form-buttons': isStickyForm }">
 
-      <!--
       <li v-if="isStickyForm" class="cancel">
-         <a class="btn btn-cancel" @click="resetPane">
-            {{ $t('back_to_the_list') }}
-         </a>
+         <slot name="before"></slot>
       </li>
-      -->
 
       <slot name="action"></slot>
 
-      <!--
       <li v-if="isStickyForm">
-         <a class="btn btn-save">
-            {{ $t('action.save')}}
-         </a>
+         <slot name="after"></slot>
       </li>
-      -->
    </ul>
 </template>
 
 <script>
 export default {
    name: "ActionButtons",
-   props: [ 'options', 'default' ],
+   props: ['options', 'defaultz'],
    computed: {
       isStickyForm() {
          return (typeof this.options.stickyActions !== 'undefined') ?
-            this.options.stickyActions : this.default.stickyActions;
+            this.options.stickyActions : this.defaultz.stickyActions;
       },
    },
    methods: {
-      resetPane() {
-         this.flag.suggestPane = false;
-         this.flag.editPane = false;
-         this.flag.datePane = false;
-         this.flag.showPane = true;
-      }
+
    }
 }
 </script>
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 27a9b6299..d5bf8f9e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -4,7 +4,7 @@
    <show-pane v-if="flag.showPane"
       v-bind:context="this.context"
       v-bind:options="this.options"
-      v-bind:default="this.default"
+      v-bind:defaultz="this.defaultz"
       v-bind:entity="this.entity"
       v-bind:flag="this.flag"
       @openEditPane="openEditPane"
@@ -30,7 +30,7 @@
             <suggest-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
-               v-bind:default="this.default"
+               v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
                ref="suggestAddress">
@@ -39,14 +39,9 @@
 
          <template v-slot:footer>
             <button @click="openEditPane"
-               class="btn btn-update">
-               {{ $t('action.edit')}}
+               class="btn btn-create">
+               {{ $t('create_a_new_address')}}
             </button>
-            <!--
-            <button class="btn btn-save">
-               {{ $t('action.save')}}
-            </button>
-            -->
          </template>
 
       </modal>
@@ -55,12 +50,26 @@
       <suggest-pane v-if="flag.suggestPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
-         v-bind:default="this.default"
+         v-bind:defaultz="this.defaultz"
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
-         @openEditPane="openEditPane"
          ref="suggestAddress">
+
+         <template v-slot:before v-if="!bypassFirstStep">
+            <a class="btn btn-cancel" @click="resetPane">
+               {{ $t('action.cancel') }}
+            </a>
+         </template>
+         <template v-slot:action>
+            <li>
+               <button @click="openEditPane"
+                  class="btn btn-create">
+                  {{ $t('create_a_new_address')}}
+               </button>
+            </li>
+         </template>
+
       </suggest-pane>
    </div>
 
@@ -83,7 +92,7 @@
             <edit-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
-               v-bind:default="this.default"
+               v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
                @getCities="getCities"
@@ -92,12 +101,11 @@
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
+            <button class="btn btn-cancel change-icon" @click="resetPane">
                {{ $t('action.cancel') }}
             </button>
-            <button class="btn btn-update"
-               @click="closeEditPane">
-               {{ $t('action.valid')}}
+            <button class="btn btn-save" @click="closeEditPane">
+               {{ $t('action.save')}}
             </button>
          </template>
 
@@ -107,13 +115,26 @@
       <edit-pane v-if="flag.editPane"
          v-bind:context="this.context"
          v-bind:options="this.options"
-         v-bind:default="this.default"
+         v-bind:defaultz="this.defaultz"
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
-         @closeEditPane="closeEditPane"
          @getCities="getCities"
          @getReferenceAddresses="getReferenceAddresses">
+
+         <template v-slot:before>
+            <a class="btn btn-cancel" @click="resetPane">
+               {{ $t('action.cancel') }}
+            </a>
+         </template>
+         <template v-slot:action>
+            <li>
+               <button class="btn btn-save" @click="closeEditPane">
+                  {{ $t('action.save')}}
+               </button>
+            </li>
+         </template>
+
       </edit-pane>
    </div>
 
@@ -136,7 +157,7 @@
             <date-pane
                v-bind:context="this.context"
                v-bind:options="this.options"
-               v-bind:default="this.default"
+               v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
                ref="dateAddress">
@@ -144,13 +165,14 @@
          </template>
 
          <template v-slot:footer>
-            <button @click="openEditPane"
-                    class="btn btn-update">
+            <button class="btn btn-update" @click="openEditPane">
                {{ $t('action.edit')}}
             </button>
+            <!--
             <button class="btn btn-save">
                {{ $t('action.save')}}
             </button>
+            -->
          </template>
 
       </modal>
@@ -159,12 +181,20 @@
       <date-pane v-if="flag.datePane"
          v-bind:context="this.context"
          v-bind:options="this.options"
-         v-bind:default="this.default"
+         v-bind:defaultz="this.defaultz"
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
-         @openEditPane="openEditPane"
          ref="dateAddress">
+
+         <template v-slot:action>
+            <li>
+               <button class="btn btn-update" @click="openEditPane">
+                  {{ $t('action.edit')}}
+               </button>
+            </li>
+         </template>
+
       </date-pane>
    </div>
 
@@ -199,7 +229,7 @@ export default {
             loading: false,
             success: false
          },
-         default: {
+         defaultz: {
             button: {
                text: { create: 'add_an_address_title', edit: 'edit_address' },
                type: { create: 'btn-create', edit: 'btn-update'},
@@ -211,7 +241,9 @@ export default {
             useDate: {
                validFrom: false,
                validTo: false
-            }
+            },
+            forceRedirect: false,
+            onlyButton: false
          },
          entity: {
             address: {}, // <== loaded and returned
@@ -251,15 +283,15 @@ export default {
    computed: {
       inModal() {
          return (typeof this.options.openPanesInModal !== 'undefined') ?
-            this.options.openPanesInModal : this.default.openPanesInModal;
+            this.options.openPanesInModal : this.defaultz.openPanesInModal;
       },
       useDatePane() {
          let vFrom = (typeof this.options.useDate !== 'undefined'
             && typeof this.options.useDate.validFrom !== 'undefined') ?
-            this.options.useDate.validFrom : this.default.useDate.validFrom ;
+            this.options.useDate.validFrom : this.defaultz.useDate.validFrom ;
          let vTo = (typeof this.options.useDate !== 'undefined'
             && typeof this.options.useDate.validTo !== 'undefined') ?
-            this.options.useDate.validTo : this.default.useDate.validTo ;
+            this.options.useDate.validTo : this.defaultz.useDate.validTo ;
          return (vFrom || vTo) ? true : false;
       },
       hasSuggestions() {
@@ -267,6 +299,10 @@ export default {
          //return addressSuggestions.length > 0
          return true;
       },
+      displaySuggestions() {
+         console.log('displaySuggestions');
+         return !this.context.edit && this.hasSuggestions;
+      },
       getTextTitle() {
          if ( typeof this.options.title !== 'undefined'
             && ( this.options.title.edit !== null
@@ -274,11 +310,12 @@ export default {
             )) {
             return (this.context.edit) ? this.options.title.edit : this.options.title.create;
          }
-         return (this.context.edit) ? this.default.title.edit : this.default.title.create;
+         return (this.context.edit) ? this.defaultz.title.edit : this.defaultz.title.create;
       },
       bypassFirstStep() {
          // exception: passing step0 if new address and pane are not in modal
-         return !this.context.edit && !this.inModal && this.flag.editPane === false
+         console.log('bypassFirstStep');
+         return !this.context.edit && !this.inModal;
       }
    },
    mounted() {
@@ -290,7 +327,7 @@ export default {
       //console.log('options useDate.validTo', this.options.useDate.validTo);
       console.log('useDatePane', this.useDatePane);
 
-      //console.log('Mounted now !');
+      console.log('Mounted now !');
       this.openShowPane();
 
    },
@@ -304,7 +341,7 @@ export default {
             console.log('getInitialAddress');
             this.getInitialAddress(this.context.addressId);
          }
-         if (this.bypassFirstStep) {
+         if (this.flag.editPane === false && this.bypassFirstStep) {
             this.closeShowPane();
             this.openEditPane();
          } else {
@@ -328,28 +365,27 @@ export default {
          console.log('step1: close the Suggestion Panel');
       },
       openEditPane() {
-         /*
-         if (!this.context.edit && this.hasSuggestions) {
+         if (this.flag.suggestPane === false && this.displaySuggestions) {
             this.openSuggestPane();
          } else {
+            if (this.flag.suggestPane === true) {
+               this.closeSuggestPane();
+            }
+            this.initForm();
+            this.getCountries();
+            this.flag.editPane = true;
+            console.log('step2: open the Edit panel');
          }
-         */
-         this.initForm();
-         this.getCountries();
-         this.flag.editPane = true;
-         console.log('step2: open the Edit panel');
       },
       closeEditPane() {
          this.applyChanges();
          this.flag.editPane = false;
          console.log('step2: close the Edit Panel');
-         /*
          if (!this.context.edit && this.useDatePane) {
             this.openDatePane();
          } else {
+            this.openShowPane()
          }
-         */
-         this.openShowPane()
       },
       openDatePane() {
          this.flag.datePane = true;
@@ -363,7 +399,7 @@ export default {
          this.flag.suggestPane = false;
          this.flag.editPane = false;
          this.flag.datePane = false;
-         this.flag.showPane = true;
+         this.openShowPane();
       },
 
       /*
@@ -494,16 +530,13 @@ export default {
             });
          }
 
+         console.log('apply changes');
          if (this.context.edit) {
             this.updateAddress({
                addressId: this.context.addressId,
                newAddress: newAddress
             })
-            .then(payload => {
-                  console.log('payload', payload);
-                  this.closePaneAndCallbackSubmit(payload);
-               }
-            );
+            .then(payload => this.closePaneAndCallbackSubmit(payload));
 
          } else {
             this.addNewAddress(newAddress)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index ed461ffb5..6b707a8dd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -1,4 +1,4 @@
-<template>
+<template>step3
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
@@ -40,23 +40,16 @@
    </div>
 
    <action-buttons v-if="insideModal === false"
-      :flag="this.flag"
       :options="this.options"
-      :default="this.default">
+      :defaultz="this.defaultz">
+      <template v-slot:before>
+         <slot name="before"></slot>
+      </template>
       <template v-slot:action>
-         <li>
-            <a @click.prevent="$emit('openEditPane')"
-               class="btn btn-update">
-               {{ $t('action.edit')}}
-            </a>
-         </li>
-         <!--
-         <li>
-            <a class="btn btn-save">
-               {{ $t('action.save')}}
-            </a>
-         </li>
-         -->
+         <slot name="action"></slot>
+      </template>
+      <template v-slot:after>
+         <slot name="after"></slot>
       </template>
    </action-buttons>
 
@@ -76,13 +69,12 @@ export default {
    props: [
       'context',
       'options',
-      'default',
+      'defaultz',
       'flag',
       'entity',
       'errorMsg',
       'insideModal'
    ],
-   emits: ['openEditPane'],
    computed: {
       address() {
          return this.entity.address;
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 16fc335c8..1876ae375 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -1,4 +1,4 @@
-<template>
+<template>step2
    <div class="address-form">
 
       <!-- Not display in modal -->
@@ -55,20 +55,16 @@
       </address-more>
 
       <action-buttons v-if="insideModal === false"
-         :flag="this.flag"
          :options="this.options"
-         :default="this.default">
+         :defaultz="this.defaultz">
+         <template v-slot:before>
+            <slot name="before"></slot>
+         </template>
          <template v-slot:action>
-            <li>
-               <a class="btn btn-cancel change-icon" @click="flag.showPane = true; flag.editPane = false;">
-                  {{ $t('action.cancel') }}
-               </a>
-            </li>
-            <li>
-               <a class="btn btn-save" @click.prevent="$emit('closeEditPane')">
-                  {{ $t('action.save')}}
-               </a>
-            </li>
+            <slot name="action"></slot>
+         </template>
+         <template v-slot:after>
+            <slot name="after"></slot>
          </template>
       </action-buttons>
 
@@ -96,13 +92,13 @@ export default {
    props: [
       'context',
       'options',
-      'default',
+      'defaultz',
       'flag',
       'entity',
       'errorMsg',
       'insideModal'
    ],
-   emits: ['closeEditPane', 'getCities', 'getReferenceAddresses'],
+   emits: ['getCities', 'getReferenceAddresses'],
    data() {
       return {
          value: false
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 2738f7775..8ee8f0f46 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -11,9 +11,11 @@
       {{ $t(getSuccessText) }}
    </div>
 
-   <address-render-box :address="address"></address-render-box>
+   <address-render-box v-if="!onlyButton" :address="address"></address-render-box>
 
-   <action-buttons :flag="this.flag" :options="this.options" :default="this.default">
+   <action-buttons
+      :options="this.options"
+      :defaultz="this.defaultz">
       <template v-slot:action>
          <li>
             <button @click.prevent="$emit('openEditPane')"
@@ -40,7 +42,7 @@ export default {
    props: [
       'context',
       'options',
-      'default',
+      'defaultz',
       'flag',
       'entity',
       'errorMsg'
@@ -52,10 +54,10 @@ export default {
       },
       displayTextButton() {
          return (typeof this.options.button !== 'undefined' && typeof this.options.button.displayText !== 'undefined') ?
-            this.options.button.displayText : this.default.button.displayText;
+            this.options.button.displayText : this.defaultz.button.displayText;
       },
       getClassButton() {
-         let type = (this.context.edit) ? this.default.button.type.edit : this.default.button.type.create;
+         let type = (this.context.edit) ? this.defaultz.button.type.edit : this.defaultz.button.type.create;
          let size = (typeof this.options.button !== 'undefined' && this.options.button.size !== null) ?
             `${this.options.button.size} ` : '';
          return `${size}${type}`;
@@ -67,7 +69,7 @@ export default {
             )) {
             return (this.context.edit) ? this.options.button.text.edit : this.options.button.text.create;
          }
-         return (this.context.edit) ? this.default.button.text.edit : this.default.button.text.create;
+         return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create;
       },
       getSuccessText() {
          switch (this.context.entity.name) {
@@ -80,6 +82,10 @@ export default {
             default:
                return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
          }
+      },
+      onlyButton() {
+         return (typeof this.options.onlyButton !== 'undefined') ?
+            this.options.onlyButton : this.defaultz.onlyButton;
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index b3abe5128..ce93dafb6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -1,33 +1,30 @@
-<template>
+<template>step1
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
       <span class="sr-only">{{ $t('loading') }}</span>
    </div>
 
-   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-      {{ errorMsg }}
-   </div>
+   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">{{ errorMsg }}</div>
 
-   <div v-if="flag.success" class="alert alert-success">
-      {{ $t(getSuccessText) }}
-   </div>
+   <div v-if="flag.success" class="alert alert-success">{{ $t(getSuccessText) }}</div>
 
-   suggestions
+   <h3>{{ $t('address_suggestions') }}</h3>
 
    <action-buttons v-if="insideModal === false"
-      :flag="this.flag"
       :options="this.options"
-      :default="this.default">
+      :defaultz="this.defaultz">
+      <template v-slot:before>
+         <slot name="before"></slot>
+      </template>
       <template v-slot:action>
-         <li>
-            <a @click.prevent="$emit('openEditPane')"
-               class="btn btn-update">
-               {{ $t('action.edit')}}
-            </a>
-         </li>
+         <slot name="action"></slot>
+      </template>
+      <template v-slot:after>
+         <slot name="after"></slot>
       </template>
    </action-buttons>
+
 </template>
 
 <script>
@@ -43,21 +40,13 @@ export default {
    props: [
       'context',
       'options',
-      'default',
+      'defaultz',
       'flag',
       'entity',
       'errorMsg',
       'insideModal'
    ],
-   emits: ['openEditPane'],
-   computed: {
-   },
-   methods: {
-
-   }
+   computed: {},
+   methods: {}
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index b41da821f..27ef5d565 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -33,6 +33,7 @@ const addressMessages = {
         validTo: "L'adresse est valable jusqu'au",
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
+        address_suggestions: "Suggestion d'adresses",
         address_new_success: 'La nouvelle adresse est enregistrée',
         address_edit_success: 'L\'adresse a été mise à jour',
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 193900c21..17be4ec25 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -48,7 +48,9 @@ containers.forEach((container) => {
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
                         },
                         /// Force redirection after last step (cfr. backUrl)
-                        forceRedirect: container.dataset.forceRedirect === 'true'  //boolean, default: false
+                        forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
+                        /// Don't display show renderbox Address
+                        onlyButton: container.dataset.onlyButton === 'true'         //boolean, default: false
                     }
                 }
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index a7638a5f1..d9bd5f52b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -93,7 +93,8 @@ export default {
                // Use Date fields
                useDate: {
                   validFrom: true
-               }
+               },
+               onlyButton: true
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 49dad3619..bd2cce5ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,9 +10,11 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            openPanesInModal: false,
-            stickyActions: true
         } %}
+        {#
+            stickyActions: true
+            openPanesInModal: false,
+        #}
     </div>
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 2b7dfa8f0..ccb9f20cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -11,6 +11,7 @@
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             openPanesInModal: false,
+            stickyActions: true
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 3bee011dd..2f359c3ed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -17,8 +17,10 @@
                 {# include vue_address component #}
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
-                    backUrl: path('chill_person_household_address_move', { 'household_id': household.id }),
+                    backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+                    forceRedirect: true,
                     mode: 'new',
+                    useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',

From a842229d5e8ab846015d4beeec057a84d337e87c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 18 Sep 2021 17:47:49 +0200
Subject: [PATCH 142/217] improve addAddress

---
 .../Resources/public/vuejs/Address/App.vue    | 24 ++++---
 .../Resources/public/vuejs/Address/api.js     |  2 +-
 .../vuejs/Address/components/AddAddress.vue   | 67 ++++++++++++-------
 .../components/AddAddress/CitySelection.vue   | 12 +++-
 .../vuejs/Address/components/DatePane.vue     |  2 +-
 .../vuejs/Address/components/EditPane.vue     |  4 --
 .../vuejs/Address/components/ShowPane.vue     | 19 ++++--
 .../vuejs/Address/components/SuggestPane.vue  | 28 +++++++-
 .../Resources/public/vuejs/Address/i18n.js    |  2 +
 .../Resources/public/vuejs/Address/index.js   |  8 +--
 .../Address/_insert_vue_address.html.twig     |  4 +-
 .../components/ButtonLocation.vue             |  4 +-
 .../components/CourseLocation.vue             |  8 +--
 .../vuejs/AccompanyingCourse/store/index.js   |  4 +-
 .../components/Household.vue                  |  4 +-
 .../views/Household/address_edit.html.twig    |  4 +-
 .../views/Household/address_move.html.twig    |  6 +-
 .../views/Household/addresses.html.twig       |  4 +-
 18 files changed, 136 insertions(+), 70 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 884849ba6..17f5ee288 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -27,7 +27,7 @@ export default {
       },
       key() {
          return (this.context.edit) ? 'address_' + this.context.addressId
-            : this.context.entity.name + '_' + this.context.entity.id ;
+            : this.context.target.name + '_' + this.context.target.id ;
       }
    },
    mounted() {
@@ -45,9 +45,7 @@ export default {
          if (this.context.edit) {
 
             // address is already linked, just finish !
-            if (this.options.forceRedirect === true) {
-               window.location.assign(this.context.backUrl);
-            }
+            this.$refs.addAddress.lastPaneAction();
 
          // New created address
          } else {
@@ -85,15 +83,18 @@ export default {
       *  Post new created address to targetEntity
       */
       postAddressTo(payload) {
-         console.log('postAddressTo', payload.entity);
-         switch (payload.entity) {
+         console.log('postAddressTo', payload.target);
+         switch (payload.target) {
             case 'household':
-               postAddressToHousehold(payload.entityId, payload.addressId)
+               postAddressToHousehold(payload.targetId, payload.addressId)
                   .then(household => new Promise((resolve, reject) => {
                      console.log('..toHousehold', household);
                      this.$refs.addAddress.flag.loading = false;
                      this.$refs.addAddress.flag.success = true;
-                     window.location.assign(this.context.backUrl);
+
+                     // finish
+                     this.$refs.addAddress.lastPaneAction();
+
                      resolve();
                   }))
                   .catch((error) => {
@@ -103,12 +104,15 @@ export default {
                ;
                break;
             case 'person':
-               postAddressToPerson(payload.entityId, payload.addressId)
+               postAddressToPerson(payload.targetId, payload.addressId)
                   .then(person => new Promise((resolve, reject) => {
                      console.log('..toPerson', person);
                      this.$refs.addAddress.flag.loading = false;
                      this.$refs.addAddress.flag.success = true;
-                     window.location.assign(this.context.backUrl);
+
+                     // finish
+                     this.$refs.addAddress.lastPaneAction();
+
                      resolve();
                   }))
                   .catch((error) => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index e4ed78f35..14fa0490f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -109,7 +109,7 @@ const patchAddress = (id, body) => {
 * method POST, post Postal Code Object
 * @returns {Promise}
 */
-const postPostalCode = (postalCode) => {
+const postPostalCode = (postalCode) => { //<--
    const url = `/api/1.0/main/postal-code.json?`;
    const body = postalCode;
 
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 d5bf8f9e2..75f7b9c63 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -243,7 +243,7 @@ export default {
                validTo: false
             },
             forceRedirect: false,
-            onlyButton: false
+            hideAddress: false
          },
          entity: {
             address: {}, // <== loaded and returned
@@ -300,7 +300,6 @@ export default {
          return true;
       },
       displaySuggestions() {
-         console.log('displaySuggestions');
          return !this.context.edit && this.hasSuggestions;
       },
       getTextTitle() {
@@ -314,7 +313,6 @@ export default {
       },
       bypassFirstStep() {
          // exception: passing step0 if new address and pane are not in modal
-         console.log('bypassFirstStep');
          return !this.context.edit && !this.inModal;
       }
    },
@@ -325,9 +323,13 @@ export default {
       //console.log('options bindModal.step2', this.options.bindModal.step2);
       //console.log('options useDate.validFrom', this.options.useDate.validFrom);
       //console.log('options useDate.validTo', this.options.useDate.validTo);
-      console.log('useDatePane', this.useDatePane);
+      //console.log('useDatePane', this.useDatePane);
 
       console.log('Mounted now !');
+      if (this.context.edit) {
+         console.log('getInitialAddress');
+         this.getInitialAddress(this.context.addressId);
+      }
       this.openShowPane();
 
    },
@@ -337,11 +339,8 @@ export default {
       *  Opening and closing Panes when interacting with buttons
       */
       openShowPane() {
-         if (this.context.edit) {
-            console.log('getInitialAddress');
-            this.getInitialAddress(this.context.addressId);
-         }
          if (this.flag.editPane === false && this.bypassFirstStep) {
+            console.log('bypassFirstStep');
             this.closeShowPane();
             this.openEditPane();
          } else {
@@ -366,6 +365,7 @@ export default {
       },
       openEditPane() {
          if (this.flag.suggestPane === false && this.displaySuggestions) {
+            console.log('displaySuggestions');
             this.openSuggestPane();
          } else {
             if (this.flag.suggestPane === true) {
@@ -396,11 +396,21 @@ export default {
          console.log('step3: close the Date Panel');
       },
       resetPane() {
+         console.log('resetPane');
          this.flag.suggestPane = false;
          this.flag.editPane = false;
          this.flag.datePane = false;
          this.openShowPane();
       },
+      lastPaneAction() {
+         if (this.options.forceRedirect === true) {
+            console.log("redirect to backUrl");
+            window.location.assign(this.context.backUrl);
+         } else {
+            console.log("don't redirect");
+            this.resetPane();
+         }
+      },
 
       /*
       *  Async Fetch datas
@@ -492,6 +502,7 @@ export default {
 
          this.entity.selected.writeNew.address = this.context.edit;
          this.entity.selected.writeNew.postcode = this.context.edit;
+         console.log('!! just set writeNew.postcode to', this.entity.selected.writeNew.postcode);
       },
 
       /*
@@ -501,6 +512,8 @@ export default {
       */
       applyChanges()
       {
+         console.log('apply changes');
+
          let newAddress = {
             'isNoAddress': this.entity.selected.isNoAddress,
             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
@@ -525,22 +538,22 @@ export default {
             newPostcode = Object.assign(newPostcode, {
                'country': {'id': this.entity.selected.country.id },
             });
+            console.log('writeNew postcode is true! newPostcode: ', newPostcode);
             newAddress = Object.assign(newAddress, {
                'newPostcode': newPostcode
             });
          }
 
-         console.log('apply changes');
-         if (this.context.edit) {
+         if (!this.context.edit) {
+            this.addNewAddress(newAddress)
+               .then(payload => this.closePaneAndCallbackSubmit(payload));
+
+         } else {
             this.updateAddress({
                addressId: this.context.addressId,
                newAddress: newAddress
             })
             .then(payload => this.closePaneAndCallbackSubmit(payload));
-
-         } else {
-            this.addNewAddress(newAddress)
-            .then(payload => this.closePaneAndCallbackSubmit(payload));
          }
       },
 
@@ -556,7 +569,7 @@ export default {
          if ('newPostcode' in payload) {
 
             let postcodeBody = payload.newPostcode;
-            if (this.context.entity.name === 'person') {
+            if (this.context.target.name === 'person') { // !!! maintain here ?
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
             return postPostalCode(postcodeBody)
@@ -578,8 +591,8 @@ export default {
                this.flag.loading = false;
                this.flag.success = true;
                resolve({
-                  entity: this.context.entity.name,
-                  entityId: this.context.entity.id,
+                  target: this.context.target.name,
+                  targetId: this.context.target.id,
                   addressId: this.entity.address.address_id
                   }
                );
@@ -599,14 +612,16 @@ export default {
          this.flag.loading = true;
 
          // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-
+         // BUG réécrit un postcode à chaque édition !
          if ('newPostcode' in payload.newAddress) {
+
             let postcodeBody = payload.newAddress.newPostcode;
             postcodeBody = Object.assign(postcodeBody, {'origin': 3});
 
+            console.log('juste before post new postcode', postcodeBody);
             return postPostalCode(postcodeBody)
                .then(postalCode => {
-                  console.log('create new postcode', postalCode.id);
+                  console.log('new postcode created', postalCode.id);
                   payload.newAddress.postcode = {'id': postalCode.id };
                   return this.patchExistingAddress(payload);
                });
@@ -624,8 +639,8 @@ export default {
                   this.flag.loading = false;
                   this.flag.success = true;
                   return resolve({
-                     entity: this.context.entity.name,
-                     entityId: this.context.entity.id,
+                     target: this.context.target.name,
+                     targetId: this.context.target.id,
                      addressId: this.entity.address.address_id
                   });
                })
@@ -642,10 +657,11 @@ export default {
       */
       closePaneAndCallbackSubmit(payload)
       {
-         console.log('close pane and call parent callback method', payload);
 
-         //this.initForm();
-         this.flag.showPane = false;
+         this.initForm();
+         this.resetPane();
+
+         console.log('will call parent callback method', payload);
 
          // callback props method from parent
          this.addressChangedCallback(payload);
@@ -662,4 +678,7 @@ div.entity-address {
       right: 0; top: -55px;
    }
 }
+h4.h3 {
+   font-weight: bold;
+}
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 828c3ed96..9b6a7b87f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="my-1">
-      <label class="col-form-label" for="citySelector">{{ $t('city') }}</label>
+      <label class="col-form-label">{{ $t('city') }}</label>
       <VueMultiselect
          id="citySelector"
          v-model="value"
@@ -25,7 +25,7 @@
          <div class="form-floating">
             <input class="form-control"
                type="text"
-               name="code"
+               id="code"
                :placeholder="$t('postalCode_code')"
                v-model="code"/>
             <label for="code">{{ $t('postalCode_code') }}</label>
@@ -35,7 +35,7 @@
          <div class="form-floating">
             <input class="form-control"
                type="text"
-               name="name"
+               id="name"
                :placeholder="$t('postalCode_name')"
                v-model="name"/>
             <label for="name">{{ $t('postalCode_name') }}</label>
@@ -87,6 +87,9 @@ export default {
          }
       },
    },
+   mounted() {
+      console.log('writeNew.postcode', this.entity.selected.writeNew.postcode, 'in mounted');
+   },
    methods: {
       transName(value) {
          return (value.code && value.name) ? `${value.code}-${value.name}` : '';
@@ -96,6 +99,7 @@ export default {
          this.entity.selected.postcode.name = value.name;
          this.entity.selected.postcode.code = value.code;
          this.entity.selected.writeNew.postcode = false;
+         console.log('writeNew.postcode false, in selectCity');
          this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
       },
@@ -110,6 +114,7 @@ export default {
             this.entity.selected.postcode.name = city.name;
             this.entity.selected.postcode.code = city.code;
             this.entity.selected.writeNew.postcode = true;
+            console.log('writeNew.postcode true, in listenInputSearch');
          }
       },
       splitCity(city) {
@@ -142,6 +147,7 @@ export default {
       addPostcode() {
          console.log('addPostcode: pass here ?? never, it seems');
          this.entity.selected.writeNew.postcode = true;
+         console.log('writeNew.postcode true, in addPostcode');
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 6b707a8dd..98b3060cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -96,7 +96,7 @@ export default {
          }
       },
       getValidFromDateText() {
-         return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
+         return (this.context.target.name === 'household') ? 'move_date' : 'validFrom';
       },
       getValidToDateText() {
          return 'validTo';
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 1876ae375..61e0f4f8d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -145,11 +145,7 @@ export default {
 </script>
 
 <style lang="scss">
-
 div.address-form {
-   h4.h3 {
-      font-weight: bold;
-   }
    div#address_map {
       height: 400px;
       width: 100%;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 8ee8f0f46..99b531d97 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -11,7 +11,13 @@
       {{ $t(getSuccessText) }}
    </div>
 
-   <address-render-box v-if="!onlyButton" :address="address"></address-render-box>
+   <div v-if="noAddressWithStickyActions" class="mt-5">
+      <p class="chill-no-data-statement">
+         {{ $t('not_yet_address') }}
+      </p>
+   </div>
+
+   <address-render-box v-if="!hideAddress" :address="address"></address-render-box>
 
    <action-buttons
       :options="this.options"
@@ -72,7 +78,7 @@ export default {
          return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create;
       },
       getSuccessText() {
-         switch (this.context.entity.name) {
+         switch (this.context.target.name) {
             /*
             case 'household':
                return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
@@ -83,9 +89,12 @@ export default {
                return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
          }
       },
-      onlyButton() {
-         return (typeof this.options.onlyButton !== 'undefined') ?
-            this.options.onlyButton : this.defaultz.onlyButton;
+      hideAddress() {
+         return (typeof this.options.hideAddress !== 'undefined') ?
+            this.options.hideAddress : this.defaultz.hideAddress;
+      },
+      noAddressWithStickyActions() {
+         return !this.context.edit && !this.address.id && this.options.stickyActions;
       }
    }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index ce93dafb6..f85e3ba34 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -9,7 +9,33 @@
 
    <div v-if="flag.success" class="alert alert-success">{{ $t(getSuccessText) }}</div>
 
-   <h3>{{ $t('address_suggestions') }}</h3>
+   <h4 class="h3">{{ $t('address_suggestions') }}</h4>
+
+   <div class="flex-table AddressSuggestionList">
+      <div class="item-bloc">
+         <div class="float-button bottom">
+            <div class="box">
+               <div class="action">
+                  <ul class="record_actions">
+                     <li>
+                        <button class="btn btn-sm btn-choose">
+                           {{ $t('use_this_address') }}
+                        </button>
+                     </li>
+                  </ul>
+               </div>
+               <ul class="list-content fa-ul">
+                  <li>
+                     <i class="fa fa-li fa-map-marker"></i>
+                     <!--
+                     <address-render-box></address-render-box>
+                     -->
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+   </div>
 
    <action-buttons v-if="insideModal === false"
       :options="this.options"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 27ef5d565..cc7a5ef79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -36,6 +36,8 @@ const addressMessages = {
         address_suggestions: "Suggestion d'adresses",
         address_new_success: 'La nouvelle adresse est enregistrée',
         address_edit_success: 'L\'adresse a été mise à jour',
+        not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'",
+        use_this_address: "Utiliser cette adresse",
 
         // person specific
         add_an_address_to_person: 'Ajouter l\'adresse à la personne',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 17be4ec25..004f73cf4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -14,9 +14,9 @@ containers.forEach((container) => {
             return {
                 addAddress: {
                     context: {
-                        entity: {
-                            name: container.dataset.targetEntityName,
-                            id: container.dataset.targetEntityId
+                        target: {
+                            name: container.dataset.targetName,
+                            id: container.dataset.targetId
                         },
                         edit: container.dataset.mode === 'edit',  //boolean
                         addressId: container.dataset.addressId || null,
@@ -50,7 +50,7 @@ containers.forEach((container) => {
                         /// Force redirection after last step (cfr. backUrl)
                         forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
                         /// Don't display show renderbox Address
-                        onlyButton: container.dataset.onlyButton === 'true'         //boolean, default: false
+                        //hideAddress: false         //boolean, default: false
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index ef8a9795c..36482fe9c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -22,8 +22,8 @@
 #}
 <div class="address-container"
 
-     data-target-entity-name="{{ targetEntity.name|e('html_attr') }}"
-     data-target-entity-id="{{ targetEntity.id|e('html_attr') }}"
+     data-target-name="{{ targetEntity.name|e('html_attr') }}"
+     data-target-id="{{ targetEntity.id|e('html_attr') }}"
 
     {% if 'edit' in app.request.get('_route') %}
         data-mode="edit"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index 86f9cb4f8..b9e52f300 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -54,8 +54,8 @@ export default {
       assignAddress() {
         //console.log('assignAddress id', this.person.current_household_address);
          let payload = {
-            entity: this.context.entity.name,
-            entityId: this.context.entity.id,
+            target: this.context.target.name,
+            targetId: this.context.target.id,
             locationStatusTo: 'person',
             personId: this.person.id
          };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index d9bd5f52b..713f06ddb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -94,7 +94,7 @@ export default {
                useDate: {
                   validFrom: true
                },
-               onlyButton: true
+               hideAddress: true
             }
          }
       }
@@ -120,7 +120,7 @@ export default {
    methods: {
       initAddressContext() {
          let context = {
-            entity: {
+            target: {
                name: this.accompanyingCourse.type,
                id: this.accompanyingCourse.id
             },
@@ -136,8 +136,8 @@ export default {
       removeAddress() {
         //console.log('remove address');
          let payload = {
-            entity: this.context.entity.name,
-            entityId: this.context.entity.id,
+            target: this.context.target.name,
+            targetId: this.context.target.id,
             locationStatusTo: 'none'
          };
          this.$store.dispatch('updateLocation', payload);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 34a6786fc..72eb57cdf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -261,7 +261,7 @@ let initPromise = getAccompanyingCourse(id)
             },
             updateLocation({ commit }, payload) {
               //console.log('## action: updateLocation', payload.locationStatusTo);
-               let body = { 'type': payload.entity, 'id': payload.entityId };
+               let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
                   location = { 'personLocation': { 'type': 'person', 'id': payload.personId }};
@@ -273,7 +273,7 @@ let initPromise = getAccompanyingCourse(id)
                   location = { 'personLocation': null };
                }
                Object.assign(body, location);
-               patchAccompanyingCourse(payload.entityId, body)
+               patchAccompanyingCourse(payload.targetId, body)
                   .then(accompanyingCourse => new Promise((resolve, reject) => {
                      commit('updateLocation', {
                         location: accompanyingCourse.location,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 50f20a714..8a2ef0f41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -186,8 +186,8 @@ export default {
     return {
       addAddress: {
         context: {
-          entity: {
-            type: 'household_create',
+          target: {
+            name: 'household_create',
             id: 0
           },
           edit: false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index bd2cce5ec..e9c41bf45 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -9,10 +9,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            stickyActions: true
         } %}
         {#
-            stickyActions: true
+            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             openPanesInModal: false,
         #}
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index ccb9f20cc..fc2a28250 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,9 +10,11 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            openPanesInModal: false,
-            stickyActions: true
+            stickyActions: true,
         } %}
+        {#
+            openPanesInModal: false,
+        #}
     </div>
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 2f359c3ed..854be6359 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -18,13 +18,15 @@
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
                     backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                    forceRedirect: true,
                     mode: 'new',
                     useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
+                    forceRedirect: true,
                 } %}
+                {#
+                #}
 
             </li>
         </ul>

From 03e86245281d01c1ad9ca37cbb7fd45392814494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Sep 2021 14:03:23 +0200
Subject: [PATCH 143/217] entity person: allow center to be not null

---
 .../ChillPersonBundle/Entity/Person.php       |  1 -
 .../migrations/Version20210831140339.php      | 29 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 35db2ef83..5bfe3bd10 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -254,7 +254,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var Center
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
-     * @ORM\JoinColumn(nullable=false)
      */
     private $center;
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
new file mode 100644
index 000000000..dd3a60d75
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Allow to create persons without center
+ */
+final class Version20210831140339 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Allow to create persons without center';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER center_id DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER center_id SET NOT NULL');
+    }
+}

From eec798cfd3b908de56b591a406e8f5f50a9237df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Sep 2021 14:04:40 +0200
Subject: [PATCH 144/217] entity person: create a validator to check a person
 entity is linked with a center

This validator take a parameter in configuration
---
 .../ChillPersonExtension.php                  |  3 ++
 .../DependencyInjection/Configuration.php     | 33 ++++++------
 .../Person/PersonHasCenterValidatorTest.php   | 50 +++++++++++++++++++
 .../Constraints/Person/PersonHasCenter.php    | 15 ++++++
 .../Person/PersonHasCenterValidator.php       | 41 +++++++++++++++
 5 files changed, 127 insertions(+), 15 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
 create mode 100644 src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 07d5dc88f..48ac993c3 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -60,6 +60,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $container->setParameter('chill_person.allow_multiple_simultaneous_accompanying_periods',
                 $config['allow_multiple_simultaneous_accompanying_periods']);
 
+        // register all configuration in a unique parameter
+        $container->setParameter('chill_person', $config);
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 927612d5f..7daec4f63 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -44,22 +44,25 @@ class Configuration implements ConfigurationInterface
                         ->canBeDisabled()
                         ->children()
                             ->scalarNode('birthdate_not_after')
-                            ->info($this->validationBirthdateNotAfterInfos)
-                            ->defaultValue('P1D')
-                            ->validate()
-                                ->ifTrue(function($period) {
-                                    try {
-                                        $interval = new \DateInterval($period);
-                                    } catch (\Exception $ex) {
-                                        return true;
-                                    }
-                                    return false;
-                                })
-                                ->thenInvalid('Invalid period for birthdate validation : "%s" '
-                                        . 'The parameter should match duration as defined by ISO8601 : '
-                                        . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
+                                ->info($this->validationBirthdateNotAfterInfos)
+                                ->defaultValue('P1D')
+                                ->validate()
+                                    ->ifTrue(function($period) {
+                                        try {
+                                            $interval = new \DateInterval($period);
+                                        } catch (\Exception $ex) {
+                                            return true;
+                                        }
+                                        return false;
+                                    })
+                                    ->thenInvalid('Invalid period for birthdate validation : "%s" '
+                                            . 'The parameter should match duration as defined by ISO8601 : '
+                                            . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
                             ->end() // birthdate_not_after, parent = children of validation
-
+                            ->booleanNode('center_required')
+                                ->info('Enable a center for each person entity. If disabled, you must provide your own center provider')
+                                ->defaultValue(true)
+                            ->end()
                         ->end() // children for 'validation', parent = validation
                     ->end() //validation, parent = children of root
                 ->end() // children of root, parent = root
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
new file mode 100644
index 000000000..8cd0e6b83
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Validator\Person;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenterValidator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\ConstraintValidatorTestCase
+{
+    public function testValidateRequired()
+    {
+        $constraint = $this->getConstraint();
+        $personHasCenter = (new Person())->setCenter(new Center());
+        $personNoCenter = new Person();
+
+        $this->validator->validate($personHasCenter, $constraint);
+        $this->assertNoViolation();
+
+        $this->validator->validate($personNoCenter, $constraint);
+        $this->buildViolation('msg')
+            ->atPath('property.path.center')
+            ->assertRaised();
+    }
+
+    protected function getConstraint()
+    {
+        return new PersonHasCenter([
+            'message' => 'msg'
+        ]);
+    }
+
+    protected function createValidator()
+    {
+        $parameterBag = $this->createMock(ParameterBagInterface::class);
+        $parameterBag
+            ->method('get')
+            ->with($this->equalTo('chill_person'))
+            ->willReturn([
+                'validation' => [
+                    'center_required' => true
+                ]
+            ])
+            ;
+
+        return new PersonHasCenterValidator($parameterBag);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
new file mode 100644
index 000000000..c6c8c7c14
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Chill\PersonBundle\Validator\Constraints\Person;
+
+class PersonHasCenter extends \Symfony\Component\Validator\Constraint
+{
+    public string $message = "A center is required";
+
+    public function getTargets()
+    {
+        return [
+            self::CLASS_CONSTRAINT
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
new file mode 100644
index 000000000..1738e6ddc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Chill\PersonBundle\Validator\Constraints\Person;
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+class PersonHasCenterValidator extends \Symfony\Component\Validator\ConstraintValidator
+{
+    private bool $centerRequired;
+
+    public function __construct(ParameterBagInterface $parameterBag)
+    {
+        $this->centerRequired = $parameterBag->get('chill_person')['validation']['center_required'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate($person, Constraint $constraint)
+    {
+        if (!$person instanceof Person) {
+            throw new UnexpectedTypeException($constraint, Person::class);
+        }
+
+        if (!$this->centerRequired) {
+            return;
+        }
+
+        if (NULL === $person->getCenter()) {
+            $this
+                ->context
+                ->buildViolation($constraint->message)
+                ->atPath('center')
+                ->addViolation()
+                ;
+        }
+    }
+}

From 7faddbe3feaf7b41b0bec1613909d3598fe54e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Sep 2021 14:41:27 +0200
Subject: [PATCH 145/217] move birthday validator to namespace person + rewrite
 tests

---
 .../Validator/BirthdateValidatorTest.php      | 112 ------------------
 .../Person/BirthdateValidatorTest.php         |  72 +++++++++++
 .../Constraints/{ => Person}/Birthdate.php    |  11 +-
 .../{ => Person}/BirthdateValidator.php       |  22 ++--
 4 files changed, 86 insertions(+), 131 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
 rename src/Bundle/ChillPersonBundle/Validator/Constraints/{ => Person}/Birthdate.php (89%)
 rename src/Bundle/ChillPersonBundle/Validator/Constraints/{ => Person}/BirthdateValidator.php (94%)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php
deleted file mode 100644
index 57b4c2577..000000000
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/BirthdateValidatorTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\PersonBundle\Tests\Validator;
-
-use Chill\PersonBundle\Validator\Constraints\BirthdateValidator;
-use Chill\PersonBundle\Validator\Constraints\Birthdate;
-use Prophecy\Argument;
-use Prophecy\Prophet;
-
-/**
- * Test the behaviour of BirthdayValidator
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class BirthdateValidatorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * A prophecy for \Symfony\Component\Validator\Context\ExecutionContextInterface
-     *
-     * Will reveal \Symfony\Component\Validator\Context\ExecutionContextInterface
-     */
-    private $context;
-    
-    private $prophet;
-    
-    /**
-     *
-     * @var Birthdate
-     */
-    private $constraint;
-    
-    public function setUp()
-    {
-        $this->prophet = new Prophet;
-        
-        $constraintViolationBuilder = $this->prophet->prophesize();
-        $constraintViolationBuilder->willImplement('Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface');
-
-        $constraintViolationBuilder->setParameter(Argument::any(), Argument::any())
-                ->willReturn($constraintViolationBuilder->reveal());
-        $constraintViolationBuilder->addViolation()
-                ->willReturn($constraintViolationBuilder->reveal());
-        
-        $this->context = $this->prophet->prophesize();
-        $this->context->willImplement('Symfony\Component\Validator\Context\ExecutionContextInterface');
-        $this->context->buildViolation(Argument::type('string'))
-                ->willReturn($constraintViolationBuilder->reveal()); 
-        
-        $this->constraint = new Birthdate();
-    }
-    
-    public function testValidBirthDate()
-    {
-        
-        $date = new \DateTime('2015-01-01');
-        
-        $birthdateValidator = new BirthdateValidator();
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::any())->shouldNotHaveBeenCalled();
-    }
-    
-    public function testInvalidBirthDate()
-    {
-        $date = new \DateTime('tomorrow');
-        
-        $birthdateValidator = new BirthdateValidator();
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::type('string'))->shouldHaveBeenCalled();
-    }
-    
-    public function testInvalidBirthDateWithParameter()
-    {
-        $date = (new \DateTime('today'))->sub(new \DateInterval('P1M'));
-        
-        $birthdateValidator = new BirthdateValidator('P1Y');
-        $birthdateValidator->initialize($this->context->reveal());
-        
-        $birthdateValidator->validate($date, $this->constraint);
-        
-        $this->context->buildViolation(Argument::type('string'))->shouldHaveBeenCalled();
-    }
-    
-    public function tearDown()
-    {
-        $this->prophet->checkPredictions();
-    }
-    
-    
-}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
new file mode 100644
index 000000000..2e7df4817
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\Tests\Validator\Person;
+
+use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+use Chill\PersonBundle\Entity\Person;
+
+/**
+ * Test the behaviour of BirthdayValidator
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class BirthdateValidatorTest extends ConstraintValidatorTestCase
+{
+
+    public function testValidateTodayInvalid()
+    {
+        $bornToday = new \DateTime('now');
+        $this->validator->validate($bornToday, $this->createConstraint());
+        $this->buildViolation('msg')
+            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->assertRaised();
+    }
+
+    public function testValidateYesterdayValid()
+    {
+        $bornYesterday = new \DateTime('yesterday');
+        $this->validator->validate($bornYesterday, $this->createConstraint());
+        $this->assertNoViolation();
+    }
+
+    public function testTomorrowInvalid()
+    {
+        $bornAfter = new \DateTime('+2 days');
+        $this->validator->validate($bornAfter, $this->createConstraint());
+        $this->buildViolation('msg')
+            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->assertRaised();
+    }
+
+    private function createConstraint()
+    {
+        return new Birthdate([
+            'message' => 'msg'
+        ]);
+    }
+
+
+    protected function createValidator()
+    {
+        return new BirthdateValidator('P1D');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
similarity index 89%
rename from src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php
rename to src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index d09d549fd..b8cf6d8c2 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Chill\PersonBundle\Validator\Constraints;
+namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
  * Create a constraint on birth date: the birthdate after today are not allowed.
- * 
- * It is possible to add a delay before today, expressed as described in 
+ *
+ * It is possible to add a delay before today, expressed as described in
  * interval_spec : http://php.net/manual/en/dateinterval.construct.php
  * (this interval_spec itself is based on ISO8601 :
  *  https://en.wikipedia.org/wiki/ISO_8601#Durations)
@@ -34,9 +34,4 @@ use Symfony\Component\Validator\Constraint;
 class Birthdate extends Constraint
 {
     public $message = "The birthdate must be before %date%";
-    
-    public function validatedBy()
-    {
-        return 'birthdate_not_before';
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
similarity index 94%
rename from src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php
rename to src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index cba955ef6..5d16be230 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -17,49 +17,49 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace Chill\PersonBundle\Validator\Constraints;
+namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class BirthdateValidator extends ConstraintValidator
 {
     private $interval_spec = null;
-    
+
     public function __construct($interval_spec = null)
     {
         $this->interval_spec = $interval_spec;
     }
-    
+
     public function validate($value, Constraint $constraint)
     {
         if ($value === NULL) {
-            
+
             return;
         }
-        
+
         if (!$value instanceof \DateTime) {
             throw new \LogicException('The input should a be a \DateTime interface,'
                     . (is_object($value) ? get_class($value) : gettype($value)));
         }
-        
+
         $limitDate = $this->getLimitDate();
-        
+
         if ($limitDate < $value) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('%date%', $limitDate->format('d-m-Y'))
                 ->addViolation();
         }
-        
+
     }
-    
+
     /**
-     * 
+     *
      * @return \DateTime
      */
     private function getLimitDate()

From 41d76542b4682443e37da4f5a559baf695118313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Sep 2021 16:06:20 +0200
Subject: [PATCH 146/217] move validation on person into annotations

---
 .../DependencyInjection/Configuration.php     | 32 +++----
 .../ChillPersonBundle/Entity/Person.php       | 84 +++++++++++++++++--
 .../Person/BirthdateValidatorTest.php         |  2 +
 .../Validator/Person/PersonValidationTest.php | 55 ++++++++++++
 .../Constraints/Person/Birthdate.php          |  4 +-
 .../Constraints/Person/BirthdateValidator.php |  1 +
 .../Constraints/Person/PersonHasCenter.php    |  3 +
 .../ChillPersonBundle/config/services.yaml    | 14 ++--
 .../ChillPersonBundle/config/validation.yaml  | 67 ---------------
 9 files changed, 165 insertions(+), 97 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 7daec4f63..bf2d18922 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -43,26 +43,26 @@ class Configuration implements ConfigurationInterface
                     ->arrayNode('validation')
                         ->canBeDisabled()
                         ->children()
-                            ->scalarNode('birthdate_not_after')
-                                ->info($this->validationBirthdateNotAfterInfos)
-                                ->defaultValue('P1D')
-                                ->validate()
-                                    ->ifTrue(function($period) {
-                                        try {
-                                            $interval = new \DateInterval($period);
-                                        } catch (\Exception $ex) {
-                                            return true;
-                                        }
-                                        return false;
-                                    })
-                                    ->thenInvalid('Invalid period for birthdate validation : "%s" '
-                                            . 'The parameter should match duration as defined by ISO8601 : '
-                                            . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
-                            ->end() // birthdate_not_after, parent = children of validation
                             ->booleanNode('center_required')
                                 ->info('Enable a center for each person entity. If disabled, you must provide your own center provider')
                                 ->defaultValue(true)
                             ->end()
+                            ->scalarNode('birthdate_not_after')
+                                ->info($this->validationBirthdateNotAfterInfos)
+                                    ->defaultValue('P1D')
+                                    ->validate()
+                                        ->ifTrue(function($period) {
+                                            try {
+                                                $interval = new \DateInterval($period);
+                                            } catch (\Exception $ex) {
+                                                return true;
+                                            }
+                                            return false;
+                                        })
+                                        ->thenInvalid('Invalid period for birthdate validation : "%s" '
+                                                . 'The parameter should match duration as defined by ISO8601 : '
+                                                . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
+                            ->end() // birthdate_not_after, parent = children of validation
                         ->end() // children for 'validation', parent = validation
                     ->end() //validation, parent = children of root
                 ->end() // children of root, parent = root
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 5bfe3bd10..f42ca6f00 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -43,6 +43,11 @@ use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Symfony\Component\Validator\Constraints as Assert;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 
 /**
  * Person Class
@@ -57,6 +62,12 @@ use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *   "person"=Person::class
  * })
+ * @PersonHasCenter(
+ *     groups={"general", "creation"}
+ * )
+ * @HouseholdMembershipSequential(
+ *     groups={"household_memberships"}
+ * )
  */
 class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface
 {
@@ -75,6 +86,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @Assert\NotBlank(
+     *     groups={"general", "creation"}
+     * )
+     * @Assert\Length(
+     *     max=255,
+     *     groups={"general", "creation"}
+     * )
      */
     private $firstName;
 
@@ -83,6 +101,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @Assert\NotBlank(
+     *     groups={"general", "creation"}
+     * )
+     * @Assert\Length(
+     *     max=255,
+     *     groups={"general", "creation"}
+     * )
      */
     private $lastName;
 
@@ -102,6 +127,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTime
      *
      * @ORM\Column(type="date", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
+     * @Birthdate(
+     *     groups={"general", "creation"}
+     * )
      */
     private $birthdate;
 
@@ -110,6 +141,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTimeImmutable
      *
      * @ORM\Column(type="date_immutable", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
      */
     private ?\DateTimeImmutable $deathdate;
 
@@ -150,6 +184,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=9, nullable=true)
+     * @Assert\NotNull(
+     *     groups={"general", "creation"}
+     * )
      */
     private $gender;
 
@@ -179,8 +216,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var \DateTime
      *
      * @ORM\Column(type="date", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
      */
-    private $maritalStatusDate;
+    private ?\DateTime $maritalStatusDate;
 
     /**
      * Comment on marital status
@@ -202,6 +242,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", nullable=true)
+     * @Assert\Email(
+     *     checkMX=true,
+     *     groups={"general", "creation"}
+     * )
      */
     private $email = '';
 
@@ -210,6 +254,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", length=40, nullable=true)
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="landline",
+     *     groups={"general", "creation"}
+     * )
      */
     private $phonenumber = '';
 
@@ -218,6 +270,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="text", length=40, nullable=true)
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="mobile",
+     *     groups={"general", "creation"}
+     * )
      */
     private $mobilenumber = '';
 
@@ -230,12 +290,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      *     orphanRemoval=true
      * )
+     * @Assert\Valid(
+     *     traverse=true,
+     *     groups={"general", "creation"}
+     * )
      */
     private $otherPhoneNumbers;
 
-    //TO-ADD caseOpeningDate
-    //TO-ADD nativeLanguag
-
     /**
      * The person's spoken languages
      * @var ArrayCollection
@@ -352,6 +413,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $addresses;
 
     /**
+     * fullname canonical. Read-only field, which is calculated by
+     * the database.
      * @var string
      *
      * @ORM\Column(type="text", nullable=true)
@@ -372,6 +435,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private array $currentHouseholdAt = [];
 
     /**
+     * Read-only field, computed by the database
+     *
      * @ORM\OneToMany(
      *  targetEntity=PersonHouseholdAddress::class,
      *  mappedBy="person"
@@ -389,8 +454,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     /**
      * Person constructor.
-     *
-     * @param \DateTime|null $opening
      */
     public function __construct()
     {
@@ -403,6 +466,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->householdAddresses = new ArrayCollection();
         $this->genderComment = new CommentEmbeddable();
         $this->maritalStatusComment = new CommentEmbeddable();
+        $this->periodLocatedOn = new ArrayCollection();
     }
 
     /**
@@ -1200,6 +1264,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Validation callback that checks if the accompanying periods are valid
      *
      * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *      groups={"accompanying_period_consistent"}
+     * )
      */
     public function isAccompanyingPeriodValid(ExecutionContextInterface $context)
     {
@@ -1245,6 +1313,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * two addresses with the same validFrom date)
      *
      * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *     groups={"addresses_consistent"}
+     * )
      */
     public function isAddressesValid(ExecutionContextInterface $context)
     {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
index 2e7df4817..6c726dd1c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -38,6 +38,7 @@ class BirthdateValidatorTest extends ConstraintValidatorTestCase
         $this->validator->validate($bornToday, $this->createConstraint());
         $this->buildViolation('msg')
             ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
@@ -54,6 +55,7 @@ class BirthdateValidatorTest extends ConstraintValidatorTestCase
         $this->validator->validate($bornAfter, $this->createConstraint());
         $this->buildViolation('msg')
             ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
new file mode 100644
index 000000000..8d6c930d9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Validator\Person;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class PersonValidationTest extends KernelTestCase
+{
+    private ValidatorInterface $validator;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+        $this->validator = self::$container->get(ValidatorInterface::class);
+    }
+
+    public function testFirstnameValidation()
+    {
+        $person = (new Person())
+            ->setFirstname(\str_repeat('a', 500));
+        $errors = $this->validator->validate($person, null, ["creation"]);
+        foreach ($errors->getIterator() as $error) {
+            if (Length::TOO_LONG_ERROR === $error->getCode()) {
+                $this->assertTrue(true,
+                "error code for firstname too long is present");
+                return;
+            }
+        }
+        $this->assertTrue(false,
+        "error code for fistname too long is present");
+
+    }
+
+    public function testBirthdateInFuture()
+    {
+        $person = (new Person())
+            ->setBirthdate(new \Datetime('+2 months'));
+        $errors = $this->validator->validate($person, null, ["creation"]);
+        foreach ($errors->getIterator() as $error) {
+            if (Birthdate::BIRTHDATE_INVALID_CODE === $error->getCode()) {
+                $this->assertTrue(true,
+                    "error code for birthdate invalid is present");
+                return;
+            }
+        }
+        $this->assertTrue(false,
+            "error code for birthdate invalid is present");
+
+    }
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index b8cf6d8c2..20f3ed97b 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -29,9 +29,11 @@ use Symfony\Component\Validator\Constraint;
  * (this interval_spec itself is based on ISO8601 :
  *  https://en.wikipedia.org/wiki/ISO_8601#Durations)
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @Annotation
  */
 class Birthdate extends Constraint
 {
+    public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
+
     public $message = "The birthdate must be before %date%";
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index 5d16be230..238a3d160 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -53,6 +53,7 @@ class BirthdateValidator extends ConstraintValidator
         if ($limitDate < $value) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('%date%', $limitDate->format('d-m-Y'))
+                ->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
                 ->addViolation();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
index c6c8c7c14..5cabd8838 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
@@ -2,6 +2,9 @@
 
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
+/**
+ * @Annotation
+ */
 class PersonHasCenter extends \Symfony\Component\Validator\Constraint
 {
     public string $message = "A center is required";
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index c2f60a729..bf4b8ddd8 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -62,18 +62,18 @@ services:
             - { name: security.voter }
             - { name: chill.role }
 
-    chill.person.birthdate_validation:
-        class: Chill\PersonBundle\Validator\Constraints\BirthdateValidator
+    Chill\PersonBundle\Validator\Constraints\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Validator/Constraints/'
+
+    # override default config, must be loaded after resource
+    Chill\PersonBundle\Validator\Constraints\BirthdateValidator:
         arguments:
             - "%chill_person.validation.birtdate_not_before%"
         tags:
             - { name: validator.constraint_validator, alias: birthdate_not_before }
 
-    Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator:
-        autowire: true
-        tags:
-            - { name: validator.constraint_validator }
-
     Chill\PersonBundle\Repository\:
         autowire: true
         autoconfigure: true
diff --git a/src/Bundle/ChillPersonBundle/config/validation.yaml b/src/Bundle/ChillPersonBundle/config/validation.yaml
index 23369a467..c41513778 100644
--- a/src/Bundle/ChillPersonBundle/config/validation.yaml
+++ b/src/Bundle/ChillPersonBundle/config/validation.yaml
@@ -1,70 +1,3 @@
-Chill\PersonBundle\Entity\Person:
-    properties:
-        firstName:
-              - NotBlank:
-                  groups: [general, creation]
-              - Length:
-                  min: 2
-                  max: 255
-                  minMessage: 'This name is too short. It must containt {{ limit }} chars'
-                  maxMessage: 'This name is too long. It must containt {{ limit }} chars'
-                  groups: [general, creation]
-        lastName:
-              - NotBlank:
-                  groups: [general, creation]
-              - Length:
-                  min: 2
-                  max: 255
-                  minMessage: 'This name is too short. It must containt {{ limit }} chars'
-                  maxMessage: 'This name is too long. It must containt {{ limit }} chars'
-                  groups: [general, creation]
-        birthdate:
-              - Date:
-                  message: 'Birthdate not valid'
-                  groups: [general, creation]
-              - Chill\PersonBundle\Validator\Constraints\Birthdate:
-                  groups: [general, creation]
-        gender:
-               - NotNull:
-                  groups: [general, creation]
-        #accompanyingPeriods:
-        #      - Valid:
-        #          traverse: true
-        email:
-             - Email:
-                  groups: [general, creation]
-                  message: 'The email is not valid'
-                  checkMX: true
-        phonenumber:
-             - Regex:
-                  pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
-                  groups: [general, creation]
-                  message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789'
-             - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
-                  type: landline
-                  groups: [ general, creation ]
-        mobilenumber:
-             - Regex:
-                  pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
-                  groups: [general, creation]
-                  message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33623456789'
-             - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
-                  type: mobile
-                  groups: [ general, creation ]
-        otherPhoneNumbers:
-            -   Valid:
-                    traverse: true
-    constraints:
-          - Callback:
-                  callback: isAccompanyingPeriodValid
-                  groups: [accompanying_period_consistent]
-          - Callback:
-                  callback: isAddressesValid
-                  groups: [addresses_consistent]
-          - Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential:
-                  groups: [ 'household_memberships' ]
-
-
 Chill\PersonBundle\Entity\AccompanyingPeriod:
     properties:
         openingDate:

From 24506554523dd0997ef257637d64ae5e01dc464e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Sep 2021 17:04:24 +0200
Subject: [PATCH 147/217] enable autoloading for form in person bundle

---
 .../Form/Type/Select2MaritalStatusType.php    | 18 ++---
 .../ChillPersonBundle/config/services.yaml    |  8 ---
 .../config/services/form.yaml                 | 71 ++-----------------
 3 files changed, 15 insertions(+), 82 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index 0cff8ee51..34fd9897e 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -20,6 +20,9 @@
 
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
@@ -35,15 +38,13 @@ use Chill\MainBundle\Form\Type\Select2ChoiceType;
  */
 class Select2MaritalStatusType extends AbstractType
 {
-    /** @var RequestStack */
-    private $requestStack;
+    private EntityManagerInterface $em;
 
-    /** @var ObjectManager */
-    private $em;
+    private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(RequestStack $requestStack,ObjectManager $em)
+    public function __construct(TranslatableStringHelper $translatableStringHelper, EntityManagerInterface $em)
     {
-        $this->requestStack = $requestStack;
+        $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
     }
 
@@ -63,18 +64,17 @@ class Select2MaritalStatusType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
         $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();
         $choices = array();
 
         foreach ($maritalStatuses as $ms) {
-            $choices[$ms->getId()] = $ms->getName()[$locale];
+            $choices[$ms->getId()] = $this->translatableStringHelper->localize($ms->getName());
         }
 
         asort($choices, SORT_STRING | SORT_FLAG_CASE);
 
         $resolver->setDefaults(array(
-           'class' => 'Chill\PersonBundle\Entity\MaritalStatus',
+           'class' => MaritalStatus::class,
            'choices' => array_combine(array_values($choices),array_keys($choices))
         ));
     }
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index bf4b8ddd8..43e042e6b 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -24,14 +24,6 @@ services:
         tags:
             - { name: console.command }
 
-    chill.person.form.type.select2maritalstatus:
-        class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType
-        arguments:
-            - "@request_stack"
-            - "@doctrine.orm.entity_manager"
-        tags:
-            - { name: form.type, alias: select2_chill_marital_status }
-
     chill.person.timeline.accompanying_period_opening:
         class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening
         arguments:
diff --git a/src/Bundle/ChillPersonBundle/config/services/form.yaml b/src/Bundle/ChillPersonBundle/config/services/form.yaml
index b61de615d..dacfa41de 100644
--- a/src/Bundle/ChillPersonBundle/config/services/form.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/form.yaml
@@ -1,5 +1,10 @@
 services:
 
+    Chill\PersonBundle\Form\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Form/'
+
     Chill\PersonBundle\Form\PersonType:
         arguments:
             - '%chill_person.person_fields%'
@@ -7,14 +12,7 @@ services:
         tags:
             - { name: form.type, alias: '@chill.person.form.person_creation' }
 
-    Chill\PersonBundle\Form\CreationPersonType:
-        arguments:
-            - '@chill.main.form.data_transformer.center_transformer'
-            - '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-        tags:
-            - { name: form.type, alias: '@chill.main.form.person_creation' }
-
-    chill.person.accompanying_period_closing_motive:
+    Chill\PersonBundle\Form\Type\ClosingMotivePickerType:
         class: Chill\PersonBundle\Form\Type\ClosingMotivePickerType
         arguments:
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
@@ -28,60 +26,3 @@ services:
             $config: "%chill_person.accompanying_period_fields%"
         tags:
             - { name: form.type }
-
-    chill.person.form.type.pick_person:
-        class: Chill\PersonBundle\Form\Type\PickPersonType
-        arguments:
-            - '@Chill\PersonBundle\Repository\PersonRepository'
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            - '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\Type\PersonAltNameType:
-        arguments:
-            $configHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\Type\PersonPhoneType:
-        arguments:
-            $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\SocialIssueType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\SocialActionType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-    Chill\PersonBundle\Form\SocialWork\EvaluationType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-
-    Chill\PersonBundle\Form\SocialWork\GoalType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }
-
-
-    Chill\PersonBundle\Form\SocialWork\ResultType:
-        arguments:
-            $translatableStringHelper: '@chill.main.helper.translatable_string'
-        tags:
-            - { name: form.type }

From 5b70fb2ee569b8dc186d8af616e50c77abeb7d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Sep 2021 12:41:41 +0200
Subject: [PATCH 148/217] adapt UI and controller for Person without centers

---
 .../ChillMainBundle/Form/Type/CenterType.php  |  7 ++-
 .../Resolver/CenterResolverDispatcher.php     | 34 +++++++++++++
 .../Resolver/CenterResolverInterface.php      | 19 ++++++++
 .../Resolver/DefaultCenterResolver.php        | 30 ++++++++++++
 .../Resolver/ResolverTwigExtension.php        | 36 ++++++++++++++
 .../translations/messages.fr.yml              |  1 +
 .../Controller/PersonController.php           | 15 +++---
 .../Form/CreationPersonType.php               | 22 ++++++---
 .../Resources/views/Entity/person.html.twig   |  4 +-
 .../views/Person/banner_custom.html.twig      |  4 +-
 .../Resources/views/Person/create.html.twig   |  7 ++-
 .../ChillPersonBundle/Search/PersonSearch.php | 17 ++++---
 .../Security/Authorization/PersonVoter.php    | 48 ++++++++++---------
 .../config/services/security.yaml             |  5 +-
 14 files changed, 196 insertions(+), 53 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php

diff --git a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php b/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
index ba039c938..0366e8ccf 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CenterType.php
@@ -95,9 +95,12 @@ class CenterType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         if (count($this->reachableCenters) > 1) {
-            $resolver->setDefault('class', Center::class);
-            $resolver->setDefault('choices', $this->reachableCenters);
+            $resolver->setDefault('class', Center::class)
+                ->setDefault('choices', $this->reachableCenters)
+                ->setDefault('placeholder', 'Pick a center')
+                ;
         }
+
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
new file mode 100644
index 000000000..6b1f2a897
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+class CenterResolverDispatcher
+{
+    /**
+     * @var iterabble|CenterResolverInterface[]
+     */
+    private iterable $resolvers = [];
+
+    private CenterResolverInterface $defaultResolver;
+
+    public function __construct(iterable $resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * @param mixed $entity
+     * @param array|null $options
+     * @return null|Center|Center[]
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        foreach($this->resolvers as $priority => $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->resolveCenter($entity, $options);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
new file mode 100644
index 000000000..db49874b7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+interface CenterResolverInterface
+{
+    public function supports($entity, ?array $options = []): bool;
+
+    /**
+     * @param $entity
+     * @param array|null $options
+     * @return Center|array|Center[]
+     */
+    public function resolveCenter($entity, ?array $options = []);
+
+    public static function getDefaultPriority(): int;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
new file mode 100644
index 000000000..31531e0cc
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\HasCenterInterface;
+
+class DefaultCenterResolver implements CenterResolverInterface
+{
+    public function supports($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasCenterInterface;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param HasCenterInterface $entity
+     * @param array $options
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        return $entity->getCenter();
+    }
+
+    public static function getDefaultPriority(): int
+    {
+        return -256;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
new file mode 100644
index 000000000..21ece21a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Twig\TwigFilter;
+
+final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
+{
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    /**
+     * @param CenterResolverDispatcher $centerResolverDispatcher
+     */
+    public function __construct(CenterResolverDispatcher $centerResolverDispatcher)
+    {
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('chill_resolve_center', [$this, 'resolveCenter'])
+        ];
+    }
+
+    /**
+     * @param mixed $entity
+     * @param array|null $options
+     * @return Center|Center[]|null
+     */
+    public function resolveCenter($entity, ?array $options = [])
+    {
+        return $this->centerResolverDispatcher->resolveCenter($entity, $options);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b230b6ac1..59dcd8c73 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -177,6 +177,7 @@ Exports list: Liste des exports
 Create an export: Créer un export
 #export creation step 'center' : pick a center
 Pick centers: Choisir les centres
+Pick a center: Choisir un centre
 The export will contains only data from the picked centers.: L'export ne contiendra que les données des centres choisis.
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 759f892b2..03da97d5f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -230,13 +230,16 @@ final class PersonController extends AbstractController
      */
     public function newAction(Request $request)
     {
-        $defaultCenter = $this->security
-                        ->getUser()
-                        ->getGroupCenters()[0]
-                        ->getCenter();
+        $person = new Person();
 
-        $person = (new Person(new \DateTime('now')))
-                ->setCenter($defaultCenter);
+        if (1 === count($this->security->getUser()
+                ->getGroupCenters())) {
+            $person->setCenter(
+                $this->security->getUser()
+                    ->getGroupCenters()[0]
+                    ->getCenter()
+            );
+        }
 
         $form = $this->createForm(CreationPersonType::class, $person, [
             'validation_groups' => ['create']
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 32b7a69f2..36d088c25 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -21,7 +21,9 @@
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -33,6 +35,7 @@ use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
+use Chill\MainBundle\Form\Type\Export\PickCenterType;
 
 final class CreationPersonType extends AbstractType
 {
@@ -40,10 +43,6 @@ final class CreationPersonType extends AbstractType
     // TODO: See if this is still valid and update accordingly.
     const NAME = 'chill_personbundle_person_creation';
 
-    const FORM_NOT_REVIEWED = 'not_reviewed';
-    const FORM_REVIEWED = 'reviewed' ;
-    const FORM_BEING_REVIEWED = 'being_reviewed';
-
     /**
      *
      * @var CenterTransformer
@@ -56,12 +55,16 @@ final class CreationPersonType extends AbstractType
      */
     protected $configPersonAltNamesHelper;
 
+    private EventDispatcherInterface $dispatcher;
+
     public function __construct(
         CenterTransformer $centerTransformer,
-        ConfigPersonAltNamesHelper $configPersonAltNamesHelper
+        ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
+        EventDispatcherInterface $dispatcher
      ) {
         $this->centerTransformer = $centerTransformer;
         $this->configPersonAltNamesHelper = $configPersonAltNamesHelper;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -79,7 +82,9 @@ final class CreationPersonType extends AbstractType
             ->add('gender', GenderType::class, array(
                 'required' => true, 'placeholder' => null
             ))
-            ->add('center', CenterType::class)
+            ->add('center', CenterType::class, [
+                'required' => false
+            ])
         ;
 
         if ($this->configPersonAltNamesHelper->hasAltNames()) {
@@ -87,6 +92,11 @@ final class CreationPersonType extends AbstractType
                     'by_reference' => false
             ]);
         }
+
+        $this->dispatcher->dispatch(
+            new CustomizeFormEvent(static::class, $builder),
+            CustomizeFormEvent::NAME
+        );
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index f60b7dc9e..612a5609c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -146,10 +146,10 @@
                     {% endif %}
                 {% endif %}
             </li>
-            {% if options['addCenter'] %}
+            {% if options['addCenter'] and person|chill_resolve_center is not null %}
                 <li>
                     <i class="fa fa-li fa-long-arrow-right"></i>
-                    {{ person.center }}
+                    {{ person|chill_resolve_center.name }}
                 </li>
             {% endif %}
         </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
index d01a53c22..564f1803e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
@@ -17,11 +17,11 @@
         {%- endif -%}
     </div>
     <div class="text-md-end">
-        {%- if chill_person.fields.spoken_languages == 'visible' -%}
+        {% if person|chill_resolve_center is not null%}
             <span class="open_sansbold">
                 {{ 'Center'|trans|upper}} :
             </span>
-            {{  person.center.name|upper }}
+            {{  person|chill_resolve_center.name|upper }}
         {%- endif -%}
     </div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 7056f25a3..bd1042dd7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -76,10 +76,9 @@
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
-    <div style="display: none">
-        {# TODO remove this field (vendee) #}
-        {{ form_row(form.center, { 'label' : 'Center'|trans }) }}
-    </div>
+    {% if form.center is defined %}
+        {{ form_row(form.center) }}
+    {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index fe938999a..231636fff 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -153,7 +153,7 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
     protected function search(array $terms, $start, $limit, array $options = array())
     {
         $qb = $this->createQuery($terms, 'search');
-        
+
         if ($options['simplify'] ?? false) {
             $qb->select(
                     'p.id',
@@ -176,7 +176,7 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         $qb
             ->orderBy('p.firstName')
             ->addOrderBy('p.lastName');
-        
+
         if ($options['simplify'] ?? false) {
             return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
         } else {
@@ -291,10 +291,15 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         //restraint center for security
         $reachableCenters = $this->helper->getReachableCenters($this->user,
                 new Role('CHILL_PERSON_SEE'));
-        $qb->andWhere($qb->expr()
-                ->in('p.center', ':centers'))
-                ->setParameter('centers', $reachableCenters)
-                ;
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()
+                    ->in('p.center', ':centers'),
+                $qb->expr()
+                    ->isNull('p.center')
+            )
+        );
+        $qb->setParameter('centers', $reachableCenters);
 
         $this->_cacheQuery[$cacheKey] = $qb;
 
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index f81a6efa1..e68d90365 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -23,16 +23,12 @@ use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     const CREATE = 'CHILL_PERSON_CREATE';
@@ -41,18 +37,19 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     const STATS  = 'CHILL_PERSON_STATS';
     const LISTS  = 'CHILL_PERSON_LISTS';
     const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
-    
-    public function __construct(AuthorizationHelper $helper)
-    {
+
+    protected AuthorizationHelper $helper;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    public function __construct(
+        AuthorizationHelper $helper,
+        CenterResolverDispatcher $centerResolverDispatcher
+    ) {
         $this->helper = $helper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
     }
-    
+
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Person) {
@@ -69,23 +66,30 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
             return false;
         }
     }
-    
+
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
+
         if ($subject === null) {
-            $centers = $this->helper->getReachableCenters($token->getUser(), 
+            $centers = $this->helper->getReachableCenters($token->getUser(),
                 new Role($attribute));
-            
+
             return count($centers) > 0;
         }
-        
+
+        $center = $this->centerResolverDispatcher->resolveCenter($subject);
+
+        if (NULL === $center && $subject instanceof Person) {
+            // person without any center are seen by everybody
+            return true;
+        }
+
         return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
     }
-    
+
     private function getAttributes()
     {
         return array(self::CREATE, self::UPDATE, self::SEE, self::STATS, self::LISTS, self::DUPLICATE);
@@ -100,7 +104,7 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     {
         return $this->getAttributes();
     }
-    
+
     public function getRolesWithHierarchy()
     {
         return [ 'Person' => $this->getRoles() ];
diff --git a/src/Bundle/ChillPersonBundle/config/services/security.yaml b/src/Bundle/ChillPersonBundle/config/services/security.yaml
index 21590fcda..8504874a3 100644
--- a/src/Bundle/ChillPersonBundle/config/services/security.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/security.yaml
@@ -1,8 +1,7 @@
 services:
     chill.person.security.authorization.person:
+        autowire: true
         class: Chill\PersonBundle\Security\Authorization\PersonVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
         tags:
             - { name: security.voter }
             - { name: chill.role }
@@ -13,4 +12,4 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+

From dc09c9424a0cd1958736bb77e185ea71b4da08f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Sep 2021 12:43:12 +0200
Subject: [PATCH 149/217] refactor ACL for easy voter. Apply on TaskVoter

---
 .../Authorization/PersonDocumentVoter.php     |  33 ++--
 .../Form/Event/CustomizeFormEvent.php         |  36 ++++
 .../Authorization/AbstractChillVoter.php      |  12 +-
 .../Authorization/AuthorizationHelper.php     | 154 ++++++++++--------
 .../Security/Authorization/DefaultVoter.php   |  69 ++++++++
 .../Authorization/DefaultVoterFactory.php     |  27 +++
 .../Authorization/VoterFactoryInterface.php   |   7 +
 .../Security/Authorization/VoterGenerator.php |  36 ++++
 .../Authorization/VoterGeneratorInterface.php |   7 +
 .../Security/Authorization/VoterInterface.php |   7 +
 .../Resolver/CenterResolverDispatcherTest.php |  27 +++
 .../config/services/security.yaml             |  34 +++-
 .../Security/Authorization/TaskVoter.php      |  93 +++++++----
 .../config/services/security.yaml             |   8 +-
 14 files changed, 411 insertions(+), 139 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php

diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index 78429b439..c92971b8f 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -23,6 +23,7 @@ use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -42,30 +43,25 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
     const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
     const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var AccessDecisionManagerInterface
-     */
-    protected $accessDecisionManager;
+    protected AccessDecisionManagerInterface $accessDecisionManager;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected LoggerInterface $logger;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger
+        LoggerInterface $logger//,
+        //CenterResolverDispatcher $centerResolverDispatcher
     )
     {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
+        //$this->centerResolverDispatcher = $centerResolverDispatcher;
     }
 
     public function getRoles()
@@ -78,17 +74,18 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
             self::DELETE
         ];
     }
-    
+
     protected function supports($attribute, $subject)
     {
         if (\in_array($attribute, $this->getRoles()) && $subject instanceof PersonDocument) {
             return true;
         }
-        
-        if ($subject instanceof Person && $attribute === self::CREATE) {
+
+        if ($subject instanceof Person
+            && \in_array($attribute, [self::CREATE, self::SEE])) {
             return true;
         }
-        
+
         return false;
     }
 
@@ -107,6 +104,8 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
             return false;
         }
 
+        $center = $this->centerResolverDispatcher->resolveCenter($subject);
+
         if ($subject instanceof PersonDocument) {
             return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
 
diff --git a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
new file mode 100644
index 000000000..43fab6f62
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Form\Event;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CustomizeFormEvent extends \Symfony\Component\EventDispatcher\Event
+{
+    const NAME = 'chill_main.customize_form';
+
+    protected string $type;
+
+    protected FormBuilderInterface $builder;
+
+    public function __construct(string $type, FormBuilderInterface $builder)
+    {
+        $this->type = $type;
+        $this->builder = $builder;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return FormBuilderInterface
+     */
+    public function getBuilder(): FormBuilderInterface
+    {
+        return $this->builder;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 842fc5ecc..9131a6501 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -23,8 +23,8 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * Voter for Chill software. 
- * 
+ * Voter for Chill software.
+ *
  * This abstract Voter provide generic methods to handle object specific to Chill
  *
  *
@@ -36,20 +36,20 @@ abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
     {
         @trigger_error('This voter should implements the new `supports` '
             . 'methods introduced by Symfony 3.0, and do not rely on '
-            . 'getSupportedAttributes and getSupportedClasses methods.', 
+            . 'getSupportedAttributes and getSupportedClasses methods.',
             E_USER_DEPRECATED);
 
         return \in_array($attribute, $this->getSupportedAttributes($attribute))
             && \in_array(\get_class($subject), $this->getSupportedClasses());
     }
-    
+
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
         @trigger_error('This voter should implements the new `voteOnAttribute` '
             . 'methods introduced by Symfony 3.0, and do not rely on '
             . 'isGranted method', E_USER_DEPRECATED);
-        
+
         return $this->isGranted($attribute, $subject, $token->getUser());
     }
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index 697158bf8..ab1d1aed1 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -23,6 +23,8 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Entity\Scope;
@@ -32,87 +34,97 @@ use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\RoleScope;
 
 /**
- * Helper for authorizations. 
- * 
+ * Helper for authorizations.
+ *
  * Provides methods for user and entities information.
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class AuthorizationHelper
 {
+    protected RoleHierarchyInterface $roleHierarchy;
+
     /**
-     *
-     * @var RoleHierarchyInterface
-     */
-    protected $roleHierarchy;
-    
-    /**
-     * The role in a hierarchy, given by the parameter 
+     * The role in a hierarchy, given by the parameter
      * `security.role_hierarchy.roles` from the container.
      *
      * @var string[]
      */
-    protected $hierarchy;
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
+    protected array $hierarchy;
+
+    protected EntityManagerInterface $em;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
     public function __construct(
         RoleHierarchyInterface $roleHierarchy,
-        $hierarchy,
-        EntityManagerInterface $em
+        ParameterBagInterface $parameterBag,
+        EntityManagerInterface $em,
+        CenterResolverDispatcher $centerResolverDispatcher
     ) {
         $this->roleHierarchy = $roleHierarchy;
-        $this->hierarchy     = $hierarchy;
+        $this->hierarchy     = $parameterBag->get('security.role_hierarchy.roles');
         $this->em = $em;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
     }
-    
+
     /**
      * Determines if a user is active on this center
-     * 
+     *
+     * If
+     *
      * @param User $user
-     * @param Center $center
+     * @param Center|Center[] $center May be an array of center
      * @return bool
      */
-    public function userCanReachCenter(User $user, Center $center)
+    public function userCanReachCenter(User $user, $center)
     {
-        foreach ($user->getGroupCenters() as $groupCenter) {
-            if ($center->getId() === $groupCenter->getCenter()->getId()) {
-                
-                return true;
+        if ($center instanceof \Traversable) {
+            foreach ($center as $c) {
+                if ($c->userCanReachCenter($user, $c)) {
+                    return true;
+                }
             }
+            return false;
+        } elseif ($center instanceof Center) {
+            foreach ($user->getGroupCenters() as $groupCenter) {
+                if ($center->getId() === $groupCenter->getCenter()->getId()) {
+                    return true;
+                }
+            }
+
+            return false;
         }
-        
-        return false;
+
+        throw new \UnexpectedValueException(sprintf("The entity given is not an ".
+            "instance of %s, %s given", Center::class, get_class($center)));
     }
-    
+
     /**
-     * 
+     *
      * Determines if the user has access to the given entity.
-     * 
+     *
      * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
      * the scope is taken into account.
-     * 
+     *
      * @param User $user
-     * @param HasCenterInterface $entity the entity may also implement HasScopeInterface
+     * @param mixed $entity the entity may also implement HasScopeInterface
      * @param string|Role $attribute
      * @return boolean true if the user has access
      */
-    public function userHasAccess(User $user, HasCenterInterface $entity, $attribute)
+    public function userHasAccess(User $user, $entity, $attribute)
     {
-        
-        $center = $entity->getCenter();
-        
+        if (NULL === $center = $this->centerResolverDispatcher->resolveCenter($entity)) {
+            return false;
+        }
+
         if (!$this->userCanReachCenter($user, $center)) {
             return false;
         }
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             //filter on center
-            if ($groupCenter->getCenter()->getId() === $entity->getCenter()->getId()) {
+            if ($groupCenter->getCenter() === $center) {
                 $permissionGroup = $groupCenter->getPermissionsGroup();
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
@@ -134,17 +146,17 @@ class AuthorizationHelper
                         }
                     }
                 }
-                
+
             }
         }
-        
+
         return false;
     }
-    
+
     /**
      * Get reachable Centers for the given user, role,
      * and optionnaly Scope
-     * 
+     *
      * @param User $user
      * @param string|Role $role
      * @param null|Scope $scope
@@ -156,7 +168,7 @@ class AuthorizationHelper
             $role = $role->getRole();
         }
         $centers = array();
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             $permissionGroup = $groupCenter->getPermissionsGroup();
             //iterate on roleScopes
@@ -170,13 +182,13 @@ class AuthorizationHelper
                         if ($scope->getId() == $roleScope->getScope()->getId()){
                             $centers[] = $groupCenter->getCenter();
                             break 1;
-                        }      
+                        }
                     }
                 }
             }
-            
+
         }
-        
+
         return $centers;
     }
 
@@ -203,10 +215,10 @@ class AuthorizationHelper
 
         return $results;
     }
-    
+
     /**
      * Return all reachable scope for a given user, center and role
-     * 
+     *
      * @deprecated Use getReachableCircles
      *
      * @param User $user
@@ -222,10 +234,10 @@ class AuthorizationHelper
 
         return $this->getReachableCircles($user, $role, $center);
     }
-    
+
     /**
      * Return all reachable circle for a given user, center and role
-     * 
+     *
      * @param User $user
      * @param string|Role $role
      * @param Center $center
@@ -237,7 +249,7 @@ class AuthorizationHelper
             $role = $role->getRole();
         }
         $scopes = array();
-        
+
         foreach ($user->getGroupCenters() as $groupCenter){
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
                 //iterate on permissionGroup
@@ -251,12 +263,12 @@ class AuthorizationHelper
                 }
             }
         }
-        
+
         return $scopes;
     }
-    
+
     /**
-     * 
+     *
      * @param Role $role
      * @param Center $center
      * @param Scope $circle
@@ -267,7 +279,7 @@ class AuthorizationHelper
         $parents = $this->getParentRoles($role);
         $parents[] = $role;
         $parentRolesString = \array_map(function(Role $r) { return $r->getRole(); }, $parents);
-        
+
         $qb = $this->em->createQueryBuilder();
         $qb
             ->select('u')
@@ -278,21 +290,21 @@ class AuthorizationHelper
             ->where('gc.center = :center')
             ->andWhere($qb->expr()->in('rs.role', $parentRolesString))
             ;
-        
+
         $qb->setParameter('center', $center);
-        
+
         if ($circle !== null) {
             $qb->andWhere('rs.scope = :circle')
                 ->setParameter('circle', $circle)
                 ;
         }
-        
+
         return $qb->getQuery()->getResult();
     }
-    
+
     /**
      * Test if a parent role may give access to a given child role
-     * 
+     *
      * @param Role $childRole The role we want to test if he is reachable
      * @param Role $parentRole The role which should give access to $childRole
      * @return boolean true if the child role is granted by parent role
@@ -301,14 +313,14 @@ class AuthorizationHelper
     {
         $reachableRoles = $this->roleHierarchy
                 ->getReachableRoleNames([$parentRole]);
-        
+
         return in_array($childRole, $reachableRoles);
     }
-    
+
     /**
-     * Return all the role which give access to the given role. Only the role 
+     * Return all the role which give access to the given role. Only the role
      * which are registered into Chill are taken into account.
-     * 
+     *
      * @param Role $role
      * @return Role[] the role which give access to the given $role
      */
@@ -319,18 +331,18 @@ class AuthorizationHelper
         $roles = \array_map(
                 function($string) {
                     return new Role($string);
-                }, 
+                },
                 \array_keys($this->hierarchy)
                 );
-        
+
         foreach ($roles as $r) {
             $childRoles = $this->roleHierarchy->getReachableRoleNames([$r->getRole()]);
-            
+
             if (\in_array($role, $childRoles)) {
                 $parentRoles[] = $r;
             }
         }
-        
+
         return $parentRoles;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php
new file mode 100644
index 000000000..98882b876
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+class DefaultVoter implements VoterInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected array $configuration = [];
+
+    /**
+     * @param AuthorizationHelper $authorizationHelper
+     * @param CenterResolverDispatcher $centerResolverDispatcher
+     * @param array $configuration
+     */
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher,
+        array $configuration
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->configuration = $configuration;
+    }
+
+    public function supports($attribute, $subject): bool
+    {
+        foreach ($this->configuration as list($attributes, $subj)) {
+            if ($subj === null) {
+                if ($subject === null && \in_array($attribute, $attributes)) {
+                    return true;
+                }
+            } elseif ($subject instanceof $subj) {
+                return \in_array($attribute, $attributes);
+            }
+        }
+
+        return false;
+    }
+
+    public function voteOnAttribute($attribute, $subject, $token): bool
+    {
+        if (!$token->getUser() instanceof User) {
+            return false;
+        }
+
+        if (NULL === $subject) {
+           if (NULL === $center = $this->centerResolverDispatcher
+               ->resolveCenter($subject)) {
+               return false;
+           }
+           return $this->authorizationHelper->userCanReachCenter(
+               $token->getUser(),
+               $center
+           );
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php
new file mode 100644
index 000000000..4f3f232d9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+class DefaultVoterFactory implements VoterFactoryInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function generate($context): VoterGeneratorInterface
+    {
+        return new VoterGenerator(
+            $this->authorizationHelper,
+            $this->centerResolverDispatcher
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
new file mode 100644
index 000000000..b12739674
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterFactoryInterface
+{
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php
new file mode 100644
index 000000000..e3b517f99
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+
+final class VoterGenerator implements VoterGeneratorInterface
+{
+    protected AuthorizationHelper $authorizationHelper;
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+    protected array $configuration = [];
+
+    public function __construct(
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher
+    ) {
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function addCheckFor($subject, $attributes): self
+    {
+       $this->configuration[] = [$attributes, $subject];
+
+       return $this;
+    }
+
+    public function build(): VoterInterface
+    {
+        return new DefaultVoter(
+            $this->authorizationHelper,
+            $this->centerResolverDispatcher,
+            $this->configuration
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
new file mode 100644
index 000000000..0aaf04ecd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterGeneratorInterface
+{
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php
new file mode 100644
index 000000000..848d22190
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterInterface
+{
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
new file mode 100644
index 000000000..851183e3d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class CenterResolverDispatcherTest extends KernelTestCase
+{
+    private CenterResolverDispatcher $dispatcher;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+        $this->dispatcher = self::$container->get(CenterResolverDispatcher::class);
+    }
+
+    public function testResolveCenter()
+    {
+       $center = new Center();
+
+       $resolved = $this->dispatcher->resolveCenter($center);
+
+       $this->assertSame($center, $resolved);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 474ac0093..405dce19b 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -3,12 +3,38 @@ services:
         autowire: true
         autoconfigure: true
 
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\CenterResolverDispatcher:
+        arguments:
+            - !tagged_iterator chill_main.center_resolver
+
+    # do not autowire the directory Security/Resolver
+    _instanceof:
+        Chill\MainBundle\Security\Resolver\CenterResolverInterface:
+            tags:
+                - chill_main.center_resolver
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
+        autoconfigure: true
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Authorization\DefaultVoterFactory:
+        autowire: true
+
+    # do not autowire the directory Security/Resolver
+    Chill\MainBundle\Security\Authorization\VoterFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterFactory'
+
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
-        arguments:
-            $roleHierarchy: "@security.role_hierarchy"
-            $hierarchy: "%security.role_hierarchy.roles%"
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+        autowire: true
+        autoconfigure: true
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
 
     chill.main.role_provider:
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 8b8bce839..7c4f2d4d9 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -18,7 +18,12 @@
 
 namespace Chill\TaskBundle\Security\Authorization;
 
+use Chill\EventBundle\Entity\Event;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\VoterFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\TaskBundle\Entity\AbstractTask;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -32,12 +37,7 @@ use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\TaskBundle\Security\Authorization\AuthorizationEvent;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
+final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     const CREATE = 'CHILL_TASK_TASK_CREATE';
     const UPDATE = 'CHILL_TASK_TASK_UPDATE';
@@ -51,50 +51,52 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
         self::DELETE
     ];
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     *
-     * @var AccessDecisionManagerInterface
-     */
-    protected $accessDecisionManager;
+    protected AccessDecisionManagerInterface $accessDecisionManager;
 
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected LoggerInterface $logger;
+
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected VoterInterface $voter;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
         EventDispatcherInterface $eventDispatcher,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        CenterResolverDispatcher $centerResolverDispatcher,
+        VoterFactoryInterface $voterFactory
     ) {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+
+        $this->voter = $voterFactory
+            ->generate(AbstractTask::class)
+            ->addCheckFor(AbstractTask::class, self::ROLES)
+            ->addCheckFor(Person::class, [self::SHOW])
+            ->addCheckFor(null, [self::SHOW])
+            ->build()
+            ;
     }
 
     public function supports($attribute, $subject)
     {
+        return $this->voter->supports($attribute, $subject);
+       /*
         return ($subject instanceof AbstractTask && in_array($attribute, self::ROLES))
             ||
             ($subject instanceof Person && \in_array($attribute, [ self::CREATE, self::SHOW ]))
             ||
             (NULL === $subject && $attribute === self::SHOW )
             ;
+       */
     }
 
     /**
@@ -111,40 +113,60 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
+
         $event = new AuthorizationEvent($subject, $attribute, $token);
-        
+
         $this->eventDispatcher->dispatch(AuthorizationEvent::VOTE, $event);
-        
+
         if ($event->hasVote()) {
-            
+
             $this->logger->debug("The TaskVoter is overriding by "
                 .AuthorizationEvent::VOTE, [
                     'vote' => $event->getVote(),
                     'task_id' => $subject->getId()
                 ]);
-            
+
             return $event->getVote();
         }
 
+        // do pre-flight check, relying on other decision manager
+        // those pre-flight check concern associated entities
+        if ($subject instanceof AbstractTask) {
+            if (NULL !== $person = $subject->getPerson()) {
+                if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+                    return false;
+                }
+            } elseif (false) {
+                // here will come the test if the task is associated to an accompanying course
+            }
+        }
+
+        // do regular check.
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
+
+       /*
         if ($subject instanceof AbstractTask) {
             if ($subject->getPerson() === null) {
                 throw new \LogicException("You should associate a person with task "
                     . "in order to check autorizations");
             }
-            
+
             $person = $subject->getPerson();
         } elseif ($subject instanceof Person) {
             $person = $subject;
         } else {
             // subject is null. We check  that at least one center is reachable
             $centers = $this->authorizationHelper->getReachableCenters($token->getUser(), new Role($attribute));
-            
+
             return count($centers) > 0;
         }
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+        $center = $this->centerResolverDispatcher->resolveCenter($subject);
 
+        if (NULL === $center) {
             return false;
         }
 
@@ -153,6 +175,7 @@ class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterf
             $subject,
             $attribute
             );
+       */
     }
 
     public function getRoles()
diff --git a/src/Bundle/ChillTaskBundle/config/services/security.yaml b/src/Bundle/ChillTaskBundle/config/services/security.yaml
index e58fd19e3..c1d176637 100644
--- a/src/Bundle/ChillTaskBundle/config/services/security.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/security.yaml
@@ -1,11 +1,7 @@
 services:
     chill_task.task_voter:
         class: Chill\TaskBundle\Security\Authorization\TaskVoter
-        arguments:
-            - "@security.access.decision_manager"
-            - "@chill.main.security.authorization.helper"
-            - '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            - "@logger"
+        autowire: true
+        autoconfigure: true
         tags:
-            - { name: security.voter }
             - { name: chill.role }

From 960bac8c377787ed87d6cdbd68265bcb3ebc7694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Sep 2021 16:05:45 +0200
Subject: [PATCH 150/217] create alias for RoleProvider for allowing autowiring

---
 src/Bundle/ChillMainBundle/config/services/security.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 405dce19b..9925f972c 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -39,6 +39,7 @@ services:
 
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
+    Chill\MainBundle\Security\RoleProvider: '@chill.main.role_provider'
 
     chill.main.user_provider:
         class: Chill\MainBundle\Security\UserProvider\UserProvider

From 9b38e486dff668d8ec3d92d2c17ee0e9281f9a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Sep 2021 17:28:03 +0200
Subject: [PATCH 151/217] extends User entity + alter admin (WIP)

---
 .../ChillMainExtension.php                    |  23 +++
 src/Bundle/ChillMainBundle/Entity/User.php    | 182 ++++++++++++++----
 src/Bundle/ChillMainBundle/Entity/UserJob.php |  76 ++++++++
 .../ChillMainBundle/Form/UserJobType.php      |  27 +++
 src/Bundle/ChillMainBundle/Form/UserType.php  |  53 ++++-
 .../views/CRUD/Admin/index.html.twig          |   8 +
 .../Resources/views/UserJob/index.html.twig   |  26 +++
 .../ChillMainBundle/config/services/form.yaml |   5 +
 .../ChillMainBundle/config/validation.yaml    |   2 +
 .../migrations/Version20210903144853.php      |  53 +++++
 10 files changed, 413 insertions(+), 42 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/UserJob.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/UserJobType.php
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20210903144853.php

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 1637ee098..09897fec2 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -19,6 +19,8 @@
 
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\UserJobType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -264,6 +266,27 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => UserJob::class,
+                    'name' => 'admin_user_job',
+                    'base_path' => '/admin/main/user-job',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => UserJobType::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN'
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN'
+                        ]
+                    ],
+                ],
+            ],
             'apis' => [
                 [
                     'class' => \Chill\MainBundle\Entity\Address::class,
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 76bb7b54d..140e0889c 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -5,6 +5,7 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Chill\MainBundle\Entity\UserJob;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
@@ -20,7 +21,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * })
  */
 class User implements AdvancedUserInterface {
-    
+
     /**
      * @var integer
      *
@@ -36,7 +37,7 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="string", length=80)
      */
     private $username;
-    
+
     /**
      * @var string
      *
@@ -46,14 +47,19 @@ class User implements AdvancedUserInterface {
      *     unique=true)
      */
     private $usernameCanonical;
-    
+
+    /**
+     * @ORM\Column(type="string", length=200)
+     */
+    private string $label = '';
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=150, nullable=true)
      */
     private $email;
-    
+
     /**
      * @var string
      *
@@ -64,14 +70,14 @@ class User implements AdvancedUserInterface {
      *     unique=true)
      */
     private $emailCanonical;
-    
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=255)
      */
     private $password;
-    
+
     /**
      * @var string
      * @internal must be set to null if we use bcrypt
@@ -79,7 +85,7 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="string", length=255, nullable=true)
      */
     private $salt = null;
-    
+
     /**
      * @var boolean
      *
@@ -87,14 +93,14 @@ class User implements AdvancedUserInterface {
      *      sf4 check: in yml was false by default !?
      */
     private $locked = true;
-    
+
     /**
      * @var boolean
      *
      * @ORM\Column(type="boolean")
      */
     private $enabled = true;
-    
+
     /**
      * @var Collection
      *
@@ -112,7 +118,25 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(type="json_array", nullable=true)
      */
     private $attributes;
-    
+
+    /**
+     * @var Center|null
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private ?Center $mainCenter = null;
+
+    /**
+     * @var Scope|null
+     * @ORM\ManyToOne(targetEntity=Scope::class)
+     */
+    private ?Scope $mainScope = null;
+
+    /**
+     * @var UserJob|null
+     * @ORM\ManyToOne(targetEntity=UserJob::class)
+     */
+    private ?UserJob $userJob = null;
+
     /**
      * User constructor.
      */
@@ -120,13 +144,13 @@ class User implements AdvancedUserInterface {
     {
         $this->groupCenters = new ArrayCollection();
     }
-    
+
     /**
      * @return string
      */
     public function __toString()
     {
-        return $this->getUsername();
+        return $this->getLabel();
     }
 
     /**
@@ -148,10 +172,14 @@ class User implements AdvancedUserInterface {
     public function setUsername($name)
     {
         $this->username = $name;
-    
+
+        if (empty($this->getLabel())) {
+            $this->setLabel($name);
+        }
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -159,11 +187,11 @@ class User implements AdvancedUserInterface {
     {
         return $this->username;
     }
-    
+
     /**
      */
     public function eraseCredentials() {}
-    
+
     /**
      * @return array
      */
@@ -171,7 +199,7 @@ class User implements AdvancedUserInterface {
     {
         return array('ROLE_USER');
     }
-    
+
     /**
      * @return null|string
      */
@@ -179,7 +207,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->salt;
     }
-    
+
     /**
      * @param $usernameCanonical
      * @return $this
@@ -187,10 +215,10 @@ class User implements AdvancedUserInterface {
     public function setUsernameCanonical($usernameCanonical)
     {
         $this->usernameCanonical = $usernameCanonical;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -198,7 +226,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->usernameCanonical;
     }
-    
+
     /**
      * @param $email
      * @return $this
@@ -206,10 +234,10 @@ class User implements AdvancedUserInterface {
     public function setEmail($email)
     {
         $this->email = $email;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -217,7 +245,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->email;
     }
-    
+
     /**
      * @param $emailCanonical
      * @return $this
@@ -225,10 +253,10 @@ class User implements AdvancedUserInterface {
     public function setEmailCanonical($emailCanonical)
     {
         $this->emailCanonical = $emailCanonical;
-        
+
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -236,7 +264,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->emailCanonical;
     }
-    
+
     /**
      * @param $password
      * @return $this
@@ -244,7 +272,7 @@ class User implements AdvancedUserInterface {
     function setPassword($password)
     {
         $this->password =  $password;
-        
+
         return $this;
     }
 
@@ -255,7 +283,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->password;
     }
-    
+
     /**
      * @param $salt
      * @return $this
@@ -265,7 +293,7 @@ class User implements AdvancedUserInterface {
         $this->salt = $salt;
         return $this;
     }
-    
+
     /**
      * @return bool
      */
@@ -273,7 +301,7 @@ class User implements AdvancedUserInterface {
     {
         return true;
     }
-    
+
     /**
      * @return bool
      */
@@ -281,7 +309,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->locked;
     }
-    
+
     /**
      * @return bool
      */
@@ -289,7 +317,7 @@ class User implements AdvancedUserInterface {
     {
         return true;
     }
-    
+
     /**
      * @return bool
      */
@@ -297,17 +325,17 @@ class User implements AdvancedUserInterface {
     {
         return $this->enabled;
     }
-    
+
     /**
      * @param bool $enabled
      */
     public function setEnabled($enabled)
     {
         $this->enabled = $enabled;
-        
+
         return $this;
     }
-    
+
     /**
      * @return GroupCenter
      */
@@ -315,7 +343,7 @@ class User implements AdvancedUserInterface {
     {
         return $this->groupCenters;
     }
-    
+
     /**
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @return \Chill\MainBundle\Entity\User
@@ -325,7 +353,7 @@ class User implements AdvancedUserInterface {
         $this->groupCenters->add($groupCenter);
         return $this;
     }
-    
+
     /**
      * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      * @throws \RuntimeException if the groupCenter is not in the collection
@@ -337,9 +365,9 @@ class User implements AdvancedUserInterface {
                     . "it seems not to be associated with the user. Aborting."));
         }
     }
-    
+
     /**
-     * This function check that groupCenter are present only once. The validator 
+     * This function check that groupCenter are present only once. The validator
      * use this function to avoid a user to be associated to the same groupCenter
      * more than once.
      */
@@ -350,7 +378,7 @@ class User implements AdvancedUserInterface {
             if (in_array($groupCenter->getId(), $groupCentersIds)) {
                 $context->buildViolation("The user has already those permissions")
                         ->addViolation();
-                
+
             } else {
                 $groupCentersIds[] = $groupCenter->getId();
             }
@@ -384,4 +412,76 @@ class User implements AdvancedUserInterface {
 
         return $this->attributes;
     }
+
+    /**
+     * @return string
+     */
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return User
+     */
+    public function setLabel(string $label): User
+    {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return Center|null
+     */
+    public function getMainCenter(): ?Center
+    {
+        return $this->mainCenter;
+    }
+
+    /**
+     * @param Center|null $mainCenter
+     * @return User
+     */
+    public function setMainCenter(?Center $mainCenter): User
+    {
+        $this->mainCenter = $mainCenter;
+        return $this;
+    }
+
+    /**
+     * @return Scope|null
+     */
+    public function getMainScope(): ?Scope
+    {
+        return $this->mainScope;
+    }
+
+    /**
+     * @param Scope|null $mainScope
+     * @return User
+     */
+    public function setMainScope(?Scope $mainScope): User
+    {
+        $this->mainScope = $mainScope;
+        return $this;
+    }
+
+    /**
+     * @return UserJob|null
+     */
+    public function getUserJob(): ?UserJob
+    {
+        return $this->userJob;
+    }
+
+    /**
+     * @param UserJob|null $userJob
+     * @return User
+     */
+    public function setUserJob(?UserJob $userJob): User
+    {
+        $this->userJob = $userJob;
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
new file mode 100644
index 000000000..9d1ca9157
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_user_job")
+ */
+class UserJob
+{
+
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected ?int $id = null;
+
+    /**
+     * @var array|string[]A
+     * @ORM\Column(name="label", type="json")
+     */
+    protected array $label = [];
+
+    /**
+     * @var bool
+     * @ORM\Column(name="active", type="boolean")
+     */
+    protected bool $active = true;
+
+    /**
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return array|string[]
+     */
+    public function getLabel(): array
+    {
+        return $this->label;
+    }
+
+    /**
+     * @param array|string[] $label
+     * @return UserJob
+     */
+    public function setLabel(array $label): UserJob
+    {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param bool $active
+     * @return UserJob
+     */
+    public function setActive(bool $active): UserJob
+    {
+        $this->active = $active;
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/UserJobType.php b/src/Bundle/ChillMainBundle/Form/UserJobType.php
new file mode 100644
index 000000000..eec718261
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/UserJobType.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserJobType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class, [
+                'label' => 'Label',
+                'required' => true
+            ])
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false
+                ]
+            ])
+            ;
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 5196ee6c0..09e2d1391 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -2,7 +2,15 @@
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -16,6 +24,16 @@ use Chill\MainBundle\Form\UserPasswordType;
 
 class UserType extends AbstractType
 {
+    private TranslatableStringHelper $translatableStringHelper;
+
+    /**
+     * @param TranslatableStringHelper $translatableStringHelper
+     */
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
     /**
      * @param FormBuilderInterface $builder
      * @param array $options
@@ -24,7 +42,40 @@ class UserType extends AbstractType
     {
         $builder
             ->add('username')
-            ->add('email')
+            ->add('email', EmailType::class, [
+                'required' => true
+            ])
+            ->add('label', TextType::class)
+            ->add('mainCenter', EntityType::class, [
+                'label' => 'main center',
+                'required' => false,
+                'placeholder' => 'choose a main center',
+                'class' => Center::class,
+                'query_builder' => function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('c');
+                    $qb->addOrderBy('c.name');
+
+                    return $qb;
+                }
+            ])
+            ->add('mainScope', EntityType::class, [
+                'label' => 'Choose a main scope',
+                'required' => false,
+                'placeholder' => 'choose a main scope',
+                'class' => Scope::class,
+                'choice_label' => function (Scope $c) {
+                    return $this->translatableStringHelper->localize($c->getName());
+                },
+            ])
+            ->add('userJob', EntityType::class, [
+                'label' => 'Choose a job',
+                'required' => false,
+                'placeholder' => 'choose a job',
+                'class' => UserJob::class,
+                'choice_label' => function (UserJob $c) {
+                    return $this->translatableStringHelper->localize($c->getLabel());
+                },
+            ])
             ;
         if ($options['is_creation']) {
             $builder->add('plainPassword', RepeatedType::class, array(
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
new file mode 100644
index 000000000..1dc0acc81
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
@@ -0,0 +1,8 @@
+{% extends '@ChillMain/Admin/layout.html.twig' %}
+
+{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
new file mode 100644
index 000000000..8f037f150
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -0,0 +1,26 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>label</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_admin_user_job_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index bd5c1ece5..f719edb55 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -113,6 +113,10 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\UserType:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
             - { name: form.type }
@@ -123,3 +127,4 @@ services:
             - "@security.token_storage"
         tags:
             - { name: form.type }
+
diff --git a/src/Bundle/ChillMainBundle/config/validation.yaml b/src/Bundle/ChillMainBundle/config/validation.yaml
index dd5f8d985..79cf4d8f9 100644
--- a/src/Bundle/ChillMainBundle/config/validation.yaml
+++ b/src/Bundle/ChillMainBundle/config/validation.yaml
@@ -18,6 +18,8 @@ Chill\MainBundle\Entity\User:
                 min: 3
         email:
             - Email: ~
+        label:
+            - NotBlank: ~
     constraints:
         - Callback:
               callback: isGroupCenterPresentOnce
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
new file mode 100644
index 000000000..4e252c3a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add metadata on users
+ */
+final class Version20210903144853 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add metadata on users';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_user_job_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_user_job (id INT NOT NULL, label JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE users ADD label VARCHAR(200) NULL DEFAULT NULL');
+        $this->addSql('UPDATE users SET label=username');
+        $this->addSql('ALTER TABLE users ALTER label DROP DEFAULT');
+        $this->addSql('ALTER TABLE users ALTER label SET NOT NULL');
+        $this->addSql('ALTER TABLE users ADD mainCenter_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD mainScope_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD userJob_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ALTER usernamecanonical SET NOT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E92C2125C1 FOREIGN KEY (mainCenter_id) REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E9115E73F3 FOREIGN KEY (mainScope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E964B65C5B FOREIGN KEY (userJob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_1483A5E92C2125C1 ON users (mainCenter_id)');
+        $this->addSql('CREATE INDEX IDX_1483A5E9115E73F3 ON users (mainScope_id)');
+        $this->addSql('CREATE INDEX IDX_1483A5E964B65C5B ON users (userJob_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E964B65C5B');
+        $this->addSql('DROP SEQUENCE chill_main_user_job_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_user_job');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E92C2125C1');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E9115E73F3');
+        $this->addSql('ALTER TABLE users DROP label');
+        $this->addSql('ALTER TABLE users DROP mainCenter_id');
+        $this->addSql('ALTER TABLE users DROP mainScope_id');
+        $this->addSql('ALTER TABLE users DROP userJob_id');
+        $this->addSql('ALTER TABLE users ALTER usernameCanonical DROP NOT NULL');
+    }
+}

From b4e78a948bfd7831db40869ea72f94ba3ad3b3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 6 Sep 2021 14:50:52 +0200
Subject: [PATCH 152/217] remove NOT NULL for User::usernamecanonical

---
 src/Bundle/ChillMainBundle/Entity/User.php                     | 3 ++-
 .../ChillMainBundle/migrations/Version20210903144853.php       | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 140e0889c..41d6db40c 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -44,7 +44,8 @@ class User implements AdvancedUserInterface {
      * @ORM\Column(
      *     type="string",
      *     length=80,
-     *     unique=true)
+     *     unique=true,
+     *     nullable=true)
      */
     private $usernameCanonical;
 
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
index 4e252c3a3..7fe6b8e72 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
@@ -28,7 +28,6 @@ final class Version20210903144853 extends AbstractMigration
         $this->addSql('ALTER TABLE users ADD mainCenter_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE users ADD mainScope_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE users ADD userJob_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE users ALTER usernamecanonical SET NOT NULL');
         $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E92C2125C1 FOREIGN KEY (mainCenter_id) REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E9115E73F3 FOREIGN KEY (mainScope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E964B65C5B FOREIGN KEY (userJob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');

From addcf72ae62611205c793027a93e34af2aea24e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 8 Sep 2021 18:37:30 +0200
Subject: [PATCH 153/217] improve addresses

---
 src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php |  4 ++--
 src/Bundle/ChillMainBundle/Entity/Address.php          | 10 ++++++++++
 .../Repository/AddressReferenceRepository.php          |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index 086b566da..0a0c160cd 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -21,7 +21,7 @@ class PointType extends Type {
      *
      * @param array $fieldDeclaration
      * @param AbstractPlatform $platform
-     * @return type
+     * @return string
      */
     public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
@@ -32,7 +32,7 @@ class PointType extends Type {
      *
      * @param type $value
      * @param AbstractPlatform $platform
-     * @return Point
+     * @return ?Point
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index f3973ff0f..22e4848bf 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -383,6 +383,16 @@ class Address
             ;
     }
 
+    public static function createFromAddressReference(AddressReference $original): Address
+    {
+        return (new Address())
+            ->setPoint($original->getPoint())
+            ->setPostcode($original->getPostcode())
+            ->setStreet($original->getStreet())
+            ->setStreetNumber($original->getStreetNumber())
+            ;
+    }
+
     public function getStreet(): ?string
     {
         return $this->street;
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index f040446b3..cf488f411 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -36,6 +36,14 @@ final class AddressReferenceRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    public function countAll(): int
+    {
+        $qb = $this->repository->createQueryBuilder('ar');
+        $qb->select('count(ar.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
     /**
      * @return AddressReference[]
      */

From f87f03b5c0adc15c21f6f9a98f9a3b4c0143b49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 10 Sep 2021 12:06:00 +0200
Subject: [PATCH 154/217] Move CenterResolverInterface auto-configuring to
 bundledefinition

It seems that the service encountered in bundle loaded before does not
works.
---
 src/Bundle/ChillMainBundle/ChillMainBundle.php           | 3 +++
 src/Bundle/ChillMainBundle/config/services/security.yaml | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index ee9523273..d059443b5 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
@@ -27,6 +28,8 @@ class ChillMainBundle extends Bundle
 
         $container->registerForAutoconfiguration(LocalMenuBuilderInterface::class)
             ->addTag('chill.menu_builder');
+        $container->registerForAutoconfiguration(CenterResolverInterface::class)
+            ->addTag('chill_main.center_resolver');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 9925f972c..7590acb5f 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -8,12 +8,6 @@ services:
         arguments:
             - !tagged_iterator chill_main.center_resolver
 
-    # do not autowire the directory Security/Resolver
-    _instanceof:
-        Chill\MainBundle\Security\Resolver\CenterResolverInterface:
-            tags:
-                - chill_main.center_resolver
-
     # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
         autoconfigure: true

From 6bc83edfe9267eca4bc941e8ad5451a621baa6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 10 Sep 2021 17:44:01 +0200
Subject: [PATCH 155/217] Refactor PersonSearch and create
 PersonACLAwareRepository

The search api delegates the query to a person acl aware "repository"
(although this does not implements ObjectRepository interface).
---
 .../ChillMainBundle/ChillMainBundle.php       |   1 +
 .../Search/SearchInterface.php                |  43 ++-
 .../Repository/PersonACLAwareRepository.php   | 272 +++++++++++++++++
 .../PersonACLAwareRepositoryInterface.php     |  50 +++
 .../Repository/PersonRepository.php           |  24 +-
 .../ChillPersonBundle/Search/PersonSearch.php | 285 ++++++------------
 .../Search/SimilarityPersonSearch.php         | 212 ++-----------
 .../ChillPersonBundle/config/services.yaml    |   1 -
 .../config/services/repository.yaml           |   5 +
 .../config/services/search.yaml               |  20 +-
 10 files changed, 497 insertions(+), 416 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php

diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index d059443b5..d2ae5f1b5 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Search\SearchInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index 708835b47..958ce9ddd 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -23,45 +23,44 @@ namespace Chill\MainBundle\Search;
 
 /**
  * This interface must be implemented on services which provide search results.
- * 
+ *
  * @todo : write doc and add a link to documentation
- * 
+ *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  *
  */
 interface SearchInterface
 {
-
     const SEARCH_PREVIEW_OPTION = '_search_preview';
-    
+
     /**
      * Request parameters contained inside the `add_q` parameters
      */
     const REQUEST_QUERY_PARAMETERS = '_search_parameters';
-    
+
     /**
      * Supplementary parameters to the query string
      */
     const REQUEST_QUERY_KEY_ADD_PARAMETERS = 'add_q';
 
-   /** 
+   /**
     * return the result in a html string. The string will be inclued (as raw)
     * into a global view.
-    * 
+    *
     * The global view may be :
     * {% for result as resultsFromDifferentSearchInterface %}
     *    {{ result|raw }}
     * {% endfor %}
-    * 
+    *
     * **available options** :
-    * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of 
+    * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of
     * the results. In this case, a subset of results should be returned, and,
     * if the query return more results, a button "see all results" should be
     * displayed at the end of the list.
-    * 
-    * **Interaction between `start` and `limit` and pagination : you should 
-    * take only the given parameters into account; the results from pagination 
-    * should be ignored. (Most of the time, it should be the same). 
+    *
+    * **Interaction between `start` and `limit` and pagination : you should
+    * take only the given parameters into account; the results from pagination
+    * should be ignored. (Most of the time, it should be the same).
     *
     * @param array  $terms   the string to search
     * @param int    $start   the first result (for pagination)
@@ -72,10 +71,10 @@ interface SearchInterface
     */
    public function renderResult(array $terms, $start=0, $limit=50, array $options = array(), $format = 'html');
 
-   /** 
+   /**
     * we may desactive the search interface by default. in this case,
-    * the search will be launch and rendered only with "advanced search" 
-    * 
+    * the search will be launch and rendered only with "advanced search"
+    *
     * this may be activated/desactived from bundle definition in config.yml
     *
     * @return bool
@@ -84,18 +83,18 @@ interface SearchInterface
 
    /**
     * the order in which the results will appears in the global view
-    * 
+    *
     * (this may be eventually defined in config.yml)
-    * 
-    * @return int 
+    *
+    * @return int
     */
    public function getOrder();
-   
+
    /**
     * indicate if the implementation supports the given domain
-    * 
+    *
     * @return boolean
     */
    public function supports($domain, $format);
-   
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
new file mode 100644
index 000000000..f466260ca
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -0,0 +1,272 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\CountryRepository;
+use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
+
+
+final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
+{
+    private Security $security;
+
+    private EntityManagerInterface $em;
+
+    private CountryRepository $countryRepository;
+
+    private AuthorizationHelper $authorizationHelper;
+
+    public function __construct(
+        Security $security,
+        EntityManagerInterface $em,
+        CountryRepository $countryRepository,
+        AuthorizationHelper $authorizationHelper
+    ) {
+        $this->security = $security;
+        $this->em = $em;
+        $this->countryRepository = $countryRepository;
+        $this->authorizationHelper = $authorizationHelper;
+    }
+
+    /**
+     * @return array|Person[]
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function findBySearchCriteria(
+        int $start,
+        int $limit,
+        bool $simplify = false,
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): array {
+        $qb = $this->createSearchQuery($default, $firstname, $lastname,
+            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
+            $countryCode);
+        $this->addACLClauses($qb, 'p');
+
+        if ($simplify) {
+            $qb->select(
+                'p.id',
+                $qb->expr()->concat(
+                    'p.firstName',
+                    $qb->expr()->literal(' '),
+                    'p.lastName'
+                ).'AS text'
+            );
+        } else {
+            $qb->select('p');
+        }
+
+        $qb
+            ->setMaxResults($limit)
+            ->setFirstResult($start);
+
+        //order by firstname, lastname
+        $qb
+            ->orderBy('p.firstName')
+            ->addOrderBy('p.lastName');
+
+        if ($simplify) {
+            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
+        } else {
+            return $qb->getQuery()->getResult();
+        }
+    }
+
+    public function countBySearchCriteria(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): int {
+        $qb = $this->createSearchQuery($default, $firstname, $lastname,
+            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
+            $countryCode);
+        $this->addACLClauses($qb, 'p');
+
+        $qb->select('COUNT(p.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findBySimilaritySearch(string $pattern, int $firstResult,
+        int $maxResult, bool $simplify = false)
+    {
+        $qb = $this->createSimilarityQuery($pattern);
+        $this->addACLClauses($qb, 'sp');
+
+        if ($simplify) {
+            $qb->select(
+                'sp.id',
+                $qb->expr()->concat(
+                    'sp.firstName',
+                    $qb->expr()->literal(' '),
+                    'sp.lastName'
+                ).'AS text'
+            );
+        } else {
+            $qb->select('p');
+        }
+
+        $qb
+            ->setMaxResults($maxResult)
+            ->setFirstResult($firstResult);
+
+        //order by firstname, lastname
+        $qb
+            ->orderBy('sp.firstName')
+            ->addOrderBy('sp.lastName');
+
+        if ($simplify) {
+            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
+        } else {
+            return $qb->getQuery()->getResult();
+        }
+    }
+
+    public function countBySimilaritySearch(string $pattern)
+    {
+        $qb = $this->createSimilarityQuery($pattern);
+        $this->addACLClauses($qb, 'sp');
+
+        $qb->select('COUNT(sp.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    private function createSearchQuery(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): QueryBuilder {
+
+        if (!$this->security->getUser() instanceof User) {
+            throw new \RuntimeException("Search must be performed by a valid user");
+        }
+        $qb = $this->em->createQueryBuilder();
+        $qb->from(Person::class, 'p');
+
+        if (NULL !== $firstname) {
+            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.firstName))', ':firstname'))
+                ->setParameter('firstname', '%'.$firstname.'%');
+        }
+
+        if (NULL !== $lastname) {
+            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.lastName))', ':lastname'))
+                ->setParameter('lastname', '%'.$lastname.'%');
+        }
+
+        if (NULL !== $birthdate) {
+            $qb->andWhere($qb->expr()->eq('s.birthdate', ':birthdate'))
+                ->setParameter('birthdate', $birthdate);
+        }
+
+        if (NULL !== $birthdateAfter) {
+            $qb->andWhere($qb->expr()->gt('p.birthdate', ':birthdateafter'))
+                ->setParameter('birthdateafter', $birthdateAfter);
+        }
+
+        if (NULL !== $birthdateBefore) {
+            $qb->andWhere($qb->expr()->lt('p.birthdate', ':birthdatebefore'))
+                ->setParameter('birthdatebefore', $birthdateBefore);
+        }
+
+        if (NULL !== $gender) {
+            $qb->andWhere($qb->expr()->eq('p.gender', ':gender'))
+                ->setParameter('gender', $gender);
+        }
+
+        if (NULL !== $countryCode) {
+            try {
+                $country = $this->countryRepository->findOneBy(['countryCode' => $countryCode]);
+            } catch (NoResultException $ex)  {
+                throw new ParsingException('The country code "'.$countryCode.'" '
+                    . ', used in nationality, is unknow', 0, $ex);
+            } catch (NonUniqueResultException $e) {
+                throw $e;
+            }
+
+            $qb->andWhere($qb->expr()->eq('p.nationality', ':nationality'))
+                ->setParameter('nationality', $country);
+        }
+
+        if (NULL !== $default) {
+            $grams = explode(' ', $default);
+
+            foreach($grams as $key => $gram) {
+                $qb->andWhere($qb->expr()
+                    ->like('p.fullnameCanonical', 'UNACCENT(LOWER(:default_'.$key.'))'))
+                    ->setParameter('default_'.$key, '%'.$gram.'%');
+            }
+        }
+
+        return $qb;
+    }
+
+    private function addACLClauses(QueryBuilder $qb, string $personAlias): void
+    {
+        // restrict center for security
+        $reachableCenters = $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), 'CHILL_PERSON_SEE');
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()
+                    ->in($personAlias.'.center', ':centers'),
+                $qb->expr()
+                    ->isNull($personAlias.'.center')
+            )
+        );
+        $qb->setParameter('centers', $reachableCenters);
+    }
+
+    private function createSimilarityQuery($pattern): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder();
+
+        $qb->from(Person::class, 'sp');
+
+        $grams = explode(' ', $pattern);
+
+        foreach($grams as $key => $gram) {
+            $qb->andWhere('SIMILARITY(sp.fullnameCanonical, UNACCENT(LOWER(:default_'.$key.')) ) >= 0.15')
+                ->setParameter('default_'.$key, '%'.$gram.'%');
+        }
+
+        $qb->andWhere($qb->expr()
+            ->notIn(
+                'sp.id',
+                $this->createSearchQuery($pattern)
+                    ->addSelect('p.id')
+                    ->getDQL()
+            )
+        );
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..8e83da03d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Search\ParsingException;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\NonUniqueResultException;
+
+interface PersonACLAwareRepositoryInterface
+{
+
+    /**
+     * @return array|Person[]
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function findBySearchCriteria(
+        int $start,
+        int $limit,
+        bool $simplify = false,
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    ): array;
+
+    public function countBySearchCriteria(
+        string $default = null,
+        string $firstname = null,
+        string $lastname = null,
+        ?\DateTime $birthdate = null,
+        ?\DateTime $birthdateBefore = null,
+        ?\DateTime $birthdateAfter = null,
+        string $gender = null,
+        string $countryCode = null
+    );
+
+    public function findBySimilaritySearch(
+        string $pattern,
+        int $firstResult,
+        int $maxResult,
+        bool $simplify = false
+    );
+
+    public function countBySimilaritySearch(string $pattern);
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 6686b55b7..0235ccc13 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -23,9 +23,11 @@ use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+use UnexpectedValueException;
 
 
-final class PersonRepository
+final class PersonRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -44,6 +46,26 @@ final class PersonRepository
         return $this->repository->findBy(['id' => $ids]);
     }
 
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Person::class;
+    }
+
     /**
      * @param $centers
      * @param $firstResult
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index 231636fff..f62b90006 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -20,71 +20,39 @@
 namespace Chill\PersonBundle\Search;
 
 use Chill\MainBundle\Search\AbstractSearch;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Search\SearchInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Chill\MainBundle\Search\ParsingException;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Search\HasAdvancedSearchFormInterface;
-use Doctrine\ORM\Query;
+use Symfony\Component\Templating\EngineInterface;
 
-class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
-    HasAdvancedSearchFormInterface
+class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterface
 {
-    use ContainerAwareTrait;
-
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
-
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $helper;
-
-    /**
-     *
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
+    protected EngineInterface $templating;
+    protected PaginatorFactory $paginatorFactory;
+    protected PersonACLAwareRepositoryInterface $personACLAwareRepository;
 
     const NAME = "person_regular";
 
+    private const POSSIBLE_KEYS = [
+        '_default', 'firstname', 'lastname', 'birthdate', 'birthdate-before',
+        'birthdate-after', 'gender', 'nationality'
+    ];
 
     public function __construct(
-          EntityManagerInterface $em,
-          TokenStorageInterface $tokenStorage,
-          AuthorizationHelper $helper,
-          PaginatorFactory $paginatorFactory)
-    {
-        $this->em = $em;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->helper = $helper;
+        EngineInterface $templating,
+        PaginatorFactory $paginatorFactory,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository
+    ) {
+        $this->templating = $templating;
         $this->paginatorFactory = $paginatorFactory;
-
-        // throw an error if user is not a valid user
-        if (!$this->user instanceof \Chill\MainBundle\Entity\User) {
-            throw new \LogicException('The user provided must be an instance'
-                  . ' of Chill\MainBundle\Entity\User');
-        }
+        $this->personACLAwareRepository = $personACLAwareRepository;
     }
 
     /*
@@ -120,12 +88,14 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         $paginator = $this->paginatorFactory->create($total);
 
         if ($format === 'html') {
-            return $this->container->get('templating')->render('@ChillPerson/Person/list_with_period.html.twig',
+            return $this->templating->render('@ChillPerson/Person/list_with_period.html.twig',
                     array(
                         'persons' => $this->search($terms, $start, $limit, $options),
-                        'pattern' => $this->recomposePattern($terms, array('nationality',
-                            'firstname', 'lastname', 'birthdate', 'gender',
-                            'birthdate-before','birthdate-after'), $terms['_domain']),
+                        'pattern' => $this->recomposePattern(
+                            $terms,
+                            \array_filter(self::POSSIBLE_KEYS, fn($item) => $item !== '_default'),
+                            $terms['_domain']
+                        ),
                         'total' => $total,
                         'start' => $start,
                         'search_name' => self::NAME,
@@ -152,158 +122,81 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
      */
     protected function search(array $terms, $start, $limit, array $options = array())
     {
-        $qb = $this->createQuery($terms, 'search');
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
 
-        if ($options['simplify'] ?? false) {
-            $qb->select(
-                    'p.id',
-                    $qb->expr()->concat(
-                        'p.firstName',
-                        $qb->expr()->literal(' '),
-                        'p.lastName'
-                        ).'AS text'
-                );
-        } else {
-            $qb->select('p');
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
+
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (NULL !== ${$v}) {
+                try {
+                    ${$v} = new \DateTime(${$v});
+                } catch (\Exception $e) {
+                    throw new ParsingException('The date is '
+                          . 'not parsable', 0, $e);
+                }
+            }
         }
 
-        $qb
-            ->setMaxResults($limit)
-            ->setFirstResult($start);
-
-        //order by firstname, lastname
-
-        $qb
-            ->orderBy('p.firstName')
-            ->addOrderBy('p.lastName');
-
-        if ($options['simplify'] ?? false) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
+        return $this->personACLAwareRepository
+            ->findBySearchCriteria(
+                $start,
+                $limit,
+                $options['simplify'] ?? false,
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+            );
     }
 
-    protected function count(array $terms)
+    protected function count(array $terms): int
     {
-        $qb = $this->createQuery($terms);
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
 
-        $qb->select('COUNT(p.id)');
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
-
-    private $_cacheQuery = array();
-
-    /**
-     *
-     * @param array $terms
-     * @return \Doctrine\ORM\QueryBuilder
-     */
-    public function createQuery(array $terms)
-    {
-        //get from cache
-        $cacheKey = md5(serialize($terms));
-        if (array_key_exists($cacheKey, $this->_cacheQuery)) {
-            return clone $this->_cacheQuery[$cacheKey];
-        }
-
-        $qb = $this->em->createQueryBuilder();
-
-        $qb->from('ChillPersonBundle:Person', 'p');
-
-        if (array_key_exists('firstname', $terms)) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.firstName))', ':firstname'))
-                  ->setParameter('firstname', '%'.$terms['firstname'].'%');
-        }
-
-        if (array_key_exists('lastname', $terms)) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.lastName))', ':lastname'))
-                  ->setParameter('lastname', '%'.$terms['lastname'].'%');
-        }
-
-        foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key)
-        if (array_key_exists($key, $terms)) {
-            try {
-                $date = new \DateTime($terms[$key]);
-            } catch (\Exception $ex) {
-                throw new ParsingException('The date is '
-                      . 'not parsable', 0, $ex);
-            }
-
-            switch($key) {
-                case 'birthdate':
-                    $qb->andWhere($qb->expr()->eq('p.birthdate', ':birthdate'))
-                        ->setParameter('birthdate', $date);
-                    break;
-                case 'birthdate-before':
-                    $qb->andWhere($qb->expr()->lt('p.birthdate', ':birthdatebefore'))
-                        ->setParameter('birthdatebefore', $date);
-                    break;
-                case 'birthdate-after':
-                    $qb->andWhere($qb->expr()->gt('p.birthdate', ':birthdateafter'))
-                        ->setParameter('birthdateafter', $date);
-                    break;
-                default:
-                    throw new \LogicException("this case $key should not exists");
-            }
-
-        }
-
-        if (array_key_exists('gender', $terms)) {
-            if (!in_array($terms['gender'], array(Person::MALE_GENDER, Person::FEMALE_GENDER))) {
-                throw new ParsingException('The gender '
-                      .$terms['gender'].' is not accepted. Should be "'.Person::MALE_GENDER
-                      .'" or "'.Person::FEMALE_GENDER.'"');
-            }
-
-            $qb->andWhere($qb->expr()->eq('p.gender', ':gender'))
-              ->setParameter('gender', $terms['gender']);
-        }
-
-        if (array_key_exists('nationality', $terms)) {
-            try {
-                $country = $this->em->createQuery('SELECT c FROM '
-                      . 'ChillMainBundle:Country c WHERE '
-                      . 'LOWER(c.countryCode) LIKE :code')
-                      ->setParameter('code', $terms['nationality'])
-                      ->getSingleResult();
-            } catch (\Doctrine\ORM\NoResultException $ex)  {
-                throw new ParsingException('The country code "'.$terms['nationality'].'" '
-                      . ', used in nationality, is unknow', 0, $ex);
-            }
-
-            $qb->andWhere($qb->expr()->eq('p.nationality', ':nationality'))
-                  ->setParameter('nationality', $country);
-        }
-
-        if ($terms['_default'] !== '') {
-            $grams = explode(' ', $terms['_default']);
-
-            foreach($grams as $key => $gram) {
-                $qb->andWhere($qb->expr()
-                      ->like('p.fullnameCanonical', 'UNACCENT(LOWER(:default_'.$key.'))'))
-                      ->setParameter('default_'.$key, '%'.$gram.'%');
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (NULL !== ${$v}) {
+                try {
+                    ${$v} = new \DateTime(${$v});
+                } catch (\Exception $e) {
+                    throw new ParsingException('The date is '
+                        . 'not parsable', 0, $e);
+                }
             }
         }
 
-        //restraint center for security
-        $reachableCenters = $this->helper->getReachableCenters($this->user,
-                new Role('CHILL_PERSON_SEE'));
-        $qb->andWhere(
-            $qb->expr()->orX(
-                $qb->expr()
-                    ->in('p.center', ':centers'),
-                $qb->expr()
-                    ->isNull('p.center')
-            )
-        );
-        $qb->setParameter('centers', $reachableCenters);
-
-        $this->_cacheQuery[$cacheKey] = $qb;
-
-        return clone $qb;
+        return $this->personACLAwareRepository
+            ->countBySearchCriteria(
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+            );
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -396,4 +289,10 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
         return 'Search within persons';
     }
 
+    public static function getAlias(): string
+    {
+        return self::NAME;
+    }
+
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
index ea2c9a5c7..f1ea52c8e 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
@@ -2,90 +2,32 @@
 
 namespace Chill\PersonBundle\Search;
 
-
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Search\AbstractSearch;
 use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Symfony\Component\Templating\EngineInterface;
 
-/**
- * Class SimilarityPersonSearch
- *
- * @package Chill\PersonBundle\Search
- */
 class SimilarityPersonSearch extends AbstractSearch
 {
-    
-    use ContainerAwareTrait;
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    private $em;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $helper;
-    
-    /**
-     *
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
-    
+    protected PaginatorFactory $paginatorFactory;
+
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
+    private EngineInterface $templating;
+
     const NAME = "person_similarity";
-    
-    /**
-     *
-     * @var PersonSearch
-     */
-    private $personSearch;
-    
-    
-    /**
-     * SimilarityPersonSearch constructor.
-     *
-     * @param EntityManagerInterface $em
-     * @param TokenStorageInterface $tokenStorage
-     * @param AuthorizationHelper $helper
-     * @param PaginatorFactory $paginatorFactory
-     * @param PersonSearch $personSearch
-     */
+
     public function __construct(
-        EntityManagerInterface $em,
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $helper,
         PaginatorFactory $paginatorFactory,
-        PersonSearch $personSearch)
-    {
-        $this->em = $em;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->helper = $helper;
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
+        EngineInterface $templating
+    ) {
         $this->paginatorFactory = $paginatorFactory;
-        $this->personSearch = $personSearch;
-        
-        // throw an error if user is not a valid user
-        if (!$this->user instanceof \Chill\MainBundle\Entity\User) {
-            throw new \LogicException('The user provided must be an instance'
-                . ' of Chill\MainBundle\Entity\User');
-        }
+        $this->personACLAwareRepository = $personACLAwareRepository;
+        $this->templating = $templating;
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Chill\MainBundle\Search\SearchInterface::getOrder()
@@ -94,7 +36,7 @@ class SimilarityPersonSearch extends AbstractSearch
     {
         return 200;
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Chill\MainBundle\Search\SearchInterface::isActiveByDefault()
@@ -103,30 +45,27 @@ class SimilarityPersonSearch extends AbstractSearch
     {
         return true;
     }
-    
+
     public function supports($domain, $format)
     {
         return 'person' === $domain;
     }
-    
+
     /**
      * @param array $terms
      * @param int $start
      * @param int $limit
      * @param array $options
      * @param string $format
-     * @return array
      */
     public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
     {
         $total = $this->count($terms);
         $paginator = $this->paginatorFactory->create($total);
-        
-        if ($format === 'html')
-        {
-            if ($total !== 0)
-            {
-                return $this->container->get('templating')->render('ChillPersonBundle:Person:list.html.twig',
+
+        if ($format === 'html') {
+            if ($total !== 0) {
+                return $this->templating->render('ChillPersonBundle:Person:list.html.twig',
                     array(
                         'persons' => $this->search($terms, $start, $limit, $options),
                         'pattern' => $this->recomposePattern($terms, array('nationality',
@@ -143,9 +82,8 @@ class SimilarityPersonSearch extends AbstractSearch
             else {
                 return null;
             }
-        
-        } elseif ($format === 'json')
-        {
+
+        } elseif ($format === 'json') {
             return [
                 'results' => $this->search($terms, $start, $limit, \array_merge($options, [ 'simplify' => true ])),
                 'pagination' => [
@@ -154,8 +92,7 @@ class SimilarityPersonSearch extends AbstractSearch
             ];
         }
     }
-    
-    
+
     /**
      *
      * @param string $pattern
@@ -166,101 +103,12 @@ class SimilarityPersonSearch extends AbstractSearch
      */
     protected function search(array $terms, $start, $limit, array $options = array())
     {
-        $qb = $this->createQuery($terms, 'search');
-        
-        
-        if ($options['simplify'] ?? false) {
-            $qb->select(
-                'sp.id',
-                $qb->expr()->concat(
-                    'sp.firstName',
-                    $qb->expr()->literal(' '),
-                    'sp.lastName'
-                ).'AS text'
-            );
-        } else {
-            $qb->select('sp');
-        }
-        
-        $qb
-            ->setMaxResults($limit)
-            ->setFirstResult($start);
-        
-        //order by firstname, lastname
-        
-        $qb
-            ->orderBy('sp.firstName')
-            ->addOrderBy('sp.lastName');
-        
-        if ($options['simplify'] ?? false) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
+        return $this->personACLAwareRepository
+            ->findBySimilaritySearch($terms['_default']);
     }
-    
-    
+
     protected function count(array $terms)
     {
-        $qb = $this->createQuery($terms);
-
-        
-        $qb->select('COUNT(sp.id)');
-        
-        return $qb->getQuery()->getSingleScalarResult();
+        return $this->personACLAwareRepository->countBySimilaritySearch($terms['_default']);
     }
-    
-    
-    private $_cacheQuery = array();
-    
-    /**
-     *
-     * @param array $terms
-     * @return \Doctrine\ORM\QueryBuilder
-     */
-    protected function createQuery(array $terms)
-    {
-        //get from cache
-        $cacheKey = md5(serialize($terms));
-        if (array_key_exists($cacheKey, $this->_cacheQuery)) {
-            return clone $this->_cacheQuery[$cacheKey];
-        }
-        
-        $qb = $this->em->createQueryBuilder();
-        
-        $qb ->select('sp')
-            ->from('ChillPersonBundle:Person', 'sp');
-        
-        if ($terms['_default'] !== '') {
-            $grams = explode(' ', $terms['_default']);
-            
-            foreach($grams as $key => $gram) {
-                $qb->andWhere('SIMILARITY(sp.fullnameCanonical, UNACCENT(LOWER(:default_'.$key.')) ) >= 0.15')
-                    ->setParameter('default_'.$key, '%'.$gram.'%');
-            }
-            
-            $qb->andWhere($qb->expr()
-                ->notIn(
-                    'sp.id',
-                    $this->personSearch
-                        ->createQuery($terms)
-                        ->addSelect('p.id')
-                        ->getDQL()
-                )
-            );
-        }
-        
-        //restraint center for security
-        $reachableCenters = $this->helper->getReachableCenters($this->user,
-            new Role('CHILL_PERSON_SEE'));
-        $qb->andWhere($qb->expr()
-            ->in('sp.center', ':centers'))
-            ->setParameter('centers', $reachableCenters)
-        ;
-        
-        $this->_cacheQuery[$cacheKey] = $qb;
-        
-        return clone $qb;
-    }
-    
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index 43e042e6b..6133068a4 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -70,7 +70,6 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Repository/'
-        tags: ['doctrine.repository_service']
 
     Chill\PersonBundle\Controller\:
         autowire: true
diff --git a/src/Bundle/ChillPersonBundle/config/services/repository.yaml b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
index 72ca27e24..fa76ccd7c 100644
--- a/src/Bundle/ChillPersonBundle/config/services/repository.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
@@ -1,6 +1,11 @@
 services:
+    # note: the services.yaml file define some autoloading
+
     chill.person.repository.person:
         class: Chill\PersonBundle\Repository\PersonRepository
         autowire: true
         autoconfigure: true
     Chill\PersonBundle\Repository\PersonRepository: '@chill.person.repository.person'
+
+    Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface: '@Chill\PersonBundle\Repository\PersonACLAwareRepository'
+
diff --git a/src/Bundle/ChillPersonBundle/config/services/search.yaml b/src/Bundle/ChillPersonBundle/config/services/search.yaml
index 284773196..6a7cd4496 100644
--- a/src/Bundle/ChillPersonBundle/config/services/search.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/search.yaml
@@ -1,25 +1,11 @@
 services:
-    chill.person.search_person:
-        class: Chill\PersonBundle\Search\PersonSearch
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - "@chill_main.paginator_factory"
-        calls:
-            - ['setContainer', ["@service_container"]]
+    Chill\PersonBundle\Search\PersonSearch:
+        autowire: true
         tags:
             - { name: chill.search, alias: 'person_regular' }
 
     Chill\PersonBundle\Search\SimilarityPersonSearch:
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@security.token_storage"
-            - "@chill.main.security.authorization.helper"
-            - "@chill_main.paginator_factory"
-            - '@chill.person.search_person'
-        calls:
-            - ['setContainer', ["@service_container"]]
+        autowire: true
         tags:
             - { name: chill.search, alias: 'person_similarity' }
 

From f63d4fcfbaf53f5ad297f682dab2157edfddce5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 10 Sep 2021 18:22:50 +0200
Subject: [PATCH 156/217] optimize query for person

---
 .../ChillMainExtension.php                    |  2 ++
 .../Doctrine/DQL/Similarity.php               | 19 ++++-------
 .../Doctrine/DQL/StrictWordSimilarityOPS.php  | 34 +++++++++++++++++++
 .../Repository/PersonACLAwareRepository.php   | 19 ++++-------
 .../Search/SimilarityPersonSearch.php         |  2 +-
 .../migrations/Version20210910161858.php      | 31 +++++++++++++++++
 6 files changed, 82 insertions(+), 25 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 09897fec2..77da7b435 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -19,6 +19,7 @@
 
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\UserJobType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -185,6 +186,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class,
                                 'SIMILARITY' => Similarity::class,
                                 'OVERLAPSI' => OverlapsI::class,
+                                'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class
                             ],
                         ],
                         'hydrators' => [
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index 988e55f5f..1875f978c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -21,20 +21,15 @@ namespace Chill\MainBundle\Doctrine\DQL;
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
-/**
- * 
- *
- * 
- */
 class Similarity extends FunctionNode
 {
     private $firstPart;
-    
+
     private $secondPart;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker). 
+        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker).
             ', ' . $this->secondPart->dispatch($sqlWalker) .")";
     }
 
@@ -42,13 +37,13 @@ class Similarity extends FunctionNode
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->firstPart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->secondPart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
new file mode 100644
index 000000000..22dcda879
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
+{
+    private $firstPart;
+
+    private $secondPart;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return $this->firstPart->dispatch($sqlWalker).
+            ' <<% ' . $this->secondPart->dispatch($sqlWalker);
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->firstPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_COMMA);
+
+        $this->secondPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index f466260ca..40d06615c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -12,7 +12,6 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
 
 
@@ -126,7 +125,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
                 ).'AS text'
             );
         } else {
-            $qb->select('p');
+            $qb->select('sp');
         }
 
         $qb
@@ -254,18 +253,14 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $grams = explode(' ', $pattern);
 
         foreach($grams as $key => $gram) {
-            $qb->andWhere('SIMILARITY(sp.fullnameCanonical, UNACCENT(LOWER(:default_'.$key.')) ) >= 0.15')
+            $qb->andWhere('STRICT_WORD_SIMILARITY_OPS(:default_'.$key.', sp.fullnameCanonical) = TRUE')
                 ->setParameter('default_'.$key, '%'.$gram.'%');
-        }
 
-        $qb->andWhere($qb->expr()
-            ->notIn(
-                'sp.id',
-                $this->createSearchQuery($pattern)
-                    ->addSelect('p.id')
-                    ->getDQL()
-            )
-        );
+            // remove the perfect matches
+            $qb->andWhere($qb->expr()
+                ->notLike('sp.fullnameCanonical', 'UNACCENT(LOWER(:not_default_'.$key.'))'))
+                ->setParameter('not_default_'.$key, '%'.$gram.'%');
+        }
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
index f1ea52c8e..e62c2ee55 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
@@ -104,7 +104,7 @@ class SimilarityPersonSearch extends AbstractSearch
     protected function search(array $terms, $start, $limit, array $options = array())
     {
         return $this->personACLAwareRepository
-            ->findBySimilaritySearch($terms['_default']);
+            ->findBySimilaritySearch($terms['_default'], $start, $limit, $options['simplify'] ?? false);
     }
 
     protected function count(array $terms)
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
new file mode 100644
index 000000000..82cade6cf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Optimize trigram index on person fullname: create index for both center_id and fullname
+ */
+final class Version20210910161858 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Optimize trigram index on person fullname: create index for both center_id and fullname';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (center_id, fullnameCanonical gist_trgm_ops)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (fullnameCanonical gist_trgm_ops)');
+    }
+}

From 50b7554aea8fb52a16056779fb2ba98a1db548b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Sep 2021 12:24:58 +0200
Subject: [PATCH 157/217] optimize query for current address + documentation

---
 .../Household/PersonHouseholdAddress.php      | 35 ++++++++
 .../ChillPersonBundle/Entity/Person.php       | 45 ++++++++++-
 .../Entity/Person/PersonCurrentAddress.php    | 81 +++++++++++++++++++
 .../migrations/Version20210915093624.php      | 49 +++++++++++
 4 files changed, 207 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 511416a0e..28235b521 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -8,6 +8,29 @@ use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
+ * This class links a person to the history of his addresses, through
+ * household membership.
+ *
+ * It is optimized on DB side, and compute the start date and end date
+ * of each address by the belonging of household.
+ *
+ * **note**: the start date and end date are the date of belonging to the address,
+ * not the belonging of the household.
+ *
+ * Example:
+ *
+ * * person A is member of household W from 2021-01-01 to 2021-12-01
+ * * person A is member of household V from 2021-12-01, still present after
+ * * household W lives in address Q from 2020-06-01 to 2021-06-01
+ * * household W lives in address R from 2021-06-01 to 2022-06-01
+ * * household V lives in address T from 2021-12-01 to still living there after
+ *
+ * The person A will have those 3 entities:
+ *
+ * 1. 1st entity: from 2021-01-01 to 2021-06-01, household W, address Q;
+ * 2. 2st entity: from 2021-06-01 to 2021-12-01, household W, address R;
+ * 3. 3st entity: from 2021-12-01 to NULL, household V, address T;
+ *
  * @ORM\Entity(readOnly=true)
  * @ORM\Table(name="view_chill_person_household_address")
  */
@@ -45,11 +68,23 @@ class PersonHouseholdAddress
      */
     private $address;
 
+    /**
+     * The start date of the intersection address/household
+     *
+     * (this is not the startdate of the household, not
+     * the startdate of the address)
+     */
     public function getValidFrom(): ?\DateTimeInterface
     {
         return $this->validFrom;
     }
 
+    /**
+     * The end date of the intersection address/household
+     *
+     * (this is not the enddate of the household, not
+     * the enddate of the address)
+     */
     public function getValidTo(): ?\DateTimeImmutable
     {
         return $this->validTo;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index f42ca6f00..bc5c46e08 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -35,6 +35,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
@@ -412,6 +413,15 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private $addresses;
 
+    /**
+     * The current person address.
+     *
+     * This is computed through database and is optimized on database side.
+     *
+     * @var PersonCurrentAddress|null
+     */
+    private ?PersonCurrentAddress $currentPersonAddress = null;
+
     /**
      * fullname canonical. Read-only field, which is calculated by
      * the database.
@@ -564,6 +574,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
                 return $participation->getAccompanyingPeriod();
             }
         }
+
+        return null;
     }
 
     /**
@@ -1242,13 +1254,31 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->addresses;
     }
 
+    /**
+     * @deprecated Use `getCurrentPersonAddress` instead
+     * @param DateTime|null $from
+     * @return false|mixed|null
+     * @throws \Exception
+     */
     public function getLastAddress(DateTime $from = null)
     {
-        $from ??= new DateTime('now');
+        return $this->getCurrentPersonAddress($from);
+    }
+
+    /**
+     * get the address associated with the person at the given date
+     *
+     * @param DateTime|null $at
+     * @return Address|null
+     * @throws \Exception
+     */
+    public function getCurrentPersonAddress(?\DateTime $at = null): ?Address
+    {
+        $at ??= new DateTime('now');
 
         /** @var ArrayIterator $addressesIterator */
         $addressesIterator = $this->getAddresses()
-            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $from)
+            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
             ->getIterator();
 
         $addressesIterator->uasort(
@@ -1496,7 +1526,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     public function getCurrentHouseholdAddress(?\DateTimeImmutable $at = null): ?Address
     {
-        $at = $at === null ? new \DateTimeImmutable('today') : $at;
+        if (
+            NULL === $at
+            ||
+            $at->format('Ymd') === (new \DateTime('today'))->format('Ymd')
+        ) {
+            return $this->currentPersonAddress instanceof PersonCurrentAddress
+                ? $this->currentPersonAddress->getAddress() : NULL;
+        }
+
+        // if not now, compute the date from history
         $criteria = new Criteria();
         $expr = Criteria::expr();
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
new file mode 100644
index 000000000..21962b700
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Person;
+
+use Chill\MainBundle\Entity\Address;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Entity which associate person with his current address, through
+ * household participation.
+ *
+ * The computation is optimized on database side.
+ *
+ * The validFrom and validTo properties are the intersection of
+ * household membership and address validity. See @link{PersonHouseholdAddress}
+ *
+ * @ORM\Entity(readOnly=true)
+ * @ORM\Table("view_chill_person_current_address")
+ */
+class PersonCurrentAddress
+{
+    /**
+     * @ORM\Id
+     * @ORM\OneToOne(targetEntity=Person::class)
+     */
+    protected Person $person;
+
+    /**
+     * @ORM\OneToOne(targetEntity=Address::class)
+     */
+    protected Address $address;
+
+    /**
+     * @ORM\Column(name="valid_from", type="date_immutable")
+     */
+    protected \DateTimeImmutable $validFrom;
+
+    /**
+     * @ORM\Column(name="valid_to", type="date_immutable")
+     */
+    protected ?\DateTimeImmutable $validTo;
+
+    /**
+     * @return Person
+     */
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
+    /**
+     * @return Address
+     */
+    public function getAddress(): Address
+    {
+        return $this->address;
+    }
+
+    /**
+     * This date is the intersection of household membership
+     * and address validity
+     *
+     * @return \DateTimeImmutable
+     */
+    public function getValidFrom(): \DateTimeImmutable
+    {
+        return $this->validFrom;
+    }
+
+    /**
+     * This date is the intersection of household membership
+     * and address validity
+     *
+     * @return \DateTimeImmutable|null
+     */
+    public function getValidTo(): ?\DateTimeImmutable
+    {
+        return $this->validTo;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
new file mode 100644
index 000000000..f285fde47
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create view for PersonCurrentAddress and related indexes
+ */
+final class Version20210915093624 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create view for PersonCurrentAddress and related indexes';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("CREATE VIEW view_chill_person_current_address AS
+            SELECT
+                cphm.person_id  AS person_id,
+                cma.id AS address_id,
+                CASE WHEN cphm.startdate > COALESCE(cma.validfrom, '-infinity'::date) THEN cphm.startdate ELSE cma.validfrom END AS valid_from,
+                CASE WHEN COALESCE(cphm.enddate, 'infinity'::date) < COALESCE(cma.validto, 'infinity'::date) THEN cphm.enddate ELSE cma.validto END AS valid_to
+            FROM chill_person_household_members AS cphm
+                     LEFT JOIN chill_person_household_to_addresses AS cphta ON cphta.household_id = cphm.household_id
+                     LEFT JOIN chill_main_address AS cma ON cphta.address_id = cma.id
+            WHERE
+                  cphm.sharedhousehold IS TRUE
+            AND
+                  current_date between cphm.startdate AND coalesce(enddate, 'infinity'::date)
+            AND
+                  current_date between cma.validfrom AND coalesce(validto, 'infinity'::date)
+      ");
+
+        $this->addSql("CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address USING btree (id, validfrom ASC, validto DESC)");
+        $this->addSql("CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members USING btree (person_id, startdate ASC, enddate DESC, household_id) WHERE sharedhousehold IS TRUE");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("DROP VIEW view_chill_person_current_address");
+        $this->addSql("DROP INDEX chill_custom_main_address_filtering_idx");
+        $this->addSql("DROP INDEX chill_custom_person_household_members_sharing_idx");
+    }
+}

From ebb2f5d243eb732fae309f8763232538787fe30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:43:38 +0200
Subject: [PATCH 158/217] Add shortcut person <-> current address, and update
 api for re-implements searching

* add geographic function ST_CONTAINS
* add a link between the current valid address and person, optimized on
database side;
* update PersonACLAwareRepository for re-using methods elsewhere.
---
 .../ChillMainExtension.php                    |   4 +-
 .../Doctrine/DQL/STContains.php               |  52 +++++++++
 .../ChillPersonBundle/Entity/Person.php       |   1 +
 .../Entity/Person/PersonCurrentAddress.php    |   3 +-
 .../Repository/PersonACLAwareRepository.php   | 103 +++++++++++-------
 5 files changed, 122 insertions(+), 41 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 77da7b435..a25bee94a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -19,6 +19,7 @@
 
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\Doctrine\DQL\STContains;
 use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\UserJobType;
@@ -186,7 +187,8 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class,
                                 'SIMILARITY' => Similarity::class,
                                 'OVERLAPSI' => OverlapsI::class,
-                                'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class
+                                'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class,
+                                'ST_CONTAINS' => STContains::class,
                             ],
                         ],
                         'hydrators' => [
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
new file mode 100644
index 000000000..5235d51bb
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Chill is a software for social workers
+ * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * Geometry function 'ST_CONTAINS', added by postgis
+ */
+class STContains extends FunctionNode
+{
+    private $firstPart;
+
+    private $secondPart;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return 'ST_CONTAINS('.$this->firstPart->dispatch($sqlWalker).
+            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->firstPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_COMMA);
+
+        $this->secondPart = $parser->StringPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index bc5c46e08..2b0b5edbd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -419,6 +419,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * This is computed through database and is optimized on database side.
      *
      * @var PersonCurrentAddress|null
+     * @ORM\OneToOne(targetEntity=PersonCurrentAddress::class, mappedBy="person")
      */
     private ?PersonCurrentAddress $currentPersonAddress = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index 21962b700..e982f8b97 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -22,7 +22,8 @@ class PersonCurrentAddress
 {
     /**
      * @ORM\Id
-     * @ORM\OneToOne(targetEntity=Person::class)
+     * @ORM\OneToOne(targetEntity=Person::class, inversedBy="currentPersonAddress")
+     * @ORM\JoinColumn(name="person_id", referencedColumnName="id")
      */
     protected Person $person;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index 40d06615c..5214b38b7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -60,17 +60,32 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
             $countryCode);
         $this->addACLClauses($qb, 'p');
 
+        return $this->getQueryResult($qb, $simplify, $limit, $start);
+    }
+
+    /**
+     * Helper method to prepare and return the search query for PersonACL.
+     *
+     * This method replace the select clause with required parameters, depending on the
+     * "simplify" parameter. It also add query limits.
+     *
+     * The given alias must represent the person alias.
+     *
+     * @return array|Person[]
+     */
+    public function getQueryResult(QueryBuilder $qb, string $alias, bool $simplify, int $limit, int $start): array
+    {
         if ($simplify) {
             $qb->select(
-                'p.id',
+                $alias.'.id',
                 $qb->expr()->concat(
-                    'p.firstName',
+                    $alias.'.firstName',
                     $qb->expr()->literal(' '),
-                    'p.lastName'
+                    $alias.'.lastName'
                 ).'AS text'
             );
         } else {
-            $qb->select('p');
+            $qb->select($alias);
         }
 
         $qb
@@ -79,8 +94,8 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
 
         //order by firstname, lastname
         $qb
-            ->orderBy('p.firstName')
-            ->addOrderBy('p.lastName');
+            ->orderBy($alias.'.firstName')
+            ->addOrderBy($alias.'.lastName');
 
         if ($simplify) {
             return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
@@ -104,7 +119,20 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
             $countryCode);
         $this->addACLClauses($qb, 'p');
 
-        $qb->select('COUNT(p.id)');
+        return $this->getCountQueryResult($qb);
+    }
+
+    /**
+     * Helper method to prepare and return the count for search query
+     *
+     * This method replace the select clause with required parameters, depending on the
+     * "simplify" parameter.
+     *
+     * The given alias must represent the person alias in the query builder.
+     */
+    public function getCountQueryResult(QueryBuilder $qb, $alias): int
+    {
+        $qb->select('COUNT('.$alias.'.id)');
 
         return $qb->getQuery()->getSingleScalarResult();
     }
@@ -115,33 +143,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $qb = $this->createSimilarityQuery($pattern);
         $this->addACLClauses($qb, 'sp');
 
-        if ($simplify) {
-            $qb->select(
-                'sp.id',
-                $qb->expr()->concat(
-                    'sp.firstName',
-                    $qb->expr()->literal(' '),
-                    'sp.lastName'
-                ).'AS text'
-            );
-        } else {
-            $qb->select('sp');
-        }
-
-        $qb
-            ->setMaxResults($maxResult)
-            ->setFirstResult($firstResult);
-
-        //order by firstname, lastname
-        $qb
-            ->orderBy('sp.firstName')
-            ->addOrderBy('sp.lastName');
-
-        if ($simplify) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
+        return $this->getQueryResult($qb, 'sp', $simplify, $maxResult, $firstResult);
     }
 
     public function countBySimilaritySearch(string $pattern)
@@ -149,12 +151,27 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $qb = $this->createSimilarityQuery($pattern);
         $this->addACLClauses($qb, 'sp');
 
-        $qb->select('COUNT(sp.id)');
-
-        return $qb->getQuery()->getSingleScalarResult();
+        return $this->getCountQueryResult($qb, 'sp');
     }
 
-    private function createSearchQuery(
+    /**
+     * Create a search query without ACL
+     *
+     * The person alias is a "p"
+     *
+     * @param string|null $default
+     * @param string|null $firstname
+     * @param string|null $lastname
+     * @param \DateTime|null $birthdate
+     * @param \DateTime|null $birthdateBefore
+     * @param \DateTime|null $birthdateAfter
+     * @param string|null $gender
+     * @param string|null $countryCode
+     * @return QueryBuilder
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     */
+    public function createSearchQuery(
         string $default = null,
         string $firstname = null,
         string $lastname = null,
@@ -244,7 +261,15 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $qb->setParameter('centers', $reachableCenters);
     }
 
-    private function createSimilarityQuery($pattern): QueryBuilder
+    /**
+     * Create a query for searching by similarity.
+     *
+     * The person alias is "sp".
+     *
+     * @param $pattern
+     * @return QueryBuilder
+     */
+    public function createSimilarityQuery($pattern): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder();
 

From cf40f3846352c59e14cb7fa12a246acfb70ead1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 Sep 2021 10:08:33 +0200
Subject: [PATCH 159/217] rename voter helepers

---
 ...efaultVoter.php => DefaultVoterHelper.php} | 11 +----
 ...tory.php => DefaultVoterHelperFactory.php} |  4 +-
 ...or.php => DefaultVoterHelperGenerator.php} |  6 +--
 .../Authorization/VoterFactoryInterface.php   |  7 ---
 .../Authorization/VoterGeneratorInterface.php |  8 ++++
 .../VoterHelperFactoryInterface.php           |  8 ++++
 .../Authorization/VoterHelperInterface.php    | 12 +++++
 .../Security/Authorization/VoterInterface.php |  7 ---
 .../Security/Authorization/PersonVoter.php    | 48 ++++++-------------
 .../Security/Authorization/TaskVoter.php      |  8 ++--
 10 files changed, 54 insertions(+), 65 deletions(-)
 rename src/Bundle/ChillMainBundle/Security/Authorization/{DefaultVoter.php => DefaultVoterHelper.php} (83%)
 rename src/Bundle/ChillMainBundle/Security/Authorization/{DefaultVoterFactory.php => DefaultVoterHelperFactory.php} (85%)
 rename src/Bundle/ChillMainBundle/Security/Authorization/{VoterGenerator.php => DefaultVoterHelperGenerator.php} (84%)
 delete mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
 delete mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php

diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
similarity index 83%
rename from src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php
rename to src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index 98882b876..bd1e0e1cb 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -5,7 +5,7 @@ namespace Chill\MainBundle\Security\Authorization;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 
-class DefaultVoter implements VoterInterface
+class DefaultVoterHelper implements VoterHelperInterface
 {
     protected AuthorizationHelper $authorizationHelper;
 
@@ -50,14 +50,7 @@ class DefaultVoter implements VoterInterface
         }
 
         if (NULL === $subject) {
-           if (NULL === $center = $this->centerResolverDispatcher
-               ->resolveCenter($subject)) {
-               return false;
-           }
-           return $this->authorizationHelper->userCanReachCenter(
-               $token->getUser(),
-               $center
-           );
+            return 0 < count($this->authorizationHelper->getReachableCenters($token->getUser(), $attribute, null));
         }
 
         return $this->authorizationHelper->userHasAccess(
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
similarity index 85%
rename from src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php
rename to src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
index 4f3f232d9..9349eaed2 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterFactory.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -4,7 +4,7 @@ namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 
-class DefaultVoterFactory implements VoterFactoryInterface
+class DefaultVoterHelperFactory implements VoterHelperFactoryInterface
 {
     protected AuthorizationHelper $authorizationHelper;
     protected CenterResolverDispatcher $centerResolverDispatcher;
@@ -19,7 +19,7 @@ class DefaultVoterFactory implements VoterFactoryInterface
 
     public function generate($context): VoterGeneratorInterface
     {
-        return new VoterGenerator(
+        return new DefaultVoterHelperGenerator(
             $this->authorizationHelper,
             $this->centerResolverDispatcher
         );
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
similarity index 84%
rename from src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php
rename to src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
index e3b517f99..753586270 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGenerator.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -4,7 +4,7 @@ namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 
-final class VoterGenerator implements VoterGeneratorInterface
+final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
 {
     protected AuthorizationHelper $authorizationHelper;
     protected CenterResolverDispatcher $centerResolverDispatcher;
@@ -25,9 +25,9 @@ final class VoterGenerator implements VoterGeneratorInterface
        return $this;
     }
 
-    public function build(): VoterInterface
+    public function build(): VoterHelperInterface
     {
-        return new DefaultVoter(
+        return new DefaultVoterHelper(
             $this->authorizationHelper,
             $this->centerResolverDispatcher,
             $this->configuration
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
deleted file mode 100644
index b12739674..000000000
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterFactoryInterface.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Security\Authorization;
-
-interface VoterFactoryInterface
-{
-}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index 0aaf04ecd..306427238 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -4,4 +4,12 @@ namespace Chill\MainBundle\Security\Authorization;
 
 interface VoterGeneratorInterface
 {
+    /**
+     * @param string $class The FQDN of a class
+     * @param array $attributes an array of attributes
+     * @return $this
+     */
+    public function addCheckFor(string $class, array $attributes): self;
+
+    public function build(): VoterHelperInterface;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
new file mode 100644
index 000000000..5b16a10ef
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+interface VoterHelperFactoryInterface
+{
+    public function generate($context): VoterGeneratorInterface;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
new file mode 100644
index 000000000..fc08bcb40
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+interface VoterHelperInterface
+{
+    public function supports($attribute, $subject): bool;
+
+    public function voteOnAttribute($attribute, $subject, TokenInterface $token);
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php
deleted file mode 100644
index 848d22190..000000000
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterInterface.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Security\Authorization;
-
-interface VoterInterface
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index e68d90365..6338f5f45 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -22,6 +22,8 @@ namespace Chill\PersonBundle\Security\Authorization;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
@@ -42,52 +44,32 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
 
     protected CenterResolverDispatcher $centerResolverDispatcher;
 
+    protected VoterHelperInterface $voter;
+
     public function __construct(
         AuthorizationHelper $helper,
-        CenterResolverDispatcher $centerResolverDispatcher
+        CenterResolverDispatcher $centerResolverDispatcher,
+        VoterHelperFactoryInterface $voterFactory
     ) {
         $this->helper = $helper;
         $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->voter = $voterFactory
+            ->generate(self::class)
+            ->addCheckFor(Center::class, [self::STATS, self::LISTS, self::DUPLICATE])
+            ->addCheckFor(Person::class, [self::CREATE, self::UPDATE, self::SEE, self::DUPLICATE])
+            ->addCheckFor(null, [self::CREATE] )
+            ->build()
+            ;
     }
 
     protected function supports($attribute, $subject)
     {
-        if ($subject instanceof Person) {
-            return \in_array($attribute, [
-                self::CREATE, self::UPDATE, self::SEE, self::DUPLICATE
-            ]);
-        } elseif ($subject instanceof Center) {
-            return \in_array($attribute, [
-                self::STATS, self::LISTS, self::DUPLICATE
-            ]);
-        } elseif ($subject === null) {
-            return $attribute === self::CREATE;
-        } else {
-            return false;
-        }
+        return $this->voter->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        if (!$token->getUser() instanceof User) {
-            return false;
-        }
-
-        if ($subject === null) {
-            $centers = $this->helper->getReachableCenters($token->getUser(),
-                new Role($attribute));
-
-            return count($centers) > 0;
-        }
-
-        $center = $this->centerResolverDispatcher->resolveCenter($subject);
-
-        if (NULL === $center && $subject instanceof Person) {
-            // person without any center are seen by everybody
-            return true;
-        }
-
-        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
     }
 
     private function getAttributes()
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 7c4f2d4d9..2f760a84b 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -21,8 +21,8 @@ namespace Chill\TaskBundle\Security\Authorization;
 use Chill\EventBundle\Entity\Event;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\VoterFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\TaskBundle\Entity\AbstractTask;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
@@ -61,7 +61,7 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
     protected CenterResolverDispatcher $centerResolverDispatcher;
 
-    protected VoterInterface $voter;
+    protected VoterHelperInterface $voter;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
@@ -69,7 +69,7 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
         EventDispatcherInterface $eventDispatcher,
         LoggerInterface $logger,
         CenterResolverDispatcher $centerResolverDispatcher,
-        VoterFactoryInterface $voterFactory
+        VoterHelperFactoryInterface $voterFactory
     ) {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;

From 74598ee926bd7cf653693b46c8bc74c8fd37016f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 Sep 2021 13:57:45 +0200
Subject: [PATCH 160/217] apply new role on accompanying period

---
 .../Form/Type/ScopePickerType.php             |   9 +-
 .../Authorization/AuthorizationHelper.php     |  23 +--
 .../Authorization/DefaultVoterHelper.php      |   2 +-
 .../DefaultVoterHelperGenerator.php           |   2 +-
 .../Authorization/VoterGeneratorInterface.php |   2 +-
 .../Authorization/AuthorizationHelperTest.php | 157 +++++++++---------
 .../config/services/security.yaml             |   4 +-
 .../AccompanyingCourseController.php          |   8 +-
 .../AccompanyingPeriodController.php          |  31 ++--
 .../ChillPersonExtension.php                  |  29 +++-
 .../Menu/PersonMenuBuilder.php                |  27 ++-
 .../AccompanyingPeriodACLAwareRepository.php  |  58 +++++++
 .../AccompanyingPeriodRepository.php          |   5 +
 .../Repository/PersonACLAwareRepository.php   |   4 +-
 .../Authorization/AccompanyingPeriodVoter.php |  88 ++++++----
 .../Security/Authorization/PersonVoter.php    |   8 -
 .../config/services/controller.yaml           |   5 +-
 .../config/services/menu.yaml                 |  11 +-
 .../config/services/security.yaml             |   3 +-
 19 files changed, 281 insertions(+), 195 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php

diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 832db628f..ebf474657 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -146,14 +146,7 @@ class ScopePickerType extends AbstractType
             ->setParameter('center', $center->getId())
           // role constraints
             ->andWhere($qb->expr()->in('rs.role', ':roles'))
-            ->setParameter(
-                'roles', \array_map(
-                    function (Role $role) {
-                        return $role->getRole();
-                    },
-                    $roles
-                )
-            )
+            ->setParameter('roles', $roles)
           // user contraint
           ->andWhere(':user MEMBER OF gc.users')
           ->setParameter('user', $this->tokenStorage->getToken()->getUser());
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index ab1d1aed1..d7507f7a0 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -269,16 +269,12 @@ class AuthorizationHelper
 
     /**
      *
-     * @param Role $role
-     * @param Center $center
-     * @param Scope $circle
-     * @return Users
+     * @return User[]
      */
-    public function findUsersReaching(Role $role, Center $center, Scope $circle = null)
+    public function findUsersReaching(string $role, Center $center, Scope $circle = null): array
     {
         $parents = $this->getParentRoles($role);
         $parents[] = $role;
-        $parentRolesString = \array_map(function(Role $r) { return $r->getRole(); }, $parents);
 
         $qb = $this->em->createQueryBuilder();
         $qb
@@ -288,7 +284,7 @@ class AuthorizationHelper
             ->join('gc.permissionsGroup', 'pg')
             ->join('pg.roleScopes', 'rs')
             ->where('gc.center = :center')
-            ->andWhere($qb->expr()->in('rs.role', $parentRolesString))
+            ->andWhere($qb->expr()->in('rs.role', $parents))
             ;
 
         $qb->setParameter('center', $center);
@@ -322,21 +318,16 @@ class AuthorizationHelper
      * which are registered into Chill are taken into account.
      *
      * @param Role $role
-     * @return Role[] the role which give access to the given $role
+     * @return string[] the role which give access to the given $role
      */
-    public function getParentRoles(Role $role)
+    public function getParentRoles($role): array
     {
         $parentRoles = [];
         // transform the roles from role hierarchy from string to Role
-        $roles = \array_map(
-                function($string) {
-                    return new Role($string);
-                },
-                \array_keys($this->hierarchy)
-                );
+        $roles = \array_keys($this->hierarchy);
 
         foreach ($roles as $r) {
-            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r->getRole()]);
+            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
 
             if (\in_array($role, $childRoles)) {
                 $parentRoles[] = $r;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index bd1e0e1cb..ef1d319ac 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -5,7 +5,7 @@ namespace Chill\MainBundle\Security\Authorization;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 
-class DefaultVoterHelper implements VoterHelperInterface
+final class DefaultVoterHelper implements VoterHelperInterface
 {
     protected AuthorizationHelper $authorizationHelper;
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
index 753586270..c8300e45a 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -18,7 +18,7 @@ final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
         $this->centerResolverDispatcher = $centerResolverDispatcher;
     }
 
-    public function addCheckFor($subject, $attributes): self
+    public function addCheckFor(?string $subject, array $attributes): self
     {
        $this->configuration[] = [$attributes, $subject];
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index 306427238..70e517536 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -9,7 +9,7 @@ interface VoterGeneratorInterface
      * @param array $attributes an array of attributes
      * @return $this
      */
-    public function addCheckFor(string $class, array $attributes): self;
+    public function addCheckFor(?string $class, array $attributes): self;
 
     public function build(): VoterHelperInterface;
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index fbd3cd4d1..ae167adb5 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -30,22 +30,22 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\Center;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class AuthorizationHelperTest extends KernelTestCase
 {
-    
+
     use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, ProphecyTrait;
-    
-    public function setUp() 
+
+    public function setUp()
     {
         static::bootKernel();
     }
-    
+
     /**
-     * 
+     *
      * @return \Chill\MainBundle\Security\Authorization\AuthorizationHelper
      */
     private function getAuthorizationHelper()
@@ -54,13 +54,13 @@ class AuthorizationHelperTest extends KernelTestCase
                 ->get('chill.main.security.authorization.helper')
                 ;
     }
-    
+
     /**
      * Test function userCanReach of helper.
-     * 
+     *
      * A user can reach center => the function should return true.
      */
-    public function testUserCanReachCenter_UserShouldReach() 
+    public function testUserCanReachCenter_UserShouldReach()
     {
         $center = $this->prepareCenter(1, 'center');
         $scope = $this->prepareScope(1, 'default');
@@ -72,16 +72,16 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         ));
         $helper = $this->getAuthorizationHelper();
-        
+
         $this->assertTrue($helper->userCanReachCenter($user, $center));
     }
-    
+
     /**
      * Test function userCanReach of helper
-     * 
+     *
      * A user can not reachcenter =>W the function should return false
      */
-    public function testUserCanReachCenter_UserShouldNotReach() 
+    public function testUserCanReachCenter_UserShouldNotReach()
     {
         $centerA = $this->prepareCenter(1, 'center');
         $centerB = $this->prepareCenter(2, 'centerB');
@@ -94,11 +94,11 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         ));
         $helper = $this->getAuthorizationHelper();
-        
+
         $this->assertFalse($helper->userCanReachCenter($user, $centerB));
-        
+
     }
-    
+
     public function testUserHasAccess_shouldHaveAccess_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -114,11 +114,11 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
               'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_ShouldHaveAccessWithInheritance_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -130,17 +130,17 @@ class AuthorizationHelperTest extends KernelTestCase
                 )
             )
         ));
-        
+
         $helper = $this->getAuthorizationHelper();
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
               'CHILL_INHERITED_ROLE_1'));
     }
-    
-    
+
+
     public function testuserHasAccess_UserHasNoRole_EntityWithoutScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -156,10 +156,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($center);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     /**
      * test that a user has no access on a entity, but is granted on the same role
      * on another center
@@ -186,10 +186,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity = $this->getProphet()->prophesize();
         $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
         $entity->getCenter()->willReturn($centerA);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testtestUserHasAccess_UserShouldHaveAccess_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -207,10 +207,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoRole_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -228,10 +228,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'ANOTHER_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoCenter_EntityWithScope()
     {
         $centerA = $this->prepareCenter(1, 'center'); //the user will have this center
@@ -250,10 +250,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($centerB);
         $entity->getScope()->willReturn($scope);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     public function testUserHasAccess_UserHasNoScope_EntityWithScope()
     {
         $center = $this->prepareCenter(1, 'center');
@@ -272,12 +272,12 @@ class AuthorizationHelperTest extends KernelTestCase
         $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scopeA);
-        
+
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
-    
+
     /**
-     * 
+     *
      * @dataProvider dataProvider_getReachableCenters
      * @param Center $shouldHaveCenter
      * @param User $user
@@ -288,7 +288,7 @@ class AuthorizationHelperTest extends KernelTestCase
     {
         $this->assertEquals($test, $result, $msg);
     }
-    
+
     public function dataProvider_getReachableCenters()
     {
         $this->setUp();
@@ -297,10 +297,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
+
         $userA = $this->prepareUser(array(
             array(
-                'center' => $centerA, 
+                'center' => $centerA,
                 'permissionsGroup' => array(
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
@@ -313,62 +313,62 @@ class AuthorizationHelperTest extends KernelTestCase
                      ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2']
                )
             )
-            
+
         ));
-        
+
         $ah = $this->getAuthorizationHelper();
-        
+
         return array(
            // without scopes
             array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), null)),
                 'center A should be available for userA, with role 1 '
            ),
             array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), null)),
                 'center A should be available for userA, with role 2 '
            ),
            array(
-                true, 
-                in_array($centerB, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), null)),
                 'center A should be available for userA, with role 2 '
            ),
            array(
-                false, 
+                false,
                 in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), null)),
                 'center B should NOT be available for userA, with role 1 '
             ),
            // with scope
            array(
-                true, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_1'), $scopeB)),
                 'center A should be available for userA, with role 1, scopeC '
            ),
            array(
-                false, 
-                in_array($centerA, $ah->getReachableCenters($userA, 
+                false,
+                in_array($centerA, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), $scopeC)),
                 'center A should NOT be available for userA, with role 2, scopeA '
            ),
            array(
-                true, 
-                in_array($centerB, $ah->getReachableCenters($userA, 
+                true,
+                in_array($centerB, $ah->getReachableCenters($userA,
                     new Role('CHILL_ROLE_2'), $scopeA)),
                 'center B should be available for userA, with role 2, scopeA '
            ),
         );
-        
+
     }
-    
+
     /**
-     * 
+     *
      * @dataProvider dataProvider_getReachableScopes
      * @param boolean $expectedResult
      * @param Scope $testedScope
@@ -382,11 +382,11 @@ class AuthorizationHelperTest extends KernelTestCase
     {
         $reachableScopes = $this->getAuthorizationHelper()
                 ->getReachableScopes($user, $role, $center);
-        
+
         $this->assertEquals($expectedResult, in_array($testedScope, $reachableScopes),
                 $message);
     }
-    
+
     public function dataProvider_getReachableScopes()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -394,10 +394,10 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
+
         $userA = $this->prepareUser(array(
             array(
-                'center' => $centerA, 
+                'center' => $centerA,
                 'permissionsGroup' => array(
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
@@ -411,9 +411,9 @@ class AuthorizationHelperTest extends KernelTestCase
                      ['scope' => $scopeB, 'role' => 'CHILL_ROLE_2']
                )
             )
-            
+
         ));
-        
+
         return array(
             array(
                 true,
@@ -442,37 +442,30 @@ class AuthorizationHelperTest extends KernelTestCase
             )
         );
     }
-    
+
     public function testGetParentRoles()
     {
         $parentRoles = $this->getAuthorizationHelper()
-            ->getParentRoles(new Role('CHILL_INHERITED_ROLE_1'));
-        
-        $this->assertContains(
-            'CHILL_MASTER_ROLE', 
-            \array_map(
-                function(Role $role) {
-                    return $role->getRole();
-                }, 
-                $parentRoles
-            ), 
+            ->getParentRoles('CHILL_INHERITED_ROLE_1');
+
+        $this->assertContains('CHILL_MASTER_ROLE', $parentRoles,
             "Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`");
     }
-    
+
     public function testFindUsersReaching()
     {
         $centerA = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(Center::class)
             ->findOneByName('Center A');
-        
+
         $users = $this->getAuthorizationHelper()
-            ->findUsersReaching(new Role('CHILL_PERSON_SEE'), 
+            ->findUsersReaching(new Role('CHILL_PERSON_SEE'),
                 $centerA);
-        
+
         $usernames = \array_map(function(User $u) { return $u->getUsername(); }, $users);
-        
+
         $this->assertContains('center a_social', $usernames);
     }
-    
+
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 7590acb5f..c9703dbfe 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -19,11 +19,11 @@ services:
         autowire: true
 
     # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Authorization\DefaultVoterFactory:
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
         autowire: true
 
     # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Authorization\VoterFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterFactory'
+    Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory'
 
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index 2f086c9f5..1bf40d146 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -73,7 +73,7 @@ class AccompanyingCourseController extends Controller
             }
         }
 
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $period);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
 
         $em->persist($period);
         $em->flush();
@@ -92,6 +92,8 @@ class AccompanyingCourseController extends Controller
      */
     public function indexAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         // compute some warnings
         // get persons without household
         $withoutHousehold = [];
@@ -131,6 +133,8 @@ class AccompanyingCourseController extends Controller
      */
     public function editAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
             'accompanyingCourse' => $accompanyingCourse
         ]);
@@ -146,6 +150,8 @@ class AccompanyingCourseController extends Controller
      */
     public function historyAction(AccompanyingPeriod $accompanyingCourse): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
         return $this->render('@ChillPerson/AccompanyingCourse/history.html.twig', [
             'accompanyingCourse' => $accompanyingCourse
         ]);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index f31dfa585..9cba2ec1d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -23,7 +23,10 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Exception;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\AccompanyingPeriodType;
@@ -53,21 +56,24 @@ class AccompanyingPeriodController extends AbstractController
      */
     protected $validator;
 
-    /**
-     * AccompanyingPeriodController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param ValidatorInterface $validator
-     */
-    public function __construct(EventDispatcherInterface $eventDispatcher, ValidatorInterface $validator)
-    {
+    protected AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
+
+    public function __construct(
+        AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository,
+        EventDispatcherInterface $eventDispatcher,
+        ValidatorInterface $validator
+    ) {
+        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
     }
 
-    public function listAction(int $person_id): Response
+    /**
+     * @ParamConverter("person", options={"id"="person_id"})
+     */
+    public function listAction(Person $person): Response
     {
-        $person = $this->_getPerson($person_id);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $person);
 
         $event = new PrivacyEvent($person, [
             'element_class' => AccompanyingPeriod::class,
@@ -75,9 +81,10 @@ class AccompanyingPeriodController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        $accompanyingPeriods = $person->getAccompanyingPeriodsOrdered();
+        $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
+            ->findByPerson($person, AccompanyingPeriodVoter::SEE);
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:list.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
             'accompanying_periods' => $accompanyingPeriods,
             'person' => $person
         ]);
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 48ac993c3..485185ce7 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -18,6 +18,7 @@
 
 namespace Chill\PersonBundle\DependencyInjection;
 
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -258,14 +259,26 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
      */
     protected function prependRoleHierarchy(ContainerBuilder $container)
     {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-              'CHILL_PERSON_UPDATE' => array('CHILL_PERSON_SEE'),
-              'CHILL_PERSON_CREATE' => array('CHILL_PERSON_SEE'),
-              PersonVoter::LISTS => [ ChillExportVoter::EXPORT ],
-              PersonVoter::STATS => [ ChillExportVoter::EXPORT ]
-           )
-        ));
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                PersonVoter::UPDATE => [PersonVoter::SEE],
+                PersonVoter::CREATE => [PersonVoter::SEE],
+                PersonVoter::LISTS => [ChillExportVoter::EXPORT],
+                PersonVoter::STATS => [ChillExportVoter::EXPORT],
+                // accompanying period
+                AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
+                AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::EDIT => [AccompanyingPeriodVoter::SEE_DETAILS],
+                // give all ACL for FULL
+                AccompanyingPeriodVoter::FULL => [
+                    AccompanyingPeriodVoter::SEE_DETAILS,
+                    AccompanyingPeriodVoter::CREATE,
+                    AccompanyingPeriodVoter::EDIT,
+                    AccompanyingPeriodVoter::DELETE
+                ]
+            ]
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index fdb8feb3e..0c83d8a6a 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -18,14 +18,17 @@
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Add menu entrie to person menu.
- * 
+ *
  * Menu entries added :
- * 
+ *
  * - person details ;
  * - accompanying period (if `visible`)
  *
@@ -37,21 +40,25 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      * @var string 'visible' or 'hidden'
      */
     protected $showAccompanyingPeriod;
-    
+
     /**
      *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
+    private Security $security;
+
     public function __construct(
-        $showAccompanyingPeriod,
+        ParameterBagInterface $parameterBag,
+        Security $security,
         TranslatorInterface $translator
     ) {
-        $this->showAccompanyingPeriod = $showAccompanyingPeriod;
+        $this->showAccompanyingPeriod = $parameterBag->get('chill_person.accompanying_period');
+        $this->security = $security;
         $this->translator = $translator;
     }
-    
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Person details'), [
@@ -83,8 +90,10 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
           ->setExtras([
             'order' => 99999
           ]);
-        
-        if ($this->showAccompanyingPeriod === 'visible') {
+
+        if ($this->showAccompanyingPeriod === 'visible'
+            && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
+        ) {
             $menu->addChild($this->translator->trans('Accompanying period list'), [
                     'route' => 'chill_person_accompanying_period_list',
                     'routeParameters' => [
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
new file mode 100644
index 000000000..cdc439e32
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Security;
+
+final class AccompanyingPeriodACLAwareRepository
+{
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+    private Security $security;
+    private AuthorizationHelper $authorizationHelper;
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, Security $security, AuthorizationHelper $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher)
+    {
+        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
+        $this->security = $security;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+    }
+
+    public function findByPerson(
+        Person $person,
+        string $role,
+        ?array $orderBy = [],
+        int $limit = null,
+        int $offset = null
+    ): array {
+        dump(__METHOD__);
+        $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
+        $scopes = $this->authorizationHelper
+            ->getReachableCircles($this->security->getUser(), $role,
+                $this->centerResolverDispatcher->resolveCenter($person));
+
+        if (0 === count($scopes)) {
+            return [];
+        }
+
+        $qb
+            ->join('ap.participations', 'participation')
+            ->where($qb->expr()->eq('participation.person', ':person'))
+            ->setParameter('person', $person)
+            ;
+        // add join condition for scopes
+        $orx = $qb->expr()->orX();
+        foreach ($scopes as $key => $scope) {
+            $orx->add($qb->expr()->in('ap.scopes', ':scope_'.$key));
+            $qb->setParameter('scope_'.$key, $scope);
+        }
+        $qb->andWhere($orx);
+
+        return $qb->getQuery()->getResult();
+    }
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index f9d1b060f..c9e8397a8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -59,6 +59,11 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->findOneBy($criteria);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function getClassName()
     {
         return AccompanyingPeriod::class;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index 5214b38b7..d15e8cd7a 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -60,7 +60,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
             $countryCode);
         $this->addACLClauses($qb, 'p');
 
-        return $this->getQueryResult($qb, $simplify, $limit, $start);
+        return $this->getQueryResult($qb, 'p', $simplify, $limit, $start);
     }
 
     /**
@@ -119,7 +119,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
             $countryCode);
         $this->addACLClauses($qb, 'p');
 
-        return $this->getCountQueryResult($qb);
+        return $this->getCountQueryResult($qb,'p');
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index 2801cb8f7..5247df505 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -4,73 +4,101 @@ namespace Chill\PersonBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
 
 class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRoleHierarchyInterface
 {
-    protected AuthorizationHelper $helper;
-
     public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
+    /**
+     * details are for seeing:
+     *
+     * * SocialIssues
+     */
+    public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
+    public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
+    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
+    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
 
     /**
-     * @param AuthorizationHelper $helper
+     * Give all the right above
      */
-    public function __construct(AuthorizationHelper $helper)
-    {
-            $this->helper = $helper;
+    public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
+
+    public const ALL = [
+        self::SEE,
+        self::SEE_DETAILS,
+        self::CREATE,
+        self::EDIT,
+        self::DELETE,
+        self::FULL,
+    ];
+
+    private VoterHelperInterface $voterHelper;
+
+    private Security $security;
+
+    public function __construct(
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory
+            ->generate(self::class)
+            ->addCheckFor(null, [self::CREATE])
+            ->addCheckFor(AccompanyingPeriod::class, self::ALL)
+            ->addCheckFor(Person::class, [self::SEE])
+            ->build();
     }
 
     protected function supports($attribute, $subject)
     {
-        return $subject instanceof AccompanyingPeriod;
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         if (!$token->getUser() instanceof User) {
             return false;
         }
 
-        // TODO take scopes into account
-        if (count($subject->getPersons()) === 0) {
-            return true;
-        }
-        foreach ($subject->getPersons() as $person) {
-            // give access as soon as on center is reachable
-            if ($this->helper->userHasAccess($token->getUser(), $person->getCenter(), $attribute)) {
-                return true;
+        if ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
+                // only creator can see, edit, delete, etc.
+                if ($subject->getCreatedBy() === $token->getUser()
+                    || NULL === $subject->getCreatedBy()) {
+                    return true;
+                }
+
+                return false;
             }
 
-            return false;
+            // if confidential, only the referent can see it
+            if ($subject->isConfidential()) {
+                return $token->getUser() === $subject->getUser();
+            }
         }
-    }
 
-    private function getAttributes()
-    {
-        return [
-            self::SEE
-        ];
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 
     public function getRoles()
     {
-        return $this->getAttributes();
+        return self::ALL;
     }
 
     public function getRolesWithoutScope()
     {
         return [];
     }
-    
+
     public function getRolesWithHierarchy()
     {
-        return [ 'Person' => $this->getRoles() ];
+        return [ 'Accompanying period' => $this->getRoles() ];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index 6338f5f45..2d585e80e 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -40,19 +40,11 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     const LISTS  = 'CHILL_PERSON_LISTS';
     const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
 
-    protected AuthorizationHelper $helper;
-
-    protected CenterResolverDispatcher $centerResolverDispatcher;
-
     protected VoterHelperInterface $voter;
 
     public function __construct(
-        AuthorizationHelper $helper,
-        CenterResolverDispatcher $centerResolverDispatcher,
         VoterHelperFactoryInterface $voterFactory
     ) {
-        $this->helper = $helper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->voter = $voterFactory
             ->generate(self::class)
             ->addCheckFor(Center::class, [self::STATS, self::LISTS, self::DUPLICATE])
diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
index 6efdb4640..489168425 100644
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -12,9 +12,8 @@ services:
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingPeriodController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
+        autowire: true
+        autoconfigure: true
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\PersonAddressController:
diff --git a/src/Bundle/ChillPersonBundle/config/services/menu.yaml b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
index 344eb2a17..a9f566466 100644
--- a/src/Bundle/ChillPersonBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
@@ -19,14 +19,7 @@ services:
               #            - { name: 'chill.menu_builder' }
               #
     Chill\PersonBundle\Menu\PersonMenuBuilder:
-        arguments:
-            $showAccompanyingPeriod: '%chill_person.accompanying_period%'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
-
-              #    Chill\PersonBundle\Menu\AccompanyingCourseMenuBuilder:
-              #        arguments:
-              #            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-              #        tags:
-              #            - { name: 'chill.menu_builder' }
diff --git a/src/Bundle/ChillPersonBundle/config/services/security.yaml b/src/Bundle/ChillPersonBundle/config/services/security.yaml
index 8504874a3..6dc3c92d3 100644
--- a/src/Bundle/ChillPersonBundle/config/services/security.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/security.yaml
@@ -7,8 +7,7 @@ services:
             - { name: chill.role }
 
     Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter:
-        arguments:
-            - "@chill.main.security.authorization.helper"
+        autowire: true
         tags:
             - { name: security.voter }
             - { name: chill.role }

From b6c58a5c31f43edb3d739458dd957327400d8a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 19 Sep 2021 20:56:20 +0200
Subject: [PATCH 161/217] Continue work on ACL rewritting

* fix center resolver dispatcher
* add scope resolver
* tests for authorization helper
---
 .../ChillMainBundle/ChillMainBundle.php       |  3 +
 .../Entity/HasCentersInterface.php            |  8 ++
 .../Entity/HasScopesInterface.php             | 11 +++
 .../Authorization/AuthorizationHelper.php     | 71 +++++++++++---
 .../Resolver/CenterResolverDispatcher.php     |  2 -
 .../Resolver/DefaultCenterResolver.php        | 11 ++-
 .../Resolver/DefaultScopeResolver.php         | 42 ++++++++
 .../Resolver/ScopeResolverDispatcher.php      | 44 +++++++++
 .../Resolver/ScopeResolverInterface.php       | 30 ++++++
 .../Authorization/AuthorizationHelperTest.php | 98 ++++++++++++++++++-
 .../Resolver/DefaultScopeResolverTest.php     | 62 ++++++++++++
 .../Resolver/ScopeResolverDispatcherTest.php  | 60 ++++++++++++
 .../config/services/security.yaml             |  8 ++
 .../AccompanyingPeriodController.php          |  6 +-
 .../Entity/AccompanyingPeriod.php             | 26 ++++-
 .../AccompanyingPeriodACLAwareRepository.php  | 28 +++++-
 ...nyingPeriodACLAwareRepositoryInterface.php | 16 +++
 .../config/services/repository.yaml           |  1 +
 18 files changed, 498 insertions(+), 29 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
 create mode 100644 src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php

diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index d2ae5f1b5..d5fb7b79d 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -5,6 +5,7 @@ namespace Chill\MainBundle;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Search\SearchInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
+use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
@@ -31,6 +32,8 @@ class ChillMainBundle extends Bundle
             ->addTag('chill.menu_builder');
         $container->registerForAutoconfiguration(CenterResolverInterface::class)
             ->addTag('chill_main.center_resolver');
+        $container->registerForAutoconfiguration(ScopeResolverInterface::class)
+            ->addTag('chill_main.scope_resolver');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
new file mode 100644
index 000000000..921cbba41
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+interface HasCentersInterface
+{
+    public function getCenters(): ?iterable;
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
new file mode 100644
index 000000000..911dea563
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Chill\MainBundle\Entity;
+
+interface HasScopesInterface
+{
+    /**
+     * @return array|Scope[]
+     */
+    public function getScopes(): iterable;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index d7507f7a0..bf45a98d6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -24,6 +24,9 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Security\Core\Role\Role;
@@ -56,16 +59,24 @@ class AuthorizationHelper
 
     protected CenterResolverDispatcher $centerResolverDispatcher;
 
+    protected ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    protected LoggerInterface $logger;
+
     public function __construct(
         RoleHierarchyInterface $roleHierarchy,
         ParameterBagInterface $parameterBag,
         EntityManagerInterface $em,
-        CenterResolverDispatcher $centerResolverDispatcher
+        CenterResolverDispatcher $centerResolverDispatcher,
+        LoggerInterface $logger,
+        ScopeResolverDispatcher $scopeResolverDispatcher
     ) {
         $this->roleHierarchy = $roleHierarchy;
         $this->hierarchy     = $parameterBag->get('security.role_hierarchy.roles');
         $this->em = $em;
         $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->logger = $logger;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
     }
 
     /**
@@ -114,11 +125,32 @@ class AuthorizationHelper
      */
     public function userHasAccess(User $user, $entity, $attribute)
     {
-        if (NULL === $center = $this->centerResolverDispatcher->resolveCenter($entity)) {
-            return false;
-        }
+        $center = $this->centerResolverDispatcher->resolveCenter($entity);
 
+        if (is_iterable($center)) {
+            foreach ($center as $c) {
+                if ($this->userHasAccessForCenter($user, $c, $entity, $attribute)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } elseif ($center instanceof Center) {
+            return $this->userHasAccessForCenter($user, $center, $entity, $attribute);
+        } elseif (NULL === $center) {
+            return false;
+        } else {
+            throw new \UnexpectedValueException("could not resolver a center");
+        }
+    }
+
+    private function userHasAccessForCenter(User $user, Center $center, $entity, $attribute): bool
+    {
         if (!$this->userCanReachCenter($user, $center)) {
+            $this->logger->debug("user cannot reach center of entity", [
+                'center_name' => $center->getName(),
+                'user' => $user->getUsername()
+            ]);
             return false;
         }
 
@@ -132,24 +164,35 @@ class AuthorizationHelper
                     if ($this->isRoleReached($attribute, $roleScope->getRole())) {
                         //if yes, we have a right on something...
                         // perform check on scope if necessary
-                        if ($entity instanceof HasScopeInterface) {
-                            $scope = $entity->getScope();
-                            if ($scope === NULL) {
-                                return true;
-                            }
-                            if ($scope->getId() === $roleScope
-                                  ->getScope()->getId()) {
-                                return true;
-                            }
+                        if ($this->scopeResolverDispatcher->isConcerned($entity)) {
+                           $scope = $this->scopeResolverDispatcher->resolveScope($entity);
+
+                           if (NULL === $scope) {
+                               return true;
+                           } elseif (is_iterable($scope)) {
+                               foreach ($scope as $s) {
+                                   if ($s === $roleScope->getScope()) {
+                                       return true;
+                                   }
+                               }
+                           } else {
+                               if ($scope === $roleScope->getScope()) {
+                                   return true;
+                               }
+                           }
                         } else {
                             return true;
                         }
                     }
                 }
-
             }
         }
 
+        $this->logger->debug("user can reach center entity, but not role", [
+            'username' => $user->getUsername(),
+            'center' => $center->getName()
+        ]);
+
         return false;
     }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
index 6b1f2a897..1e2f9c02b 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -9,8 +9,6 @@ class CenterResolverDispatcher
      */
     private iterable $resolvers = [];
 
-    private CenterResolverInterface $defaultResolver;
-
     public function __construct(iterable $resolvers)
     {
         $this->resolvers = $resolvers;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
index 31531e0cc..e3e92164a 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -4,12 +4,13 @@ namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
 
 class DefaultCenterResolver implements CenterResolverInterface
 {
     public function supports($entity, ?array $options = []): bool
     {
-        return $entity instanceof HasCenterInterface;
+        return $entity instanceof HasCenterInterface || $entity instanceof HasCentersInterface;
     }
 
     /**
@@ -20,7 +21,13 @@ class DefaultCenterResolver implements CenterResolverInterface
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        return $entity->getCenter();
+        if ($entity instanceof HasCenterInterface) {
+            return $entity->getCenter();
+        } elseif ($entity instanceof HasCentersInterface) {
+            return $entity->getCenters();
+        } else {
+            throw new \UnexpectedValueException("should be an instanceof");
+        }
     }
 
     public static function getDefaultPriority(): int
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
new file mode 100644
index 000000000..caf052764
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+
+class DefaultScopeResolver implements ScopeResolverInterface
+{
+
+    public function supports($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param HasScopeInterface|HasScopesInterface $entity
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        if ($entity instanceof HasScopeInterface) {
+            return $entity->getScope();
+        } elseif ($entity instanceof HasScopesInterface) {
+            return $entity->getScopes();
+        } else {
+            throw new \UnexpectedValueException("should be an instanceof %s or %s",
+                HasScopesInterface::class, HasScopeInterface::class);
+        }
+    }
+
+    public function isConcerned($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
+    }
+
+    public static function getDefaultPriority(): int
+    {
+        return -256;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
new file mode 100644
index 000000000..cc3f11560
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Scope;
+
+final class ScopeResolverDispatcher
+{
+    /**
+     * @var iterable|ScopeResolverInterface[]
+     */
+    private iterable $resolvers;
+
+    public function __construct(iterable $resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * @param $entity
+     * @return Scope|Scope[]|iterable
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->resolveScope($entity, $options);
+            }
+        }
+
+        return null;
+    }
+
+    public function isConcerned($entity, ?array $options = []): bool
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return $resolver->isConcerned($entity, $options);
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
new file mode 100644
index 000000000..2f5669d0d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+
+interface ScopeResolverInterface
+{
+    public function supports($entity, ?array $options = []): bool;
+
+    /**
+     * @param $entity
+     * @param array|null $options
+     * @return Scope|array|Scope[]
+     */
+    public function resolveScope($entity, ?array $options = []);
+
+
+    /**
+     * Return true if the entity is concerned by scope, false otherwise.
+     *
+     * @param $entity
+     * @param array|null $options
+     * @return bool
+     */
+    public function isConcerned($entity, ?array $options = []): bool;
+
+    public static function getDefaultPriority(): int;
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index ae167adb5..764d6c429 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -19,6 +19,10 @@
 
 namespace Chill\MainBundle\Tests\Security\Authorization;
 
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\MainBundle\Test\PrepareCenterTrait;
@@ -268,14 +272,104 @@ class AuthorizationHelperTest extends KernelTestCase
         ));
         $helper = $this->getAuthorizationHelper();
         $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity->willImplement(HasCenterInterface::class);
+        $entity->willImplement(HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scopeA);
 
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
 
+    public function testUserHasAccess_MultiCenter_EntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $center, 'permissionsGroup' => array(
+                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$center, $centerB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccess_MultiCenter_EntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $centerC = $this->prepareCenter(1, 'centerC');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $center, 'permissionsGroup' => array(
+                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$centerB, $centerC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccess_EntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeC = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $centerA, 'permissionsGroup' => array(
+                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeB, $scopeC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccess_EntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser(array(
+            array(
+                'center' => $centerA, 'permissionsGroup' => array(
+                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
+            )
+            )
+        ));
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeA, $scopeB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+
+
     /**
      *
      * @dataProvider dataProvider_getReachableCenters
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
new file mode 100644
index 000000000..de6d19b5a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
+use PHPUnit\Framework\TestCase;
+
+class DefaultScopeResolverTest extends TestCase
+{
+    private DefaultScopeResolver $scopeResolver;
+
+    public function setUp()
+    {
+        $this->scopeResolver = new DefaultScopeResolver();
+    }
+
+    public function testHasScopeInterface()
+    {
+        $scope = new Scope();
+        $entity = new class($scope) implements HasScopeInterface {
+
+            public function __construct(Scope $scope) {
+                $this->scope = $scope;
+            }
+
+            public function getScope()
+            {
+                return $this->scope;
+            }
+
+        };
+
+        $this->assertTrue($this->scopeResolver->supports($entity));
+        $this->assertTrue($this->scopeResolver->isConcerned($entity));
+        $this->assertSame($scope, $this->scopeResolver->resolveScope($entity));
+    }
+
+    public function testHasScopesInterface()
+    {
+        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+
+            public function __construct(Scope $scopeA, Scope $scopeB) {
+                $this->scopes = [$scopeA, $scopeB];
+            }
+
+            public function getScopes(): iterable
+            {
+                return $this->scopes;
+            }
+        };
+
+        $this->assertTrue($this->scopeResolver->supports($entity));
+        $this->assertTrue($this->scopeResolver->isConcerned($entity));
+        $this->assertIsArray($this->scopeResolver->resolveScope($entity));
+        $this->assertSame($scopeA, $this->scopeResolver->resolveScope($entity)[0]);
+        $this->assertSame($scopeB, $this->scopeResolver->resolveScope($entity)[1]);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
new file mode 100644
index 000000000..2a36fd365
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Chill\MainBundle\Tests\Security\Resolver;
+
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use PHPUnit\Framework\TestCase;
+
+class DefaultScopeResolverDispatcherTest extends TestCase
+{
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    public function setUp()
+    {
+        $this->scopeResolverDispatcher = new ScopeResolverDispatcher([new DefaultScopeResolver()]);
+    }
+
+    public function testHasScopeInterface()
+    {
+        $scope = new Scope();
+        $entity = new class($scope) implements HasScopeInterface {
+
+            public function __construct(Scope $scope) {
+                $this->scope = $scope;
+            }
+
+            public function getScope()
+            {
+                return $this->scope;
+            }
+
+        };
+
+        $this->assertTrue($this->scopeResolverDispatcher->isConcerned($entity));
+        $this->assertSame($scope, $this->scopeResolverDispatcher->resolveScope($entity));
+    }
+
+    public function testHasScopesInterface()
+    {
+        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+
+            public function __construct(Scope $scopeA, Scope $scopeB) {
+                $this->scopes = [$scopeA, $scopeB];
+            }
+
+            public function getScopes(): iterable
+            {
+                return $this->scopes;
+            }
+        };
+
+        $this->assertTrue($this->scopeResolverDispatcher->isConcerned($entity));
+        $this->assertIsArray($this->scopeResolverDispatcher->resolveScope($entity));
+        $this->assertSame($scopeA, $this->scopeResolverDispatcher->resolveScope($entity)[0]);
+        $this->assertSame($scopeB, $this->scopeResolverDispatcher->resolveScope($entity)[1]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index c9703dbfe..0d820220b 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -8,11 +8,19 @@ services:
         arguments:
             - !tagged_iterator chill_main.center_resolver
 
+    Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher:
+        arguments:
+            - !tagged_iterator chill_main.scope_resolver
+
     # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
         autoconfigure: true
         autowire: true
 
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
+        autoconfigure: true
+        autowire: true
+
     # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
         autoconfigure: true
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index 9cba2ec1d..255c6d9ba 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -23,7 +23,7 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Exception;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -56,10 +56,10 @@ class AccompanyingPeriodController extends AbstractController
      */
     protected $validator;
 
-    protected AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
+    protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
 
     public function __construct(
-        AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository,
+        AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         ValidatorInterface $validator
     ) {
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 1c375d051..5672b7f09 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -24,6 +24,8 @@ namespace Chill\PersonBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -52,7 +54,8 @@ use Symfony\Component\Validator\Constraints as Assert;
  *  "accompanying_period"=AccompanyingPeriod::class
  *  })
  */
-class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
+class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface,
+    HasScopesInterface, HasCentersInterface
 {
     /**
      * Mark an accompanying period as "occasional"
@@ -809,11 +812,16 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    /**
+     * @return iterable|Collection
+     */
     public function getScopes(): Collection
     {
         return $this->scopes;
     }
 
+
+
     public function addScope(Scope $scope): self
     {
         $this->scopes[] = $scope;
@@ -1040,4 +1048,20 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
             return 'none';
         }
     }
+
+    public function getCenters(): ?iterable
+    {dump(__METHOD__);
+        foreach ($this->getPersons() as $person) {
+            if (!in_array($person->getCenter(), $centers ?? [])
+                && NULL !== $person->getCenter()) {
+                $centers[] = $person->getCenter();
+            }
+        }
+
+        dump($centers);
+
+        return $centers ?? null;
+    }
+
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index cdc439e32..c8cca82f5 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -4,10 +4,11 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Security;
 
-final class AccompanyingPeriodACLAwareRepository
+final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
 {
     private AccompanyingPeriodRepository $accompanyingPeriodRepository;
     private Security $security;
@@ -29,7 +30,6 @@ final class AccompanyingPeriodACLAwareRepository
         int $limit = null,
         int $offset = null
     ): array {
-        dump(__METHOD__);
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
         $scopes = $this->authorizationHelper
             ->getReachableCircles($this->security->getUser(), $role,
@@ -42,12 +42,30 @@ final class AccompanyingPeriodACLAwareRepository
         $qb
             ->join('ap.participations', 'participation')
             ->where($qb->expr()->eq('participation.person', ':person'))
+            ->andWhere(
+                $qb->expr()->orX(
+                    'ap.confidential = FALSE',
+                    $qb->expr()->eq('ap.user', ':user')
+                )
+            )
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->neq('ap.step', ':draft'),
+                    $qb->expr()->eq('ap.createdBy', ':creator')
+                )
+            )
+            ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('person', $person)
-            ;
+            ->setParameter('user', $this->security->getUser())
+            ->setParameter('creator', $this->security->getUser())
+        ;
         // add join condition for scopes
-        $orx = $qb->expr()->orX();
+        $orx = $qb->expr()->orX(
+            $qb->expr()->eq('ap.step', ':draft')
+        );
+
         foreach ($scopes as $key => $scope) {
-            $orx->add($qb->expr()->in('ap.scopes', ':scope_'.$key));
+            $orx->add($qb->expr()->isMemberOf(':scope_'.$key, 'ap.scopes'));
             $qb->setParameter('scope_'.$key, $scope);
         }
         $qb->andWhere($orx);
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..a5798d3e8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface AccompanyingPeriodACLAwareRepositoryInterface
+{
+    public function findByPerson(
+        Person $person,
+        string $role,
+        ?array $orderBy = [],
+        int $limit = null,
+        int $offset = null
+    ): array;
+}
diff --git a/src/Bundle/ChillPersonBundle/config/services/repository.yaml b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
index fa76ccd7c..b4d179dd1 100644
--- a/src/Bundle/ChillPersonBundle/config/services/repository.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/repository.yaml
@@ -9,3 +9,4 @@ services:
 
     Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface: '@Chill\PersonBundle\Repository\PersonACLAwareRepository'
 
+    Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface: '@Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository'

From 120f7d802600dd2769b0d22cede92cb3f92bc93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 20 Sep 2021 13:03:59 +0200
Subject: [PATCH 162/217] upgrade voter and acl for activities and implement
 autoconfiguration for ChillProvideRole interface

---
 .../Controller/ActivityController.php         | 27 +++---
 .../Repository/ActivityACLAwareRepository.php | 72 +++++++++++++---
 .../ActivityACLAwareRepositoryInterface.php   | 19 +++++
 .../Repository/ActivityRepository.php         | 68 +++++++++++++--
 .../Security/Authorization/ActivityVoter.php  | 85 +++++++++++--------
 .../ChillActivityBundle/config/services.yaml  | 21 ++---
 .../config/services/controller.yaml           |  6 +-
 .../config/services/repositories.yaml         |  8 +-
 .../ChillMainBundle/ChillMainBundle.php       |  4 +
 .../Authorization/AuthorizationHelper.php     | 21 +++--
 .../Entity/AccompanyingPeriod.php             |  6 +-
 11 files changed, 236 insertions(+), 101 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index fe515918a..0988eedfe 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -22,6 +22,9 @@
 
 namespace Chill\ActivityBundle\Controller;
 
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -53,12 +56,16 @@ class ActivityController extends AbstractController
 
     protected SerializerInterface $serializer;
 
+    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
     public function __construct(
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
         SerializerInterface $serializer
     ) {
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
@@ -77,13 +84,9 @@ class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($person instanceof Person) {
-            $reachableScopes = $this->authorizationHelper
-                ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
-                    $person->getCenter());
-
-            $activities = $em->getRepository(Activity::class)
-                ->findByPersonImplied($person, $reachableScopes)
-                ;
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
+            $activities = $this->activityACLAwareRepository
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
@@ -93,10 +96,10 @@ class ActivityController extends AbstractController
 
             $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
-                ['date' => 'DESC'],
-            );
+            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
+
+            $activities = $this->activityACLAwareRepository
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -238,7 +241,7 @@ class ActivityController extends AbstractController
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
-        
+
         if (null !== $accompanyingPeriod) {
            $entity->personsAssociated = $entity->getPersonsAssociated();
            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index b198875c5..b498a6090 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -33,9 +35,10 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
 
 
-final class ActivityACLAwareRepository 
+final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     private AuthorizationHelper $authorizationHelper;
 
@@ -45,16 +48,63 @@ final class ActivityACLAwareRepository
 
     private EntityManagerInterface $em;
 
+    private Security $security;
+
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcher $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
+        Security $security
     ) {
         $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->tokenStorage = $tokenStorage;
         $this->repository = $repository;
         $this->em = $em;
+        $this->security = $security;
+    }
+
+    /**
+     * @param Person $person
+     * @param string $role
+     * @param int|null $start
+     * @param int|null $limit
+     * @param array $orderBy
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+        ;
+    }
+
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($period);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $scopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
     public function queryTimelineIndexer(string $context, array $args = []): array
@@ -81,7 +131,7 @@ final class ActivityACLAwareRepository
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
-        
+
         return $metadataActivity->getTableName().' JOIN '
             .$metadataPerson->getTableName().' ON '
             .$metadataPerson->getTableName().'.'.
@@ -95,7 +145,7 @@ final class ActivityACLAwareRepository
     {
         $where = '';
         $parameters = [];
-        
+
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
@@ -105,20 +155,20 @@ final class ActivityACLAwareRepository
 
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
                 $role);
-        
+
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ($context === 'person') { 
-            // we start with activities having the person_id linked to person 
+        if ($context === 'person') {
+            // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
         }
-        
+
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
@@ -131,7 +181,7 @@ final class ActivityACLAwareRepository
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); }, 
+                function(Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 
@@ -162,7 +212,7 @@ final class ActivityACLAwareRepository
         }
         // close loop for centers
         $where .= ')';
-        
+
         return [$where, $parameters];
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..0b646f7c5
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+interface ActivityACLAwareRepositoryInterface
+{
+    /**
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 340481ca9..90b3875f6 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -23,6 +23,8 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -39,15 +41,22 @@ class ActivityRepository extends ServiceEntityRepository
         parent::__construct($registry, Activity::class);
     }
 
-    public function findByPersonImplied($person, array $scopes, $orderBy = [ 'date' => 'DESC'], $limit = 100, $offset = 0)
+    /**
+     * @param $person
+     * @param array $scopes
+     * @param string[] $orderBy
+     * @param int $limit
+     * @param int $offset
+     * @return array|Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
     {
         $qb = $this->createQueryBuilder('a');
         $qb->select('a');
 
         $qb
-            // TODO add acl
-            //->where($qb->expr()->in('a.scope', ':scopes'))
-            //->setParameter('scopes', $scopes)
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->eq('a.person', ':person'),
@@ -61,7 +70,56 @@ class ActivityRepository extends ServiceEntityRepository
             $qb->addOrderBy('a.'.$k, $dir);
         }
 
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
         return $qb->getQuery()
             ->getResult();
-    }    
+    }
+
+    /**
+     * @param AccompanyingPeriod $period
+     * @param array $scopes
+     * @param int|null $limit
+     * @param int|null $offset
+     * @param array|string[] $orderBy
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        if (!$allowNullScope) {
+            $qb
+                ->where($qb->expr()->in('a.scope', ':scopes'))
+                ->setParameter('scopes', $scopes)
+            ;
+        } else {
+            $qb
+                ->where(
+                    $qb->expr()->orX(
+                        $qb->expr()->in('a.scope', ':scopes'),
+                        $qb->expr()->isNull('a.scope')
+                    )
+                )
+                ->setParameter('scopes', $scopes)
+            ;
+        }
+
+        $qb
+            ->andWhere(
+                $qb->expr()->eq('a.accompanyingPeriod', ':period')
+            )
+            ->setParameter('period', $period)
+        ;
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index 79cb6d852..cc9cecf52 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -19,6 +19,11 @@
 
 namespace Chill\ActivityBundle\Security\Authorization;
 
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
@@ -28,11 +33,10 @@ use Chill\MainBundle\Entity\User;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Voter for Activity class
  */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -41,30 +45,37 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
     const UPDATE = 'CHILL_ACTIVITY_UPDATE';
     const DELETE = 'CHILL_ACTIVITY_DELETE';
+    const FULL = 'CHILL_ACTIVITY_FULL';
 
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
+    private const ALL = [
+        self::CREATE,
+        self::SEE,
+        self::UPDATE,
+        self::DELETE,
+        self::SEE_DETAILS,
+        self::FULL
+    ];
 
-    public function __construct(AuthorizationHelper $helper)
-    {
-        $this->helper = $helper;
+    protected VoterHelperInterface $voterHelper;
+
+    protected Security $security;
+
+    public function __construct(
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory->generate(self::class)
+            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+            ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
+            ->addCheckFor(Activity::class, self::ALL)
+            ->build();
     }
 
 
     protected function supports($attribute, $subject)
     {
-        if ($subject instanceof Activity) {
-            return \in_array($attribute, $this->getAttributes());
-        } elseif ($subject instanceof Person) {
-            return $attribute === self::SEE 
-                ||
-                $attribute === self::CREATE;
-        } else {
-            return false;
-        }
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
@@ -72,32 +83,34 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
-        if ($subject instanceof Person) {
-            $centers = $this->helper->getReachableCenters($token->getUser(), new Role($attribute));
-            
-            return \in_array($subject->getCenter(), $centers);
+
+        if ($subject instanceof Activity) {
+            if ($subject->getPerson() instanceof Person) {
+                // the context is person: we must have the right to see the person
+                if (!$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
+                    return false;
+                }
+            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
+                    return false;
+                }
+            } else {
+                throw new \RuntimeException("could not determine context of activity");
+            }
         }
-        
-        /* @var $subject Activity */
-        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
-    }
-    
-    private function getAttributes()
-    {
-        return [ self::CREATE, self::SEE, self::UPDATE, self::DELETE,
-                  self::SEE_DETAILS ];
+
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 
 
     public function getRoles()
     {
-        return $this->getAttributes();
+        return self::ALL;
     }
 
     public function getRolesWithoutScope()
     {
-        return array();
+        return [];
     }
 
 
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 86168101a..0a65e08c8 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -1,20 +1,4 @@
 services:
-    chill.activity.security.authorization.activity_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-
-    chill.activity.security.authorization.activity_stats_voter:
-        class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
-        arguments:
-            - "@chill.main.security.authorization.helper"
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-
 
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
@@ -38,3 +22,8 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Notification'
+
+    Chill\ActivityBundle\Security\Authorization\:
+        resource: '../Security/Authorization/'
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillActivityBundle/config/services/controller.yaml b/src/Bundle/ChillActivityBundle/config/services/controller.yaml
index 106b2c6e4..96ace0a64 100644
--- a/src/Bundle/ChillActivityBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/controller.yaml
@@ -1,8 +1,4 @@
 services:
     Chill\ActivityBundle\Controller\ActivityController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $logger: '@chill.main.logger'
-            $serializer: '@Symfony\Component\Serializer\SerializerInterface'
+        autowire: true
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
index 2f0a9b83c..26bc58ac9 100644
--- a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
@@ -24,9 +24,7 @@ services:
             - '@Doctrine\Persistence\ManagerRegistry'
 
     Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+        autowire: true
+        autoconfigure: true
+    Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface: '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
 
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index d5fb7b79d..91c58f68b 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -4,6 +4,8 @@ namespace Chill\MainBundle;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Security\Authorization\ChillVoterInterface;
+use Chill\MainBundle\Security\ProvideRoleInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -30,6 +32,8 @@ class ChillMainBundle extends Bundle
 
         $container->registerForAutoconfiguration(LocalMenuBuilderInterface::class)
             ->addTag('chill.menu_builder');
+        $container->registerForAutoconfiguration(ProvideRoleInterface::class)
+            ->addTag('chill.role');
         $container->registerForAutoconfiguration(CenterResolverInterface::class)
             ->addTag('chill_main.center_resolver');
         $container->registerForAutoconfiguration(ScopeResolverInterface::class)
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index bf45a98d6..2b223a0fe 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -265,11 +265,11 @@ class AuthorizationHelper
      * @deprecated Use getReachableCircles
      *
      * @param User $user
-     * @param Role $role
-     * @param Center $center
+     * @param string role
+     * @param Center|Center[] $center
      * @return Scope[]
      */
-    public function getReachableScopes(User $user, $role, Center $center)
+    public function getReachableScopes(User $user, $role, $center)
     {
         if ($role instanceof Role) {
             $role = $role->getRole();
@@ -283,15 +283,24 @@ class AuthorizationHelper
      *
      * @param User $user
      * @param string|Role $role
-     * @param Center $center
+     * @param Center|Center[] $center
      * @return Scope[]
      */
-    public function getReachableCircles(User $user, $role, Center $center)
+    public function getReachableCircles(User $user, $role, $center)
     {
+        $scopes = [];
+
+        if (is_iterable($center)) {
+            foreach ($center as $c) {
+                $scopes = \array_merge($scopes, $this->getReachableCircles($user, $role, $c));
+            }
+
+            return $scopes;
+        }
+
         if ($role instanceof Role) {
             $role = $role->getRole();
         }
-        $scopes = array();
 
         foreach ($user->getGroupCenters() as $groupCenter){
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 5672b7f09..d69a7a51a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -1050,7 +1050,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
     }
 
     public function getCenters(): ?iterable
-    {dump(__METHOD__);
+    {
         foreach ($this->getPersons() as $person) {
             if (!in_array($person->getCenter(), $centers ?? [])
                 && NULL !== $person->getCenter()) {
@@ -1058,10 +1058,6 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
             }
         }
 
-        dump($centers);
-
         return $centers ?? null;
     }
-
-
 }

From e7928c222d77785c05df5be1477a2206af7a32a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 20 Sep 2021 14:11:33 +0200
Subject: [PATCH 163/217] creating endpoint for scopes

---
 .../ChillMainExtension.php                    | 20 +++++++++++++++++++
 .../ChillMainBundle/chill.api.specs.yaml      | 11 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index a25bee94a..d0aada689 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -398,6 +398,26 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         ],
                     ]
                 ],
+                [
+                    'class' => \Chill\MainBundle\Entity\Scope::class,
+                    'name' => 'scope',
+                    'base_path' => '/api/1.0/main/scope',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ]
+                        ],
+                    ]
+                ],
             ]
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 3dd8c8736..f6945e20b 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -480,3 +480,14 @@ paths:
           description: "not found"
         401:
           description: "Unauthorized"
+
+  /1.0/main/scope.json:
+    get:
+      tags:
+        - scope
+      summary: return a list of scopes
+      responses:
+        200:
+          description: "ok"
+        401:
+          description: "Unauthorized"

From 1e829707be776136f153a5b6ca116c293862c7c0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 11:32:35 +0200
Subject: [PATCH 164/217] tp: wip.. write postAddressToThirdparty api for
 AddAddress callback

---
 .../ChillMainBundle/Resources/public/vuejs/Address/App.vue     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 17f5ee288..e20490995 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -121,6 +121,9 @@ export default {
                   })
                ;
                break;
+            case 'thirdparty':
+               console.log('TODO write postAddressToThirdparty');
+               break;
             default:
                this.$refs.addAddress.errorMsg.push('That entity is not managed by address !');
          }

From 717cd03d95c07edfda81530f4dc455451a545cad Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 11:28:41 +0200
Subject: [PATCH 165/217] Address: context id received from twig are integer

---
 .../Resources/public/vuejs/Address/App.vue           | 12 ++++++------
 .../public/vuejs/Address/components/AddAddress.vue   |  7 ++++---
 .../Resources/public/vuejs/Address/index.js          |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 17f5ee288..b1d75c4d5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -31,7 +31,7 @@ export default {
       }
    },
    mounted() {
-      //console.log('AddAddress: data context', this.context);
+      console.log('AddAddress: data context', this.context);
       //console.log('AddAddress: data options', this.options);
    },
    methods: {
@@ -83,12 +83,12 @@ export default {
       *  Post new created address to targetEntity
       */
       postAddressTo(payload) {
-         console.log('postAddressTo', payload.target);
+         console.log('postAddress', payload.addressId, 'To', payload.target, payload.targetId);
          switch (payload.target) {
             case 'household':
                postAddressToHousehold(payload.targetId, payload.addressId)
-                  .then(household => new Promise((resolve, reject) => {
-                     console.log('..toHousehold', household);
+                  .then(address => new Promise((resolve, reject) => {
+                     console.log('..household address', address);
                      this.$refs.addAddress.flag.loading = false;
                      this.$refs.addAddress.flag.success = true;
 
@@ -105,8 +105,8 @@ export default {
                break;
             case 'person':
                postAddressToPerson(payload.targetId, payload.addressId)
-                  .then(person => new Promise((resolve, reject) => {
-                     console.log('..toPerson', person);
+                  .then(address => new Promise((resolve, reject) => {
+                     console.log('..person address', address);
                      this.$refs.addAddress.flag.loading = false;
                      this.$refs.addAddress.flag.success = true;
 
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 75f7b9c63..e64029604 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -563,7 +563,7 @@ export default {
       */
       addNewAddress(payload)
       {
-         //console.log('addNewAddress', payload);
+         console.log('addNewAddress', payload);
          this.flag.loading = true;
 
          if ('newPostcode' in payload) {
@@ -583,8 +583,9 @@ export default {
          }
       },
 
-      postNewAddress(payload) {
-         //console.log('postNewAddress', payload);
+      postNewAddress(payload)
+      {
+         console.log('postNewAddress', payload);
          return postAddress(payload)
             .then(address => new Promise((resolve, reject) => {
                this.entity.address = address;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 004f73cf4..c890737ba 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -16,10 +16,10 @@ containers.forEach((container) => {
                     context: {
                         target: {
                             name: container.dataset.targetName,
-                            id: container.dataset.targetId
+                            id: parseInt(container.dataset.targetId)
                         },
                         edit: container.dataset.mode === 'edit',  //boolean
-                        addressId: container.dataset.addressId || null,
+                        addressId: parseInt(container.dataset.addressId) || null,
                         backUrl: container.dataset.backUrl || null
                     },
                     options: {

From 75a240a2d64d379bc4c570b58f11bb92450a0951 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 12:24:28 +0200
Subject: [PATCH 166/217] parent callback will cast afterLastPaneAction, that
 manage redirection or context changes

---
 .../Resources/public/vuejs/Address/App.vue    |  8 +++---
 .../vuejs/Address/components/AddAddress.vue   | 26 +++++++++++--------
 .../views/Household/address_move.html.twig    |  1 +
 .../views/Household/addresses.html.twig       |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index b1d75c4d5..5136f830a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -32,7 +32,7 @@ export default {
    },
    mounted() {
       console.log('AddAddress: data context', this.context);
-      //console.log('AddAddress: data options', this.options);
+      console.log('AddAddress: data options', this.options);
    },
    methods: {
       displayErrors() {
@@ -45,7 +45,7 @@ export default {
          if (this.context.edit) {
 
             // address is already linked, just finish !
-            this.$refs.addAddress.lastPaneAction();
+            this.$refs.addAddress.afterLastPaneAction({});
 
          // New created address
          } else {
@@ -93,7 +93,7 @@ export default {
                      this.$refs.addAddress.flag.success = true;
 
                      // finish
-                     this.$refs.addAddress.lastPaneAction();
+                     this.$refs.addAddress.afterLastPaneAction({ addressId: address.address_id });
 
                      resolve();
                   }))
@@ -111,7 +111,7 @@ export default {
                      this.$refs.addAddress.flag.success = true;
 
                      // finish
-                     this.$refs.addAddress.lastPaneAction();
+                     this.$refs.addAddress.afterLastPaneAction({ addressId: address.address_id });
 
                      resolve();
                   }))
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 e64029604..656f4a742 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -384,7 +384,9 @@ export default {
          if (!this.context.edit && this.useDatePane) {
             this.openDatePane();
          } else {
-            this.openShowPane()
+            if (!this.options.forceRedirect) {
+               this.openShowPane();
+            }
          }
       },
       openDatePane() {
@@ -402,13 +404,18 @@ export default {
          this.flag.datePane = false;
          this.openShowPane();
       },
-      lastPaneAction() {
+      afterLastPaneAction(params) {
+         this.initForm();
+         // redirect or reset pane
          if (this.options.forceRedirect === true) {
             console.log("redirect to backUrl");
             window.location.assign(this.context.backUrl);
          } else {
-            console.log("don't redirect");
+            console.log("don't redirect, adapt context");
             this.resetPane();
+            // change to edit context
+            this.context.edit = true;
+            this.context.addressId = params.addressId;
          }
       },
 
@@ -546,14 +553,14 @@ export default {
 
          if (!this.context.edit) {
             this.addNewAddress(newAddress)
-               .then(payload => this.closePaneAndCallbackSubmit(payload));
+               .then(payload => this.addressChangedCallback(payload));
 
          } else {
             this.updateAddress({
                addressId: this.context.addressId,
                newAddress: newAddress
             })
-            .then(payload => this.closePaneAndCallbackSubmit(payload));
+            .then(payload => this.addressChangedCallback(payload));
          }
       },
 
@@ -655,18 +662,15 @@ export default {
       /*
       *  Method just add closing pane to the callback method
       *  (get out step1 show pane, submit button)
-      */
       closePaneAndCallbackSubmit(payload)
       {
-
-         this.initForm();
-         this.resetPane();
-
+         //this.initForm();
+         //this.resetPane(); // because parent callback will cast afterLastPaneAction()
          console.log('will call parent callback method', payload);
-
          // callback props method from parent
          this.addressChangedCallback(payload);
       }
+      */
    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index fc2a28250..50346672b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,6 +10,7 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            forceRedirect: true,
             stickyActions: true,
         } %}
         {#
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 854be6359..717f31e77 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -18,12 +18,12 @@
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
                     backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+                    forceRedirect: true,
                     mode: 'new',
                     useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
-                    forceRedirect: true,
                 } %}
                 {#
                 #}

From 690f649dd12cef0805d15ce364e12d1fb7653b60 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 12:26:17 +0200
Subject: [PATCH 167/217] applyChanges, if DatePane or not

---
 .../Resources/public/vuejs/Address/components/AddAddress.vue   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 656f4a742..f6dcd9371 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -378,12 +378,12 @@ export default {
          }
       },
       closeEditPane() {
-         this.applyChanges();
          this.flag.editPane = false;
          console.log('step2: close the Edit Panel');
          if (!this.context.edit && this.useDatePane) {
             this.openDatePane();
          } else {
+            this.applyChanges();
             if (!this.options.forceRedirect) {
                this.openShowPane();
             }
@@ -394,6 +394,7 @@ export default {
          console.log('step3: open the Date Panel');
       },
       closeDatePane() {
+         this.applyChanges();
          this.flag.datePane = false;
          console.log('step3: close the Date Panel');
       },

From 8ba74f8de8920decc9975223685b99580c9b923f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 12:36:41 +0200
Subject: [PATCH 168/217] editPane, change button if datePane after

---
 .../vuejs/Address/components/AddAddress.vue    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 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 f6dcd9371..47958031c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -104,7 +104,11 @@
             <button class="btn btn-cancel change-icon" @click="resetPane">
                {{ $t('action.cancel') }}
             </button>
-            <button class="btn btn-save" @click="closeEditPane">
+            <button v-if="useDatePane" class="btn btn-misc" @click="closeEditPane">
+               {{ $t('nav.next')}}
+               <i class="fa fa-fw fa-arrow-right"></i>
+            </button>
+            <button v-else class="btn btn-save" @click="closeEditPane">
                {{ $t('action.save')}}
             </button>
          </template>
@@ -128,7 +132,13 @@
             </a>
          </template>
          <template v-slot:action>
-            <li>
+            <li v-if="useDatePane">
+               <button class="btn btn-misc" @click="closeEditPane">
+                  {{ $t('nav.next')}}
+                  <i class="fa fa-fw fa-arrow-right"></i>
+               </button>
+            </li>
+            <li v-else>
                <button class="btn btn-save" @click="closeEditPane">
                   {{ $t('action.save')}}
                </button>
@@ -189,7 +199,7 @@
 
          <template v-slot:action>
             <li>
-               <button class="btn btn-update" @click="openEditPane">
+               <button class="btn btn-update" @click="closeDatePane">
                   {{ $t('action.edit')}}
                </button>
             </li>
@@ -323,7 +333,7 @@ export default {
       //console.log('options bindModal.step2', this.options.bindModal.step2);
       //console.log('options useDate.validFrom', this.options.useDate.validFrom);
       //console.log('options useDate.validTo', this.options.useDate.validTo);
-      //console.log('useDatePane', this.useDatePane);
+      console.log('useDatePane', this.useDatePane);
 
       console.log('Mounted now !');
       if (this.context.edit) {

From f3b755e46ec3f66ae202f30e5ba387d7a54a4a3e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 13:10:43 +0200
Subject: [PATCH 169/217] fix warning with getSuccessText

---
 .../Resources/public/vuejs/Address/components/DatePane.vue    | 4 ----
 .../Resources/public/vuejs/Address/components/SuggestPane.vue | 2 --
 2 files changed, 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 98b3060cd..7a270eafa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -9,10 +9,6 @@
       {{ errorMsg }}
    </div>
 
-   <div v-if="flag.success" class="alert alert-success">
-      {{ $t(getSuccessText) }}
-   </div>
-
    <address-render-box :address="address"></address-render-box>
 
    <div v-if="showDateFrom" class='address-valid date-since'>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index f85e3ba34..6e0956d3b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -7,8 +7,6 @@
 
    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">{{ errorMsg }}</div>
 
-   <div v-if="flag.success" class="alert alert-success">{{ $t(getSuccessText) }}</div>
-
    <h4 class="h3">{{ $t('address_suggestions') }}</h4>
 
    <div class="flex-table AddressSuggestionList">

From 3f3dd8313225de14574d81686069a7c47eeb63a8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 13:11:57 +0200
Subject: [PATCH 170/217] fix error in afterLastPaneAction

---
 .../vuejs/Address/components/AddAddress.vue     | 17 ++++++++++++-----
 .../Resources/views/Address/new.html.twig       |  2 +-
 2 files changed, 13 insertions(+), 6 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 47958031c..c0cb45c42 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -415,18 +415,25 @@ export default {
          this.flag.datePane = false;
          this.openShowPane();
       },
+
+      /*
+      *  What happens when submitting last Pane:
+      *  - redirect or reset pane,
+      *  - change context to editing
+      */
       afterLastPaneAction(params) {
          this.initForm();
-         // redirect or reset pane
          if (this.options.forceRedirect === true) {
             console.log("redirect to backUrl");
             window.location.assign(this.context.backUrl);
          } else {
-            console.log("don't redirect, adapt context");
+            console.log("don't redirect");
             this.resetPane();
-            // change to edit context
-            this.context.edit = true;
-            this.context.addressId = params.addressId;
+            if (!this.context.edit) {
+               this.context.edit = true;
+               this.context.addressId = params.addressId;
+               console.log("context is now edit, with address", params.addressId);
+            }
          }
       },
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 21e858615..a3149ef38 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,11 +30,11 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            useValidFrom: true,
             openPanesInModal: false,
             stickyActions: true,
         } %}
         {#
+            useValidFrom: true,
         #}
 
     {% endblock %}

From 7fe0f08300a92b8ace3aade1aa692db6d08d452e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 21 Sep 2021 10:48:40 +0200
Subject: [PATCH 171/217] tp api endpoints: use default controller (fix)

---
 .../DependencyInjection/ChillThirdPartyExtension.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 0331e007d..9b23222c6 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -44,7 +44,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $this->preprendRoutes($container);
         $this->prependRoleHierarchy($container);
     }
-    
+
     protected function preprendRoutes(ContainerBuilder $container)
     {
         //declare routes for 3party bundle
@@ -60,7 +60,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     'name' => 'thirdparty',
                     'base_path' => '/api/1.0/thirdparty/thirdparty',
                     'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::class,
-                    'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
+                    //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
                         '_index' => [
                             'methods' => [
@@ -87,7 +87,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
             ],
         ));
     }
-    
+
     protected function prependRoleHierarchy(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('security', array(

From e13b7bf195f0d4fa470b9df28cdf9d8ab4ccd835 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 20 Sep 2021 13:27:03 +0200
Subject: [PATCH 172/217] fix countrySelection multiselect with fetch async
 countries

edit context: display country for existing address
new context: repair editPane, load countries

note: adding id for country and postcode in address endpoint json
---
 .../public/vuejs/Address/components/AddAddress.vue    | 11 +++++++----
 .../Serializer/Normalizer/AddressNormalizer.php       |  2 ++
 .../Resources/views/Address/new.html.twig             |  2 +-
 3 files changed, 10 insertions(+), 5 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 c0cb45c42..dd9171cc2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -381,10 +381,12 @@ export default {
             if (this.flag.suggestPane === true) {
                this.closeSuggestPane();
             }
-            this.initForm();
-            this.getCountries();
-            this.flag.editPane = true;
+            if (this.flag.showPane === true) {
+               this.closeShowPane();
+            }
             console.log('step2: open the Edit panel');
+            this.initForm();
+            this.getCountries(); // will open edit pane when resolve promise
          }
       },
       closeEditPane() {
@@ -456,10 +458,11 @@ export default {
 
       getCountries() {
          this.flag.loading = true;
+         console.log('## GO');
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
-               this.flag.showPane = false;
+               console.log('## COMPLETE !');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 44998043b..9e3b5c11b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -17,8 +17,10 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
         $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
         $data['street'] = $address->getStreet();
         $data['streetNumber'] = $address->getStreetNumber();
+        $data['postcode']['id'] = $address->getPostCode()->getId();
         $data['postcode']['name'] = $address->getPostCode()->getName();
         $data['postcode']['code'] = $address->getPostCode()->getCode();
+        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
         $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
         $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
         $data['floor'] = $address->getFloor();
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index a3149ef38..14ddace0a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,10 +30,10 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            openPanesInModal: false,
             stickyActions: true,
         } %}
         {#
+            openPanesInModal: false,
             useValidFrom: true,
         #}
 

From c382008b4de48d90e979fef3fbd705e915938e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:23:15 +0200
Subject: [PATCH 173/217] fix tests (wip)

---
 .../AccompanyingCourseApiControllerTest.php   | 126 ++++++++++--------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 3f427e811..a24e94bfa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -23,6 +23,7 @@
 namespace Chill\PersonBundle\Tests\Controller;
 
 
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -47,6 +48,8 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
     protected ?AccompanyingPeriod $period = NULL;
 
+    protected ?int $periodId = NULL;
+
     /**
      * Setup before the first test of this class (see phpunit doc)
      */
@@ -70,15 +73,15 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingCourseShow(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingCourseShow(int $personId, int $periodId)
     {
-        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()));
+        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
         $response = $this->client->getResponse();
 
         $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
 
         $data = \json_decode($response->getContent());
-        $this->assertEquals($data->id, $period->getId(),
+        $this->assertEquals($data->id, $periodId,
             "test that the response's data contains the id of the period"
         );
         $this->assertGreaterThan(0, $data->participations);
@@ -326,14 +329,16 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingPeriodPatch(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingPeriodPatch(int $personId, int $periodId)
     {
+        $period = self::$container->get(AccompanyingPeriodRepository::class)
+            ->find($periodId);
         $initialValueEmergency = $period->isEmergency();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $this->client->request(
             Request::METHOD_PATCH,
-            sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -343,11 +348,10 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
         $this->assertEquals(200, $response->getStatusCode());
         $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($period->getId());
-        $em->refresh($period);
+            ->find($periodId);
         $this->assertEquals(!$initialValueEmergency, $period->isEmergency());
 
-        // restore the initial valud
+        // restore the initial value
         $period->setEmergency($initialValueEmergency);
         $em->flush();
     }
@@ -361,12 +365,32 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $em = static::$container->get(EntityManagerInterface::class);
         $center = $em->getRepository(Center::class)
             ->findOneBy(array('name' => 'Center A'));
+        $qb = $em->createQueryBuilder();
 
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0)
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
+            ->getQuery()
             ->getScalarResult();
 
         // create a random order
@@ -400,11 +424,11 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingCourseAddParticipation(int $personId, AccompanyingPeriod $period)
+    public function testAccompanyingCourseAddParticipation(int $personId, int $periodId)
     {
         $this->client->request(
             Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -420,7 +444,8 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
         // check by deownloading the accompanying cours
 
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()));
+        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
+        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
 
         $response = $this->client->getResponse();
         $data = \json_decode($response->getContent());
@@ -435,7 +460,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         // check removing the participation
         $this->client->request(
             Request::METHOD_DELETE,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $period->getId()),
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
             [], // parameters
             [], // files
             [], // server parameters
@@ -450,42 +475,6 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $this->assertNotNull($data['startDate']);
         $this->assertArrayHasKey('endDate', $data);
         $this->assertNotNull($data['endDate']);
-
-
-        // set to variable for tear down
-        $this->personId = $personId;
-        $this->period = $period;
-    }
-
-    protected function tearDown()
-    {
-        $em = static::$container->get(EntityManagerInterface::class);
-
-        // remove participation if set
-        if ($this->personId && $this->period) {
-            $participation = $em
-                ->getRepository(AccompanyingPeriodParticipation::class)
-                ->findOneBy(['person' => $this->personId, 'accompanyingPeriod' => $this->period])
-                ;
-
-            if (NULL !== $participation) {
-                $em->remove($participation);
-                $em->flush();
-            }
-            $this->personId = NULL;
-            $this->period   = NULL;
-        } elseif ($this->period) {
-            $period = $em
-                ->getRepository(AccompanyingPeriod::class)
-                ->find($this->period->getId()) ;
-
-            if ($period !== NULL) {
-                $em->remove($period);
-                $em->flush();
-            }
-
-            $this->period = null;
-        }
     }
 
     public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
@@ -505,12 +494,32 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $em = static::$container->get(EntityManagerInterface::class);
         $center = $em->getRepository(Center::class)
             ->findOneBy(array('name' => 'Center A'));
+        $qb = $em->createQueryBuilder();
 
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0)
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
+            ->getQuery()
             ->getScalarResult();
 
         // create a random order
@@ -556,7 +565,10 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $qb = $em->createQueryBuilder();
         $personIds = $qb
             ->select('p.id')
+            ->distinct(true)
             ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
             ->where(
                 $qb->expr()->eq(
                     'p.center',
@@ -568,7 +580,11 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
                     'SIZE(p.accompanyingPeriodParticipations)',
                     0)
                 )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
             ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
             ->setMaxResults($maxResults)
             ->getQuery()
             ->getScalarResult();
@@ -584,7 +600,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
                 ->find($id);
             $periods = $person->getAccompanyingPeriods();
 
-            yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)] ];
+            yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)]->getId() ];
 
             $nbGenerated++;
         }

From c62254caec3101a8e1ee74ad6fe25f8a64c0e377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:23:26 +0200
Subject: [PATCH 174/217] add scope selection on accompanying course

---
 src/Bundle/ChillMainBundle/Entity/Scope.php   |  24 +--
 .../Resources/public/lib/api/scope.js         |  17 +++
 .../Resolver/ScopeResolverInterface.php       |  19 ++-
 .../ChillMainBundle/chill.api.specs.yaml      |  20 +++
 .../DataFixtures/ORM/LoadPeople.php           |  39 ++++-
 .../DataFixtures/ORM/LoadPersonACL.php        |  12 +-
 .../Entity/AccompanyingPeriod.php             |   4 +-
 .../public/vuejs/AccompanyingCourse/App.vue   |   3 +
 .../public/vuejs/AccompanyingCourse/api.js    |  48 +++++-
 .../AccompanyingCourse/components/Confirm.vue |   4 +
 .../AccompanyingCourse/components/Scopes.vue  |  47 ++++++
 .../vuejs/AccompanyingCourse/js/i18n.js       |   5 +
 .../vuejs/AccompanyingCourse/store/index.js   | 144 +++++++++++++++++-
 13 files changed, 351 insertions(+), 35 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue

diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index ba11a1842..2e75c5791 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -3,17 +3,17 @@
 /*
  * Chill is a suite of a modules, Chill is a software for social workers
  * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -46,17 +46,17 @@ class Scope
      * @Groups({"read"})
      */
     private $id;
-    
+
     /**
      * translatable names
-     * 
+     *
      * @var array
      *
      * @ORM\Column(type="json_array")
      * @Groups({"read"})
      */
     private $name = [];
-    
+
     /**
      * @var Collection
      *
@@ -66,8 +66,8 @@ class Scope
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private $roleScopes;
-    
-    
+
+
     /**
      * Scope constructor.
      */
@@ -75,7 +75,7 @@ class Scope
     {
         $this->roleScopes = new ArrayCollection();
     }
-    
+
     /**
      * @return int
      */
@@ -91,7 +91,7 @@ class Scope
     {
         return $this->name;
     }
-    
+
     /**
      * @param $name
      * @return $this
@@ -101,7 +101,7 @@ class Scope
         $this->name = $name;
         return $this;
     }
-    
+
     /**
      * @return Collection
      */
@@ -109,7 +109,7 @@ class Scope
     {
         return $this->roleScopes;
     }
-    
+
     /**
      * @param RoleScope $roleScope
      */
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
new file mode 100644
index 000000000..a8df4ed88
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
@@ -0,0 +1,17 @@
+const fetchScopes = () => {
+  return window.fetch('/api/1.0/main/scope.json').then(response => {
+    if (response.ok) {
+      return response.json();
+    }
+  }).then(data => {
+    console.log(data);
+    return new Promise((resolve, reject) => {
+      console.log(data);
+      resolve(data.results);
+    });
+  });
+};
+
+export {
+  fetchScopes
+};
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
index 2f5669d0d..04e949a59 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -2,16 +2,21 @@
 
 namespace Chill\MainBundle\Security\Resolver;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
 
+/**
+ * Interface to implement to define a ScopeResolver.
+ */
 interface ScopeResolverInterface
 {
+    /**
+     * Return true if this resolve is able to decide "something" on this entity.
+     */
     public function supports($entity, ?array $options = []): bool;
 
     /**
-     * @param $entity
-     * @param array|null $options
+     * Will return the scope for the entity
+     *
      * @return Scope|array|Scope[]
      */
     public function resolveScope($entity, ?array $options = []);
@@ -19,12 +24,12 @@ interface ScopeResolverInterface
 
     /**
      * Return true if the entity is concerned by scope, false otherwise.
-     *
-     * @param $entity
-     * @param array|null $options
-     * @return bool
      */
     public function isConcerned($entity, ?array $options = []): bool;
 
+    /**
+     * get the default priority for this resolver. Resolver with an higher priority will be
+     * queried first.
+     */
     public static function getDefaultPriority(): int;
 }
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index f6945e20b..8ee69e96d 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -491,3 +491,23 @@ paths:
           description: "ok"
         401:
           description: "Unauthorized"
+
+  /1.0/main/scope/{id}.json:
+    get:
+      tags:
+        - scope
+      summary: return a list of scopes
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The scope id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "ok"
+        401:
+          description: "Unauthorized"
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index d6bdce233..848e8f874 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -24,8 +24,12 @@ namespace Chill\PersonBundle\DataFixtures\ORM;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\CenterRepository;
 use Chill\MainBundle\Repository\CountryRepository;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -90,12 +94,26 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     protected MaritalStatusRepository $maritalStatusRepository;
 
+    /**
+     * @var array|Scope[]
+     */
+    protected array $cacheScopes = [];
+
+    protected ScopeRepository $scopeRepository;
+
+    /** @var array|User[] */
+    protected array $cacheUsers = [];
+
+    protected UserRepository $userRepository;
+
     public function __construct(
         Registry $workflowRegistry,
         SocialIssueRepository $socialIssueRepository,
         CenterRepository $centerRepository,
         CountryRepository $countryRepository,
-        MaritalStatusRepository $maritalStatusRepository
+        MaritalStatusRepository $maritalStatusRepository,
+        ScopeRepository $scopeRepository,
+        UserRepository $userRepository
     ) {
         $this->faker = Factory::create('fr_FR');
         $this->faker->addProvider($this);
@@ -105,7 +123,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         $this->countryRepository = $countryRepository;
         $this->maritalStatusRepository = $maritalStatusRepository;
         $this->loader = new NativeLoader($this->faker);
-
+        $this->scopeRepository = $scopeRepository;
+        $this->userRepository = $userRepository;
     }
 
     public function getOrder()
@@ -220,10 +239,16 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
                     new \DateInterval('P' . \random_int(0, 180) . 'D')
                 )
         );
+        $accompanyingPeriod->setCreatedBy($this->getRandomUser())
+            ->setCreatedAt(new \DateTimeImmutable('now'));
         $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
         if (\random_int(0, 10) > 3) {
+            // always add social scope:
+            $accompanyingPeriod->addScope($this->getReference('scope_social'));
+            var_dump(count($accompanyingPeriod->getScopes()));
+
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());
             $workflow = $this->workflowRegistry->get($accompanyingPeriod);
@@ -231,9 +256,19 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         }
 
         $manager->persist($person);
+        $manager->persist($accompanyingPeriod);
         echo "add person'".$person->__toString()."'\n";
     }
 
+    private function getRandomUser(): User
+    {
+        if (0 === count($this->cacheUsers)) {
+            $this->cacheUsers = $this->userRepository->findAll();
+        }
+
+        return $this->cacheUsers[\array_rand($this->cacheUsers)];
+    }
+
     private function createAddress(): Address
     {
         $objectSet = $this->loader->loadData([
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index c8593d1fd..18f8e5879 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -40,13 +40,13 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
         return 9600;
     }
 
-    
+
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             $scopeSocial = $this->getReference('scope_social');
-            
+
             //create permission group
             switch ($permissionsGroup->getName()) {
                 case 'social':
@@ -55,7 +55,7 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
 
                     $permissionsGroup->addRoleScope(
                         (new RoleScope())
-                            ->setRole(AccompanyingPeriodVoter::SEE)
+                            ->setRole(AccompanyingPeriodVoter::FULL)
                             ->setScope($scopeSocial)
                     );
 
@@ -87,7 +87,7 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $manager->persist($roleScopeUpdate);
                     $manager->persist($roleScopeCreate);
                     $manager->persist($roleScopeDuplicate);
-                    
+
                     break;
                 case 'administrative':
                     printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
@@ -98,9 +98,9 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $manager->persist($roleScopeSee);
                     break;
             }
-            
+
         }
-        
+
         $manager->flush();
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index d69a7a51a..14fb26f1a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -824,7 +824,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
     public function addScope(Scope $scope): self
     {
-        $this->scopes[] = $scope;
+        if (!$this->scopes->contains($scope)) {
+            $this->scopes[] = $scope;
+        }
 
         return $this;
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index e621feead..797f246fe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -10,6 +10,7 @@
    <origin-demand></origin-demand>
    <requestor></requestor>
    <social-issue></social-issue>
+   <scopes></scopes>
    <referrer></referrer>
    <resources></resources>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
@@ -32,6 +33,7 @@ import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
 import CourseLocation from './components/CourseLocation.vue';
+import Scopes from './components/Scopes.vue';
 import Referrer from './components/Referrer.vue';
 import Resources from './components/Resources.vue';
 import Comment from './components/Comment.vue';
@@ -47,6 +49,7 @@ export default {
       Requestor,
       SocialIssue,
       CourseLocation,
+      Scopes,
       Referrer,
       Resources,
       Comment,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
index 52e253ac1..ee4c3e11b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
@@ -191,7 +191,49 @@ const getListOrigins = () => {
          if (response.ok) { return response.json(); }
          throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
-}
+};
+
+const addScope = (id, scope) => {
+  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
+  console.log(url);
+  console.log(scope);
+
+  return fetch(url, {
+    method: 'POST',
+    body: JSON.stringify({
+      id: scope.id,
+      type: scope.type,
+    }),
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    },
+  })
+    .then(response => {
+      if (response.ok) { return response.json(); }
+      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
+    });
+};
+
+const removeScope = (id, scope) => {
+  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
+  console.log(url);
+  console.log(scope);
+
+  return fetch(url, {
+    method: 'DELETE',
+    body: JSON.stringify({
+      id: scope.id,
+      type: scope.type,
+    }),
+    headers: {
+      'Content-Type': 'application/json;charset=utf-8'
+    },
+  })
+    .then(response => {
+      if (response.ok) { return response.json(); }
+      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
+    });
+};
 
 export {
    getAccompanyingCourse,
@@ -204,5 +246,7 @@ export {
    getUsers,
    whoami,
    getListOrigins,
-   postSocialIssue
+   postSocialIssue,
+   addScope,
+   removeScope,
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 44479831c..b7834039d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -88,6 +88,10 @@ export default {
             socialIssue: {
                msg: 'confirm.socialIssue_not_valid',
                anchor: '#section-50'
+            },
+            scopes: {
+              msg: 'confirm.set_a_scope',
+              anchor: '#section-65'
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
new file mode 100644
index 000000000..ca1b36770
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="vue-component">
+    <h2><a name="section-65"></a>{{ $t('scopes.title') }}</h2>
+
+    <ul>
+      <li v-for="s in scopes">
+        <input type="checkbox" v-model="checkedScopes" :value="s" />
+        {{ s.name.fr }}
+      </li>
+    </ul>
+
+    <div v-if="!isScopeValid" class="alert alert-warning separator">
+      {{ $t('scopes.add_at_least_one') }}
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { mapState, mapGetters } from 'vuex';
+
+export default {
+  name: "Scopes",
+  computed: {
+    ...mapState([
+        'scopes',
+        'scopesAtStart'
+    ]),
+    ...mapGetters([
+        'isScopeValid'
+    ]),
+    checkedScopes: {
+      get: function() {
+        return this.$store.state.accompanyingCourse.scopes;
+      },
+      set: function(v) {
+        this.$store.dispatch('setScopes', v);
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index d7c01a174..cf3a0fb7e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -86,6 +86,10 @@ const appMessages = {
          person_locator: "Parcours localisé auprès de {0}",
          no_address: "Il n'y a pas d'adresse associée au parcours"
       },
+      scopes: {
+         title: "Services",
+         add_at_least_one: "Indiquez au moins un service",
+      },
       referrer: {
          title: "Référent du parcours",
          label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent",
@@ -113,6 +117,7 @@ const appMessages = {
          participation_not_valid: "sélectionnez au minimum 1 usager",
          socialIssue_not_valid: "sélectionnez au minimum une problématique sociale",
          location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
+         set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 34a6786fc..4deb86e40 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -1,28 +1,41 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { fetchScopes } from 'ChillMainAssets/lib/api/scope.js';
 import { getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,
    postParticipation,
    postRequestor,
    postResource,
-   postSocialIssue } from '../api';
+   postSocialIssue,
+   addScope,
+   removeScope,
+} from '../api';
 
 
 const debug = process.env.NODE_ENV !== 'production';
 const id = window.accompanyingCourseId;
 
-let initPromise = getAccompanyingCourse(id)
-   .then(accompanying_course => new Promise((resolve, reject) => {
+let scopesPromise = fetchScopes();
+let accompanyingCoursePromise = getAccompanyingCourse(id);
+
+let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
+  .then(([scopes, accompanyingCourse]) => new Promise((resolve, reject) => {
 
       const store = createStore({
          strict: debug,
          modules: {
          },
          state: {
-            accompanyingCourse: accompanying_course,
+            accompanyingCourse: accompanyingCourse,
             addressContext: {},
-            errorMsg: []
+            errorMsg: [],
+            // all the available scopes
+            scopes: scopes,
+            // the scopes at start. If the user remove all scopes, we re-add those scopes, by security
+            scopesAtStart: accompanyingCourse.scopes.map(scope => scope),
+            // the scope states at server side
+            scopesAtBackend: accompanyingCourse.scopes.map(scope => scope),
          },
          getters: {
             isParticipationValid(state) {
@@ -34,11 +47,16 @@ let initPromise = getAccompanyingCourse(id)
             isLocationValid(state) {
                return state.accompanyingCourse.location !== null;
             },
+            isScopeValid(state) {
+               console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
+               return state.accompanyingCourse.scopes.length > 0;
+            },
             validationKeys(state, getters) {
                let keys = [];
                if (!getters.isParticipationValid) { keys.push('participation'); }
                if (!getters.isLocationValid) { keys.push('location'); }
                if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
+               if (!getters.isScopeValid) { keys.push('scopes'); }
                //console.log('getter keys', keys);
                return keys;
             },
@@ -137,6 +155,21 @@ let initPromise = getAccompanyingCourse(id)
             setEditContextTrue(state) {
               //console.log('### mutation: set edit context = true');
                state.addressContext.edit = true;
+            },
+            setScopes(state, scopes) {
+               state.accompanyingCourse.scopes = scopes;
+            },
+            addScopeAtBackend(state, scope) {
+               let scopeIds = state.scopesAtBackend.map(s => s.id);
+               if (!scopeIds.includes(scope.id)) {
+                  state.scopesAtBackend.push(scope);
+               }
+            },
+            removeScopeAtBackend(state, scope){
+               let scopeIds = state.scopesAtBackend.map(s => s.id);
+               if (scopeIds.includes(scope.id)) {
+                  state.scopesAtBackend = state.scopesAtBackend.filter(s => s.id !== scope.id);
+               }
             }
          },
          actions: {
@@ -223,6 +256,107 @@ let initPromise = getAccompanyingCourse(id)
                   resolve();
                })).catch((error) => { commit('catchError', error) });
             },
+            /**
+             * Handle the checked/unchecked scopes
+             *
+             * When the user set the scopes in a invalid situation (when no scopes are cheched), this
+             * method will internally re-add the scopes as they were originally when the page was loaded, but
+             * this does not appears for the user (they remains unchecked). When the user re-add a scope, the
+             * scope is back in a valid state, and the store synchronize with the new state (all the original scopes
+             * are removed if necessary, and the new checked scopes is backed).
+             *
+             * So, for instance:
+             *
+             * at load:
+             *
+             * [x] scope A (at backend: [x])
+             * [x] scope B (at backend: [x])
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user uncheck scope A:
+             *
+             * [ ] scope A (at backend: [ ] as soon as the operation finish)
+             * [x] scope B (at backend: [x])
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user uncheck scope B. The state is invalid (no scope checked), so we go back to initial state when
+             * the page loaded):
+             *
+             * [ ] scope A (at backend: [x] as soon as the operation finish)
+             * [ ] scope B (at backend: [x] as soon as the operation finish)
+             * [ ] scope C (at backend: [ ])
+             *
+             * The user check scope C. The scopes are back to valid state. So we go back to synchronization with UI and
+             * backend):
+             *
+             * [ ] scope A (at backend: [ ] as soon as the operation finish)
+             * [ ] scope B (at backend: [ ] as soon as the operation finish)
+             * [x] scope C (at backend: [x] as soon as the operation finish)
+             *
+             * **Warning** There is a problem if the user check/uncheck faster than the backend is synchronized.
+             *
+             * @param commit
+             * @param state
+             * @param dispatch
+             * @param scopes
+             * @returns Promise
+             */
+            setScopes({ commit, state, dispatch }, scopes) {
+               let currentServerScopesIds = state.scopesAtBackend.map(scope => scope.id);
+               let checkedScopesIds = scopes.map(scope => scope.id);
+               let removedScopesIds = currentServerScopesIds.filter(id => !checkedScopesIds.includes(id));
+               let addedScopesIds = checkedScopesIds.filter(id => !currentServerScopesIds.includes(id));
+               let lengthAfterOperation = currentServerScopesIds.length + addedScopesIds.length
+                 - removedScopesIds.length;
+
+               if (lengthAfterOperation > 0 || (lengthAfterOperation === 0 && state.scopesAtStart.length === 0) ) {
+                  return dispatch('updateScopes', {
+                     addedScopesIds, removedScopesIds
+                  }).then(() => {
+                     // warning: when the operation of dispatch are too slow, the user may check / uncheck before
+                     // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
+                     // check/uncheck in the UI. I do not know of to avoid it.
+                     commit('setScopes', scopes);
+                     return Promise.resolve();
+                  });
+               } else {
+                  return dispatch('setScopes', state.scopesAtStart).then(() => {
+                     commit('setScopes', scopes);
+                     return Promise.resolve();
+                  });
+               }
+            },
+            /**
+             * Internal function for the store to effectively update scopes.
+             *
+             * Return a promise which resolves when all update operation are
+             * successful and finished.
+             *
+             * @param state
+             * @param commit
+             * @param addedScopesIds
+             * @param removedScopesIds
+             * @return Promise
+             */
+            updateScopes({ state, commit }, { addedScopesIds, removedScopesIds }) {
+               let promises = [];
+               state.scopes.forEach(scope => {
+                  if (addedScopesIds.includes(scope.id)) {
+                     promises.push(addScope(state.accompanyingCourse.id, scope).then(() => {
+                        commit('addScopeAtBackend', scope);
+                        return Promise.resolve();
+                     }));
+                  }
+                  if (removedScopesIds.includes(scope.id)) {
+                     promises.push(removeScope(state.accompanyingCourse.id, scope).then(() => {
+                        commit('removeScopeAtBackend', scope);
+                        return Promise.resolve();
+                     }));
+                  }
+               });
+
+               return Promise.all(promises);
+            },
             postFirstComment({ commit }, payload) {
                //console.log('## action: postFirstComment: payload', payload);
                patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload })

From b06e726ad17651e382d9a222490ddb598cf3688a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:28:14 +0200
Subject: [PATCH 175/217] fix required fields in user controller test

---
 .../Tests/Controller/UserControllerTest.php   | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index eeff4cc06..1953439dd 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -7,11 +7,11 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 class UserControllerTest extends WebTestCase
 {
     private $client;
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $this->client = static::createClient(array(), array(
            'PHP_AUTH_USER' => 'admin',
            'PHP_AUTH_PW'   => 'password',
@@ -23,62 +23,64 @@ class UserControllerTest extends WebTestCase
     {
         // get the list
         $crawler = $this->client->request('GET', '/fr/admin/user/');
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
                 "Unexpected HTTP status code for GET /admin/user/");
-        
+
         $link = $crawler->selectLink('Ajouter un nouvel utilisateur')->link();
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $link);
         $this->assertRegExp('|/fr/admin/user/new$|', $link->getUri());
     }
-        
+
     public function testNew()
     {
         $crawler = $this->client->request('GET', '/fr/admin/user/new');
-        
+
         $username = 'Test_user'.  uniqid();
         $password = 'Password1234!';
-        dump($crawler->text());
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form(array(
             'chill_mainbundle_user[username]'  => $username,
             'chill_mainbundle_user[plainPassword][first]' => $password,
-            'chill_mainbundle_user[plainPassword][second]' => $password
+            'chill_mainbundle_user[plainPassword][second]' => $password,
+            'chill_mainbundle_user[email]'  => $username.'@gmail.com',
+            'chill_mainbundle_user[label]'  => $username,
+
         ));
 
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(), 
+        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(),
                 'Missing element td:contains("Test user")');
-        
+
         $update = $crawler->selectLink('Modifier')->link();
-        
+
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $update);
         $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit$|', $update->getUri());
-        
+
         //test the auth of the new client
         $this->isPasswordValid($username, $password);
-        
+
         return $update;
     }
-    
+
     protected function isPasswordValid($username, $password)
     {
         /* @var $passwordEncoder \Symfony\Component\Security\Core\Encoder\UserPasswordEncoder */
         $passwordEncoder = self::$kernel->getContainer()
                 ->get('security.password_encoder');
-        
+
         $user = self::$kernel->getContainer()
                 ->get('doctrine.orm.entity_manager')
                 ->getRepository('ChillMainBundle:User')
                 ->findOneBy(array('username' => $username));
-        
+
         $this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
     }
-    
+
     /**
-     * 
+     *
      * @param \Symfony\Component\DomCrawler\Link $update
      * @depends testNew
      */
@@ -90,24 +92,24 @@ class UserControllerTest extends WebTestCase
         $form = $crawler->selectButton('Mettre à jour')->form(array(
             'chill_mainbundle_user[username]'  => $username,
         ));
-        
+
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[value="'.$username.'"]')->count(), 
+        $this->assertGreaterThan(0, $crawler->filter('[value="'.$username.'"]')->count(),
                 'Missing element [value="Foo bar"]');
-        
+
         $updatePassword = $crawler->selectLink('Modifier le mot de passe')->link();
-        
+
         $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $updatePassword);
-        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit_password$|', 
+        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit_password$|',
                 $updatePassword->getUri());
-        
+
         return array('link' => $updatePassword, 'username' => $username);
     }
-    
+
     /**
-     * 
+     *
      * @param \Symfony\Component\DomCrawler\Link $updatePassword
      * @depends testUpdate
      */
@@ -116,22 +118,22 @@ class UserControllerTest extends WebTestCase
         $link = $params['link'];
         $username = $params['username'];
         $newPassword = '1234Password!';
-        
+
         $crawler = $this->client->click($link);
-        
+
         $form = $crawler->selectButton('Changer le mot de passe')->form(array(
             'chill_mainbundle_user_password[new_password][first]' => $newPassword,
             'chill_mainbundle_user_password[new_password][second]' => $newPassword,
         ));
-        
+
         $this->client->submit($form);
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect(), 
+
+        $this->assertTrue($this->client->getResponse()->isRedirect(),
                 "the response is a redirection");
         $this->client->followRedirect();
-        
+
         $this->isPasswordValid($username, $newPassword);
     }
 
-    
+
 }

From 7df923c669144576c777335cd74a4f087b1a016e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:28:35 +0200
Subject: [PATCH 176/217] fix vendor dir in composer.json

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a2aa29a5a..747747290 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
         "symfony/web-profiler-bundle": "^5.0"
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "vendor-dir": "tests/app/vendor"
     },
     "autoload": {
         "psr-4": {

From f1c29a8bd3b782d26871c37a5965c3cc91be63ae Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:08:16 +0200
Subject: [PATCH 177/217] Household summary: improve Address display when there
 is no address

---
 .../views/Household/summary.html.twig         | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index d8c53dbf5..115f5a208 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -16,42 +16,39 @@
 
     {% set address = household.currentAddress %}
 
-    {% if address is empty %}
-        <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
-    {% else %}
-        <div class="row household-resume">
-
-            <div class="item-bloc col-5 col-address">
-
-                <h2>{{ 'Address'|trans }}</h2>
+    <div class="row household-resume">
+        <div class="item-bloc col-5 col-address">
+            <h2>{{ 'Address'|trans }}</h2>
 
+            {% if address is empty %}
+                <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+            {% else %}
                 {{ address|chill_entity_render_box({'multiline': true}) }}
+            {% endif %}
 
-                <ul class="list-inline text-right mt-2">
-                    <li class="list-inline-item">
-                        {# include vue_address component #}
-                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-                            targetEntity: { name: 'household', id: household.id },
-                            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                            mode: 'new',
-                            buttonSize: 'btn-sm',
-                            buttonText: 'Move household',
-                            modalTitle: 'Move household',
-                            buttonDisplayText: false,
-                        } %}
-                        {#
-                            openPanesInModal: false
-                        #}
-                    </li>
-                    <li class="list-inline-item">
-                        <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
-                           href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
-                            <i class="fa fa-list fa-fw"></i>
-                        </a>
-                    </li>
-                </ul>
-
-            </div>
+            <ul class="list-inline text-right mt-2">
+                <li class="list-inline-item">
+                    {# include vue_address component #}
+                    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                        targetEntity: { name: 'household', id: household.id },
+                        backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
+                        forceRedirect: true,
+                        mode: 'new',
+                        buttonSize: 'btn-sm',
+                        buttonText: 'Move household',
+                        modalTitle: 'Move household',
+                        buttonDisplayText: false,
+                    } %}
+                </li>
+                <li class="list-inline-item">
+                    <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
+                       href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
+                        <i class="fa fa-list fa-fw"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+        {% if address is not empty %}
             <div class="item-bloc col-7 col-comment">
                 {% if form is null %}
 
@@ -106,10 +103,9 @@
                     {{ form_end(form) }}
 
                 {% endif %}
-
             </div>
-        </div>
-    {% endif %}
+        {% endif %}
+    </div>
 
     <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>
 

From dee27ee01f5f78ec0661b657f049f1b5fbd851b3 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:09:39 +0200
Subject: [PATCH 178/217] Address: extend hideAddress option for twig cases

---
 .../Resources/public/vuejs/Address/index.js            | 10 ++++++++--
 .../views/Address/_insert_vue_address.html.twig        |  5 +++++
 .../Resources/views/Household/summary.html.twig        |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index c890737ba..04cbbd0d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -33,24 +33,30 @@ containers.forEach((container) => {
                             size: container.dataset.buttonSize || null,
                             displayText: container.dataset.buttonDisplayText !== 'false'  //boolean, default: true
                         },
+
                         /// Modal title text if create or edit address (trans chain, see i18n)
                         title: {
                             create: container.dataset.modalTitle || null,
                             edit: container.dataset.modalTitle || null
                         },
+
                         /// Display panes in Modal for step123
                         openPanesInModal: container.dataset.openPanesInModal !== 'false',  //boolean, default: true
+
                         /// Display actions buttons of panes in a sticky-form-button navbar
                         stickyActions: container.dataset.stickyActions === 'true',  //boolean, default: false
+
                         /// Use Date fields
                         useDate: {
                             validFrom: container.dataset.useValidFrom === 'true',  //boolean, default: false
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
                         },
+
                         /// Force redirection after last step (cfr. backUrl)
                         forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
-                        /// Don't display show renderbox Address
-                        //hideAddress: false         //boolean, default: false
+
+                        /// Don't display show renderbox Address: showPane display only a button
+                        hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 36482fe9c..68531dea1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -19,6 +19,7 @@
     * useValidFrom          bool (default: false)
     * useValidTo            bool (default: false)
     * forceRedirect         bool (default: false)
+    * hideAddress           bool (default: false)
 #}
 <div class="address-container"
 
@@ -72,6 +73,10 @@
     {% if forceRedirect is defined and forceRedirect == 1 %}
         data-force-redirect="true"
     {% endif %}
+
+    {% if hideAddress is defined and hideAddress == 1 %}
+        data-hide-address="true"
+    {% endif %}
 ></div>
 
 {{ encore_entry_script_tags('vue_address') }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 115f5a208..91cef1d15 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -33,6 +33,7 @@
                         targetEntity: { name: 'household', id: household.id },
                         backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
                         forceRedirect: true,
+                        hideAddress: true,
                         mode: 'new',
                         buttonSize: 'btn-sm',
                         buttonText: 'Move household',

From e336990b16a45d09fa00068c9006e58cd85a2aa2 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:10:17 +0200
Subject: [PATCH 179/217] comment console.log

---
 .../ChillMainBundle/Resources/public/vuejs/Address/App.vue    | 4 ++--
 .../Resources/public/vuejs/Address/components/AddAddress.vue  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 5136f830a..5370ff817 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -31,8 +31,8 @@ export default {
       }
    },
    mounted() {
-      console.log('AddAddress: data context', this.context);
-      console.log('AddAddress: data options', this.options);
+      //console.log('AddAddress: data context', this.context);
+      //console.log('AddAddress: data options', this.options);
    },
    methods: {
       displayErrors() {
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 dd9171cc2..ae3a0324f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -458,11 +458,9 @@ export default {
 
       getCountries() {
          this.flag.loading = true;
-         console.log('## GO');
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
-               console.log('## COMPLETE !');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()

From 7c2422743e6aea640bb44ae2bdcaa785efad4b11 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:22:12 +0200
Subject: [PATCH 180/217] Address: remove unused translations specific to
 household or person context

---
 .../vuejs/Address/components/ShowPane.vue     | 11 +---------
 .../Resources/public/vuejs/Address/i18n.js    |  9 --------
 .../public/vuejs/HouseholdAddress/js/i18n.js  | 21 -------------------
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 99b531d97..c5a9d0510 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -78,16 +78,7 @@ export default {
          return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create;
       },
       getSuccessText() {
-         switch (this.context.target.name) {
-            /*
-            case 'household':
-               return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
-            case 'person':
-               return (this.context.edit) ? 'person_address_edit_success' : 'person_address_creation_success';
-            */
-            default:
-               return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
-         }
+         return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
       },
       hideAddress() {
          return (typeof this.options.hideAddress !== 'undefined') ?
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index cc7a5ef79..2a2fc28ce 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -39,17 +39,8 @@ const addressMessages = {
         not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'",
         use_this_address: "Utiliser cette adresse",
 
-        // person specific
-        add_an_address_to_person: 'Ajouter l\'adresse à la personne',
-        person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
-        person_address_edit_success: 'L\'adresse de la personne a été mise à jour',
-
         // household specific
         move_date: 'Date du déménagement',
-        select_a_existing_address: 'Sélectionner une adresse existante',
-        add_an_address_to_household: 'Enregistrer',
-        household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
-        household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
 
     }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
deleted file mode 100644
index d62e9add9..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n'
-
-const appMessages = {
-   fr: {
-      select_a_existing_address: 'Sélectionner une adresse existante',
-      create_a_new_address: 'Créer une nouvelle adresse',
-      add_an_address_to_household: 'Enregistrer',
-      validFrom: 'Date du déménagement',
-      move_date: 'Date du déménagement',
-      back_to_the_list: 'Retour à la liste',
-      household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
-      household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
-      loading: 'chargement en cours...'
-   }
-};
-
-Object.assign(appMessages.fr, addressMessages.fr);
-
-export {
-   appMessages
-};

From d6f6f49090bcc8df2e0d0488bbdb08b6ecbc3734 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 13:04:51 +0200
Subject: [PATCH 181/217] address renderbox, improve how display address-more
 informations

---
 .../Resources/public/vuejs/Address/i18n.js     |  2 +-
 .../_components/Entity/AddressRenderBox.vue    |  2 +-
 .../Resources/views/Entity/address.html.twig   | 18 +++++++++---------
 .../translations/messages.fr.yml               |  9 +++++++++
 .../views/Household/summary.html.twig          |  2 +-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 2a2fc28ce..9f26430e1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -22,7 +22,7 @@ const addressMessages = {
         corridor: 'Couloir',
         steps: 'Escalier',
         flat: 'Appartement',
-        buildingName: 'Nom du bâtiment',
+        buildingName: 'Résidence',
         extra: 'Complément d\'adresse',
         distribution: 'Cedex',
         create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
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 997774190..ec925a6b7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -16,7 +16,7 @@
          </p>
       </component>
 
-      <div v-if="isMultiline === true">
+      <div v-if="isMultiline === true" class="address-more">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 4628e3cb5..b1bdb8438 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -34,25 +34,25 @@
 
 {% macro extended(address, options) %}
     {% if address.floor is not empty %}
-        <span class="floor">{{ address.floor }}</span>
+        <span class="floor">{{ 'address more.floor'|trans }} {{ address.floor }}</span>
     {% endif %}
     {% if address.corridor is not empty %}
-        <span class="corridor">{{ address.corridor }}</span>
+        <span class="corridor">{{ 'address more.corridor'|trans }} {{ address.corridor }}</span>
     {% endif %}
     {% if address.steps is not empty %}
-        <span class="steps">{{ address.steps }}</span>
+        <span class="steps">{{ 'address more.steps'|trans }} {{ address.steps }}</span>
     {% endif %}
     {% if address.buildingName is not empty %}
-        <span class="buildingName">{{ address.buildingName }}</span>
+        <span class="buildingName">{{ 'address more.buildingName'|trans }} {{ address.buildingName }}</span>
     {% endif %}
     {% if address.flat is not empty %}
-        <span class="flat">{{ address.flat }}</span>
-    {% endif %}
-    {% if address.distribution is not empty %}
-        <span class="distribution">{{ address.distribution }}</span>
+        <span class="flat">{{ 'address more.flat'|trans }} {{ address.flat }}</span>
     {% endif %}
     {% if address.extra is not empty %}
-        <span class="extra">{{ address.extra }}</span>
+        <span class="extra">{{ 'address more.extra'|trans }} {{ address.extra }}</span>
+    {% endif %}
+    {% if address.distribution is not empty %}
+        <span class="distribution">{{ 'address more.distribution'|trans }} {{ address.distribution }}</span>
     {% endif %}
 {% endmacro %}
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b230b6ac1..9ffff5bcb 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -74,6 +74,15 @@ address:
     address_homeless: L'adresse est-elle celle d'un domicile fixe ?
     real address: Adresse d'un domicile
     consider homeless: N'est pas l'adresse d'un domicile (SDF)
+address more:
+    floor: ét
+    corridor: coul
+    steps: esc
+    flat: appart
+    buildingName: résidence
+    extra: ''
+    distribution: cedex
+Create a new address: Créer une nouvelle adresse
 
 #serach
 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche.
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 91cef1d15..9feebaee8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -23,7 +23,7 @@
             {% if address is empty %}
                 <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
             {% else %}
-                {{ address|chill_entity_render_box({'multiline': true}) }}
+                {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }}
             {% endif %}
 
             <ul class="list-inline text-right mt-2">

From dbb9e6a663ccbdc0afc2b8521ee9a00ffa5549ed Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 13:05:48 +0200
Subject: [PATCH 182/217] Address: success message exception when redirection

---
 .../Resources/public/vuejs/Address/components/ShowPane.vue   | 5 +++++
 .../ChillMainBundle/Resources/public/vuejs/Address/i18n.js   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index c5a9d0510..25f8c95ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -9,6 +9,7 @@
    </div>
    <div v-if="flag.success" class="alert alert-success">
       {{ $t(getSuccessText) }}
+      <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
    </div>
 
    <div v-if="noAddressWithStickyActions" class="mt-5">
@@ -84,6 +85,10 @@ export default {
          return (typeof this.options.hideAddress !== 'undefined') ?
             this.options.hideAddress : this.defaultz.hideAddress;
       },
+      forceRedirect() {
+         return (typeof this.options.forceRedirect !== 'undefined') ?
+            this.options.forceRedirect : this.defaultz.forceRedirect;
+      },
       noAddressWithStickyActions() {
          return !this.context.edit && !this.address.id && this.options.stickyActions;
       }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 9f26430e1..9d7185696 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -34,8 +34,9 @@ const addressMessages = {
         back_to_the_list: 'Retour à la liste',
         loading: 'chargement en cours...',
         address_suggestions: "Suggestion d'adresses",
-        address_new_success: 'La nouvelle adresse est enregistrée',
-        address_edit_success: 'L\'adresse a été mise à jour',
+        address_new_success: 'La nouvelle adresse est enregistrée.',
+        address_edit_success: 'L\'adresse a été mise à jour.',
+        wait_redirection: " La page est redirigée.",
         not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'",
         use_this_address: "Utiliser cette adresse",
 

From dfc6ed9bf3870b6e0c66fbd81efb2a520b662e02 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 13:18:46 +0200
Subject: [PATCH 183/217] Address: remove forceRedirect option: backUrl option
 not null is considerated as forceRedirect true

---
 .../public/vuejs/Address/components/AddAddress.vue        | 8 +++++---
 .../public/vuejs/Address/components/ShowPane.vue          | 3 +--
 .../Resources/public/vuejs/Address/index.js               | 3 ---
 .../Resources/views/Address/_insert_vue_address.html.twig | 5 -----
 .../Resources/views/Address/edit.html.twig                | 4 +++-
 .../Resources/views/Address/new.html.twig                 | 2 +-
 .../Resources/views/Household/address_edit.html.twig      | 6 ++----
 .../Resources/views/Household/address_move.html.twig      | 5 +----
 .../Resources/views/Household/addresses.html.twig         | 5 +----
 .../Resources/views/Household/summary.html.twig           | 1 -
 10 files changed, 14 insertions(+), 28 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 ae3a0324f..ad11fc02f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -252,7 +252,6 @@ export default {
                validFrom: false,
                validTo: false
             },
-            forceRedirect: false,
             hideAddress: false
          },
          entity: {
@@ -324,6 +323,9 @@ export default {
       bypassFirstStep() {
          // exception: passing step0 if new address and pane are not in modal
          return !this.context.edit && !this.inModal;
+      },
+      forceRedirect() {
+         return this.context.backUrl !== null;
       }
    },
    mounted() {
@@ -396,7 +398,7 @@ export default {
             this.openDatePane();
          } else {
             this.applyChanges();
-            if (!this.options.forceRedirect) {
+            if (!this.forceRedirect) {
                this.openShowPane();
             }
          }
@@ -425,7 +427,7 @@ export default {
       */
       afterLastPaneAction(params) {
          this.initForm();
-         if (this.options.forceRedirect === true) {
+         if (this.forceRedirect) {
             console.log("redirect to backUrl");
             window.location.assign(this.context.backUrl);
          } else {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 25f8c95ec..96628766c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -86,8 +86,7 @@ export default {
             this.options.hideAddress : this.defaultz.hideAddress;
       },
       forceRedirect() {
-         return (typeof this.options.forceRedirect !== 'undefined') ?
-            this.options.forceRedirect : this.defaultz.forceRedirect;
+         return this.context.backUrl !== null;
       },
       noAddressWithStickyActions() {
          return !this.context.edit && !this.address.id && this.options.stickyActions;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 04cbbd0d3..f0a308b7b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -52,9 +52,6 @@ containers.forEach((container) => {
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
                         },
 
-                        /// Force redirection after last step (cfr. backUrl)
-                        forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
-
                         /// Don't display show renderbox Address: showPane display only a button
                         hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
                     }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index 68531dea1..f4f63c4eb 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -18,7 +18,6 @@
     * stickyActions         bool (default: false)
     * useValidFrom          bool (default: false)
     * useValidTo            bool (default: false)
-    * forceRedirect         bool (default: false)
     * hideAddress           bool (default: false)
 #}
 <div class="address-container"
@@ -70,10 +69,6 @@
         data-use-valid-to="true"
     {% endif %}
 
-    {% if forceRedirect is defined and forceRedirect == 1 %}
-        data-force-redirect="true"
-    {% endif %}
-
     {% if hideAddress is defined and hideAddress == 1 %}
         data-hide-address="true"
     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index dd7679cc2..e2e9167b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -29,9 +29,11 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
         } %}
+        {#
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+        #}
 
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 14ddace0a..da2bfe474 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -29,10 +29,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             stickyActions: true,
         } %}
         {#
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
             useValidFrom: true,
         #}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index e9c41bf45..c909e62d3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -9,12 +9,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            stickyActions: true
-        } %}
-        {#
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            stickyActions: true,
             openPanesInModal: false,
-        #}
+        } %}
     </div>
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 50346672b..2015a8599 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,12 +10,9 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            forceRedirect: true,
+            openPanesInModal: false,
             stickyActions: true,
         } %}
-        {#
-            openPanesInModal: false,
-        #}
     </div>
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 717f31e77..94a79db2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -18,14 +18,13 @@
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
                     backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                    forceRedirect: true,
                     mode: 'new',
-                    useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
                 } %}
                 {#
+                    useValidFrom: true,
                 #}
 
             </li>
@@ -68,8 +67,6 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-
-                        {# include vue_address component #}
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 9feebaee8..ceb835d2e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -32,7 +32,6 @@
                     {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                         targetEntity: { name: 'household', id: household.id },
                         backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
-                        forceRedirect: true,
                         hideAddress: true,
                         mode: 'new',
                         buttonSize: 'btn-sm',

From 019a66c9159b72e582bca06873ffc6c6f004a789 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 13:19:56 +0200
Subject: [PATCH 184/217] tp: Address, twig options: check to remove
 forceRedirect, and disable backUrl

---
 .../Resources/views/ThirdParty/new.html.twig                 | 5 +++--
 .../Resources/views/ThirdParty/update.html.twig              | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 8b7a38fea..002cc87e8 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -40,16 +40,17 @@
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_new'),
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                         } %}
+                        {#
+                            backUrl: path('chill_3party_3party_new'),
+                        #}
                     {% else %}
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_new'),
                             mode: 'new',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index e13fca14a..01837db05 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -57,16 +57,17 @@
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'edit',
                             addressId: thirdParty.address.id,
                             buttonSize: 'btn-sm',
                         } %}
+                        {#
+                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
+                        #}
                     {% else %}
                         {# include vue_address component #}
                         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                             targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                            backUrl: path('chill_3party_3party_update', { thirdparty_id: thirdParty.id }),
                             mode: 'new',
                             buttonSize: 'btn-sm',
                             buttonText: 'Create a new address',

From f8d5dcf9373fd17de9e0c6b1afe2105d9414a5d8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 15:15:00 +0200
Subject: [PATCH 185/217] AddAddress: improve loading transition between
 step0/step1 and step2

---
 .../vuejs/Address/components/AddAddress.vue      | 16 ++++++++--------
 .../public/vuejs/Address/components/DatePane.vue |  2 +-
 .../public/vuejs/Address/components/EditPane.vue |  2 +-
 .../vuejs/Address/components/SuggestPane.vue     |  2 +-
 4 files changed, 11 insertions(+), 11 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 ad11fc02f..d3fe43f87 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -380,15 +380,8 @@ export default {
             console.log('displaySuggestions');
             this.openSuggestPane();
          } else {
-            if (this.flag.suggestPane === true) {
-               this.closeSuggestPane();
-            }
-            if (this.flag.showPane === true) {
-               this.closeShowPane();
-            }
-            console.log('step2: open the Edit panel');
             this.initForm();
-            this.getCountries(); // will open edit pane when resolve promise
+            this.getCountries(); // will open editPane when resolve promise
          }
       },
       closeEditPane() {
@@ -463,6 +456,13 @@ export default {
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
+               if (this.flag.suggestPane === true) {
+                  this.closeSuggestPane();
+               }
+               if (this.flag.showPane === true) {
+                  this.closeShowPane();
+               }
+               console.log('step2: open the Edit panel');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 7a270eafa..7997fbbfa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -1,4 +1,4 @@
-<template>step3
+<template>
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
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 61e0f4f8d..9e257fe4a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -1,4 +1,4 @@
-<template>step2
+<template>
    <div class="address-form">
 
       <!-- Not display in modal -->
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index 6e0956d3b..fa1a08530 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -1,4 +1,4 @@
-<template>step1
+<template>
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>

From 47d0043462e1d41c844d41750f068be684419cec Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 16:28:35 +0200
Subject: [PATCH 186/217] disable suggestPane step

---
 .../Resources/public/vuejs/Address/components/AddAddress.vue  | 2 +-
 .../Resources/public/vuejs/Address/components/DatePane.vue    | 4 ----
 2 files changed, 1 insertion(+), 5 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 d3fe43f87..3d7fd20e5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -306,7 +306,7 @@ export default {
       hasSuggestions() {
          // TODO
          //return addressSuggestions.length > 0
-         return true;
+         return false;
       },
       displaySuggestions() {
          return !this.context.edit && this.hasSuggestions;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 7997fbbfa..87cb65549 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -106,7 +106,3 @@ export default {
    }
 }
 </script>
-
-<style scoped>
-
-</style>

From 4768785bb540acd75446928264619969f05b0828 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 18:40:40 +0200
Subject: [PATCH 187/217] Address: improve forceRedirect condition, if backUrl
 is null or undefined

---
 .../Resources/public/vuejs/Address/components/AddAddress.vue    | 2 +-
 .../Resources/public/vuejs/Address/components/ShowPane.vue      | 2 +-
 2 files changed, 2 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 3d7fd20e5..c0cfa603a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -325,7 +325,7 @@ export default {
          return !this.context.edit && !this.inModal;
       },
       forceRedirect() {
-         return this.context.backUrl !== null;
+         return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
       }
    },
    mounted() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 96628766c..1329b9cb7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -86,7 +86,7 @@ export default {
             this.options.hideAddress : this.defaultz.hideAddress;
       },
       forceRedirect() {
-         return this.context.backUrl !== null;
+         return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
       },
       noAddressWithStickyActions() {
          return !this.context.edit && !this.address.id && this.options.stickyActions;

From d52ab2188c0cf54b7f7ade37413c64fd8b1710f0 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 18:48:15 +0200
Subject: [PATCH 188/217] Address: fix callback function when called by another
 component (CourseLocation and HouseholdMembersEditor)

---
 .../AccompanyingCourse/components/CourseLocation.vue   | 10 +++++-----
 .../HouseholdMembersEditor/components/Household.vue    |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 713f06ddb..a0f3c58e1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -42,7 +42,7 @@
                   :key="addAddress.type"
                   :options="addAddress.options"
                   :result="addAddress.result"
-                  :addressChanged="submitTemporaryAddress"
+                  :addressChangedCallback="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
             </li>
@@ -146,7 +146,7 @@ export default {
          return this.$refs.addAddress.errorMsg;
       },
       submitTemporaryAddress(payload) {
-        //console.log('@@@ click on Submit Temporary Address Button');
+         console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
          this.$store.commit('setEditContextTrue');
@@ -155,9 +155,9 @@ export default {
    mounted() {
       this.initAddressContext();
 
-     //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
-     //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
-     //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+      console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+      console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+      console.log('ac.personLocation', this.accompanyingCourse.personLocation);
    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 8a2ef0f41..bdbacf2bd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -75,7 +75,7 @@
               :key="addAddress.key"
               :options="addAddress.options"
               :result="addAddress.result"
-              @submitAddress="setHouseholdCreatedAddress"
+              @addressChangedCallback="setHouseholdCreatedAddress"
               ref="addAddress">
           </add-address>
         </li>
@@ -282,8 +282,7 @@ export default {
       console.log('setHouseholdAddress', a);
       this.$store.commit('setHouseholdAddress', a);
     },
-    setHouseholdCreatedAddress() {
-      let payload = this.$refs.addAddress.submitNewAddress();
+    setHouseholdCreatedAddress(payload) {
       console.log('setHouseholdAddress', payload);
       this.$store.dispatch('setHouseholdNewAddress', payload);
     },

From 0ed2dc8b13bdb208dd111b0fda7c83a1f1a384d9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 19:25:37 +0200
Subject: [PATCH 189/217] Address: courseLocation, update addressId when commit
 context in store

---
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue | 2 +-
 .../public/vuejs/AccompanyingCourse/store/index.js         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index a0f3c58e1..3bd4f313e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -149,7 +149,7 @@ export default {
          console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
-         this.$store.commit('setEditContextTrue');
+         this.$store.commit('setEditContextTrue', payload);
       }
    },
    mounted() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 72eb57cdf..16a412fdf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -134,9 +134,10 @@ let initPromise = getAccompanyingCourse(id)
                state.accompanyingCourse.locationStatus = r.locationStatus;
                state.accompanyingCourse.personLocation = r.personLocation;
             },
-            setEditContextTrue(state) {
-              //console.log('### mutation: set edit context = true');
+            setEditContextTrue(state, payload) {
+               console.log('### mutation: set edit context true with addressId', payload.addressId);
                state.addressContext.edit = true;
+               state.addressContext.addressId = payload.addressId;
             }
          },
          actions: {
@@ -260,7 +261,7 @@ let initPromise = getAccompanyingCourse(id)
                })).catch((error) => { commit('catchError', error) });
             },
             updateLocation({ commit }, payload) {
-              //console.log('## action: updateLocation', payload.locationStatusTo);
+               console.log('## action: updateLocation', payload.locationStatusTo);
                let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)

From f7ec87e0125affdcfa391f3ff7fe9e218fded812 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 19:26:33 +0200
Subject: [PATCH 190/217] Address: hideAddress option mask too loading and
 alerts

---
 .../vuejs/Address/components/ShowPane.vue     | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 1329b9cb7..405ba0cc7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -1,24 +1,28 @@
 <template>
 
-   <div class="loading">
-      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
-      <span class="sr-only">{{ $t('loading') }}</span>
-   </div>
-   <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-      {{ errorMsg }}
-   </div>
-   <div v-if="flag.success" class="alert alert-success">
-      {{ $t(getSuccessText) }}
-      <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
-   </div>
+   <div v-if="!hideAddress">
+      <div class="loading">
+         <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
+         <span class="sr-only">{{ $t('loading') }}</span>
+      </div>
 
-   <div v-if="noAddressWithStickyActions" class="mt-5">
-      <p class="chill-no-data-statement">
-         {{ $t('not_yet_address') }}
-      </p>
-   </div>
+      <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+         {{ errorMsg }}
+      </div>
 
-   <address-render-box v-if="!hideAddress" :address="address"></address-render-box>
+      <div v-if="flag.success" class="alert alert-success">
+         {{ $t(getSuccessText) }}
+         <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
+      </div>
+
+      <div v-if="noAddressWithStickyActions" class="mt-5">
+         <p class="chill-no-data-statement">
+            {{ $t('not_yet_address') }}
+         </p>
+      </div>
+
+      <address-render-box :address="address"></address-render-box>
+   </div>
 
    <action-buttons
       :options="this.options"

From 5d99e261e1f8f2a48d31eeb1cc2beec4e6d8bcc1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 19:41:17 +0200
Subject: [PATCH 191/217] CourseLocation: load initAddressContext() earlier
 allow AddAddress to getInitialAddress() (fix)

---
 .../Resources/public/vuejs/Address/components/AddAddress.vue    | 2 +-
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue      | 2 +-
 2 files changed, 2 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 c0cfa603a..4f8e53b7f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -339,7 +339,7 @@ export default {
 
       console.log('Mounted now !');
       if (this.context.edit) {
-         console.log('getInitialAddress');
+         console.log('getInitialAddress'); // !!!
          this.getInitialAddress(this.context.addressId);
       }
       this.openShowPane();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 3bd4f313e..7fbf37997 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -152,7 +152,7 @@ export default {
          this.$store.commit('setEditContextTrue', payload);
       }
    },
-   mounted() {
+   created() {
       this.initAddressContext();
 
       console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);

From 4630e2b80c2535b2c00e76c91d608e4b72762681 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 19:43:57 +0200
Subject: [PATCH 192/217] remove unused and comment console log

---
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue    | 3 +--
 .../Resources/public/vuejs/AccompanyingCourse/store/index.js  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 7fbf37997..ccb02346d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -41,7 +41,6 @@
                   :context="context"
                   :key="addAddress.type"
                   :options="addAddress.options"
-                  :result="addAddress.result"
                   :addressChangedCallback="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
@@ -146,7 +145,7 @@ export default {
          return this.$refs.addAddress.errorMsg;
       },
       submitTemporaryAddress(payload) {
-         console.log('@@@ click on Submit Temporary Address Button', payload);
+         //console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
          this.$store.commit('setEditContextTrue', payload);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 16a412fdf..c884dd810 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -135,7 +135,7 @@ let initPromise = getAccompanyingCourse(id)
                state.accompanyingCourse.personLocation = r.personLocation;
             },
             setEditContextTrue(state, payload) {
-               console.log('### mutation: set edit context true with addressId', payload.addressId);
+               //console.log('### mutation: set edit context true with addressId', payload.addressId);
                state.addressContext.edit = true;
                state.addressContext.addressId = payload.addressId;
             }
@@ -261,7 +261,7 @@ let initPromise = getAccompanyingCourse(id)
                })).catch((error) => { commit('catchError', error) });
             },
             updateLocation({ commit }, payload) {
-               console.log('## action: updateLocation', payload.locationStatusTo);
+               //console.log('## action: updateLocation', payload.locationStatusTo);
                let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)

From 98f1f19e9accdc7d8adc8a58cee9ee46e3f7b2ef Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 20:23:55 +0200
Subject: [PATCH 193/217] courseLocation: commit context addressId change when
 remove PersonLocation (fix bad address in editPane)

---
 .../public/vuejs/Address/components/AddAddress.vue        | 2 +-
 .../AccompanyingCourse/components/CourseLocation.vue      | 2 +-
 .../public/vuejs/AccompanyingCourse/store/index.js        | 8 ++++++--
 3 files changed, 8 insertions(+), 4 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 4f8e53b7f..a37cd4ee3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -339,7 +339,7 @@ export default {
 
       console.log('Mounted now !');
       if (this.context.edit) {
-         console.log('getInitialAddress'); // !!!
+         console.log('getInitialAddress', this.context.addressId);
          this.getInitialAddress(this.context.addressId);
       }
       this.openShowPane();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index ccb02346d..cf1218eae 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -133,12 +133,12 @@ export default {
          this.$store.commit('setAddressContext', context);
       },
       removeAddress() {
-        //console.log('remove address');
          let payload = {
             target: this.context.target.name,
             targetId: this.context.target.id,
             locationStatusTo: 'none'
          };
+         //console.log('remove address');
          this.$store.dispatch('updateLocation', payload);
       },
       displayErrors() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index c884dd810..6f4d5334b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -129,9 +129,13 @@ let initPromise = getAccompanyingCourse(id)
                state.addressContext = context;
             },
             updateLocation(state, r) {
-              //console.log('### mutation: set location attributes', r);
-               state.accompanyingCourse.location = r.location;
+               //console.log('### mutation: set location attributes', r);
                state.accompanyingCourse.locationStatus = r.locationStatus;
+               if (r.locationStatus !== 'person') {
+                  state.addressContext.addressId = r.location.address_id;
+                  //console.log('mutation: update context addressId', state.addressContext.addressId);
+               }
+               state.accompanyingCourse.location = r.location;
                state.accompanyingCourse.personLocation = r.personLocation;
             },
             setEditContextTrue(state, payload) {

From ca86eb3c56d2de1119cba5f4f2d5c1d4046b28b4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 20:31:37 +0200
Subject: [PATCH 194/217] disable datePane with courseLocation

---
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index cf1218eae..b39ef943f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -90,9 +90,9 @@ export default {
                /// Display each step in page or Modal
                openPanesInModal: true,
                // Use Date fields
-               useDate: {
-                  validFrom: true
-               },
+               //useDate: {
+               //   validFrom: true
+               //},
                hideAddress: true
             }
          }

From 3ee0f4bf20e9651f7dd50aecd91abbc2abf078d6 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 16:35:43 +0200
Subject: [PATCH 195/217] datePane, back to previous editPane

---
 .../public/vuejs/Address/components/AddAddress.vue    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 a37cd4ee3..5a2cfc422 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -380,7 +380,9 @@ export default {
             console.log('displaySuggestions');
             this.openSuggestPane();
          } else {
-            this.initForm();
+            if (this.flag.datePane === false) {
+               this.initForm(); // reset form except if we come back from datePane
+            }
             this.getCountries(); // will open editPane when resolve promise
          }
       },
@@ -456,11 +458,14 @@ export default {
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
+               if (this.flag.showPane === true) {
+                  this.closeShowPane();
+               }
                if (this.flag.suggestPane === true) {
                   this.closeSuggestPane();
                }
-               if (this.flag.showPane === true) {
-                  this.closeShowPane();
+               if (this.flag.datePane === true) {
+                  this.flag.datePane = false;
                }
                console.log('step2: open the Edit panel');
                this.flag.editPane = true;

From d99461298780c50357651199ff5784042f287e65 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 16:37:45 +0200
Subject: [PATCH 196/217] change buttons apparence for datePane back to
 editPane

---
 .../vuejs/Address/components/AddAddress.vue   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 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 5a2cfc422..963101472 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -101,10 +101,8 @@
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-cancel change-icon" @click="resetPane">
-               {{ $t('action.cancel') }}
-            </button>
-            <button v-if="useDatePane" class="btn btn-misc" @click="closeEditPane">
+            <!--<button class="btn btn-cancel change-icon" @click="resetPane">{{ $t('action.cancel') }}</button>-->
+            <button v-if="useDatePane" class="btn btn-update change-icon" @click="closeEditPane">
                {{ $t('nav.next')}}
                <i class="fa fa-fw fa-arrow-right"></i>
             </button>
@@ -133,7 +131,7 @@
          </template>
          <template v-slot:action>
             <li v-if="useDatePane">
-               <button class="btn btn-misc" @click="closeEditPane">
+               <button class="btn btn-update change-icon" @click="closeEditPane">
                   {{ $t('nav.next')}}
                   <i class="fa fa-fw fa-arrow-right"></i>
                </button>
@@ -175,14 +173,14 @@
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-update" @click="openEditPane">
-               {{ $t('action.edit')}}
+            <button class="btn btn-misc" @click="openEditPane">
+               <i class="fa fa-fw fa-arrow-left"></i>
+               {{ $t('nav.previous')}}
             </button>
-            <!--
-            <button class="btn btn-save">
+            <button class="btn btn-save" @click="closeDatePane">
                {{ $t('action.save')}}
             </button>
-            -->
+            <!-- -->
          </template>
 
       </modal>
@@ -197,10 +195,16 @@
          v-bind:insideModal="false"
          ref="dateAddress">
 
+         <template v-slot:before>
+            <button class="btn btn-misc" @click="openEditPane">
+               <i class="fa fa-fw fa-arrow-left"></i>
+               {{ $t('nav.previous')}}
+            </button>
+         </template>
          <template v-slot:action>
             <li>
-               <button class="btn btn-update" @click="closeDatePane">
-                  {{ $t('action.edit')}}
+               <button class="btn btn-save" @click="closeDatePane">
+                  {{ $t('action.save')}}
                </button>
             </li>
          </template>

From a8024ba38f9906cc1659972b583e08dedd614c04 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 17:20:31 +0200
Subject: [PATCH 197/217] Address datePane: validTo date display and format

---
 .../vuejs/Address/components/AddAddress.vue   |  4 +-
 .../vuejs/Address/components/DatePane.vue     | 42 ++++++++++---------
 .../Resources/views/Address/new.html.twig     |  2 +-
 3 files changed, 26 insertions(+), 22 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 963101472..71c33ef84 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -280,7 +280,7 @@ export default {
                },
                valid: {
                   from: new Date(),
-                  to:  new Date()
+                  to:  null
                }
             },
             addressMap: {
@@ -609,8 +609,10 @@ export default {
             if (this.context.target.name === 'person') { // !!! maintain here ?
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
+            console.log('juste before post new postcode', postcodeBody);
             return postPostalCode(postcodeBody)
                .then(postalCode =>  {
+                  console.log('new postcode created', postalCode.id);
                   payload.postcode = {'id': postalCode.id };
                   return this.postNewAddress(payload);
                });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 87cb65549..d86144358 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -11,27 +11,29 @@
 
    <address-render-box :address="address"></address-render-box>
 
-   <div v-if="showDateFrom" class='address-valid date-since'>
-      <h3>{{ $t(getValidFromDateText) }}</h3>
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validFrom"
-                v-bind:placeholder="$t(getValidFromDateText)"
-                v-model="validFrom"
-                aria-describedby="validFrom"
-         />
+   <div class="row">
+      <div v-if="showDateFrom" class='col-lg-6 address-valid date-since'>
+         <h3>{{ $t(getValidFromDateText) }}</h3>
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+            <input type="date" class="form-control form-control-lg" name="validFrom"
+                   v-bind:placeholder="$t(getValidFromDateText)"
+                   v-model="validFrom"
+                   aria-describedby="validFrom"
+            />
+         </div>
       </div>
-   </div>
 
-   <div v-if="showDateTo" class='address-valid date-until'>
-      <h3>{{ $t(getValidToDateText) }}</h3>
-      <div class="input-group mb-3">
-         <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
-         <input type="date" class="form-control form-control-lg" name="validTo"
-                v-bind:placeholder="$t(getValidToDateText)"
-                v-model="validTo"
-                aria-describedby="validTo"
-         />
+      <div v-if="showDateTo" class='col-lg-6 address-valid date-until'>
+         <h3>{{ $t(getValidToDateText) }}</h3>
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="validTo"><i class="fa fa-fw fa-calendar"></i></span>
+            <input type="date" class="form-control form-control-lg" name="validTo"
+                   v-bind:placeholder="$t(getValidToDateText)"
+                   v-model="validTo"
+                   aria-describedby="validTo"
+            />
+         </div>
       </div>
    </div>
 
@@ -88,7 +90,7 @@ export default {
             this.entity.selected.valid.to = ISOToDate(value);
          },
          get() {
-            return dateToISO(this.entity.selected.valid.from);
+            return dateToISO(this.entity.selected.valid.to);
          }
       },
       getValidFromDateText() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index da2bfe474..5f75a103a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,11 +30,11 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             stickyActions: true,
+            useValidFrom: true, useValidTo: true,
         } %}
         {#
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
-            useValidFrom: true,
         #}
 
     {% endblock %}

From e7676c5c2ea6cd5e39e22c4fab8e953ac0f1fdd7 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 17:21:22 +0200
Subject: [PATCH 198/217] display address renderbox on datePane (wip)

---
 .../Resources/public/vuejs/Address/components/DatePane.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index d86144358..b14ac6ce8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -9,7 +9,7 @@
       {{ errorMsg }}
    </div>
 
-   <address-render-box :address="address"></address-render-box>
+   <address-render-box :address="entity.selected.address"></address-render-box>
 
    <div class="row">
       <div v-if="showDateFrom" class='col-lg-6 address-valid date-since'>

From 1c568a75ecae4226e3bda67e1b45f2f55ce551ee Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 11:04:25 +0200
Subject: [PATCH 199/217] Address: pass useDatePane option in showPane
 addressRenderBox, display dates in showPane

---
 .../vuejs/Address/components/AddAddress.vue     |  6 +-----
 .../vuejs/Address/components/ShowPane.vue       |  5 +++--
 .../_components/Entity/AddressRenderBox.vue     | 17 +++++++++++++++++
 .../Serializer/Normalizer/AddressNormalizer.php |  3 +++
 .../Resources/views/Address/new.html.twig       |  3 ++-
 5 files changed, 26 insertions(+), 8 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 71c33ef84..272a17bd9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -7,6 +7,7 @@
       v-bind:defaultz="this.defaultz"
       v-bind:entity="this.entity"
       v-bind:flag="this.flag"
+      v-bind:useDatePane="this.useDatePane"
       @openEditPane="openEditPane"
       ref="showAddress">
    </show-pane>
@@ -334,11 +335,6 @@ export default {
    },
    mounted() {
 
-      //console.log('options displayText', this.options.button.displayText);
-      //console.log('options bindModal.step1', this.options.bindModal.step1);
-      //console.log('options bindModal.step2', this.options.bindModal.step2);
-      //console.log('options useDate.validFrom', this.options.useDate.validFrom);
-      //console.log('options useDate.validTo', this.options.useDate.validTo);
       console.log('useDatePane', this.useDatePane);
 
       console.log('Mounted now !');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 405ba0cc7..a4e5c571d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -21,7 +21,7 @@
          </p>
       </div>
 
-      <address-render-box :address="address"></address-render-box>
+      <address-render-box :address="address" :useDatePane="useDatePane"></address-render-box>
    </div>
 
    <action-buttons
@@ -56,7 +56,8 @@ export default {
       'defaultz',
       'flag',
       'entity',
-      'errorMsg'
+      'errorMsg',
+      'useDatePane'
    ],
    emits: ['openEditPane'],
    computed: {
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 ec925a6b7..475558d0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -54,6 +54,19 @@
          </div>
       </div>
 
+      <div v-if="useDatePane === true" class="address-more">
+         <div v-if="address.validFrom">
+            <span class="validFrom">
+               <b>{{ $t('validFrom') }}</b>: {{ $d(address.validFrom.date) }}
+            </span>
+         </div>
+         <div v-if="address.validTo">
+            <span class="validTo">
+               <b>{{ $t('validTo') }}</b>: {{ $d(address.validTo.date) }}
+            </span>
+         </div>
+      </div>
+
    </component>
 </template>
 
@@ -67,6 +80,10 @@ export default {
       isMultiline: {
          default: true,
          type: Boolean
+      },
+      useDatePane: {
+         default: false,
+         type: Boolean
       }
    },
    computed: {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 9e3b5c11b..2b39c07c3 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -13,6 +13,7 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
 
     public function normalize($address, string $format = null, array $context = [])
     {
+        /** @var Address $address */
         $data['address_id'] = $address->getId();
         $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
         $data['street'] = $address->getStreet();
@@ -30,6 +31,8 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
         $data['buildingName'] = $address->getBuildingName();
         $data['distribution'] = $address->getDistribution();
         $data['extra'] = $address->getExtra();
+        $data['validFrom'] = $address->getValidFrom();
+        $data['validTo'] = $address->getValidTo();
 
         return $data;
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 5f75a103a..c88959340 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -30,9 +30,10 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             stickyActions: true,
-            useValidFrom: true, useValidTo: true,
+            useValidFrom: true,
         } %}
         {#
+            useValidTo: true,
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
         #}

From 0808f5a6f3a1d6d2a6638824d98a085ae2e1045f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 11:44:22 +0200
Subject: [PATCH 200/217] Address datePane: convert selectedAddress to pass and
 view it with addressRenderBox

---
 .../public/chill/scss/render_box.scss         |  3 ++
 .../vuejs/Address/components/DatePane.vue     | 31 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index 31d2c8d09..6100bc842 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -98,6 +98,9 @@ section.chill-entity {
             &.date-since {}
             &.date-until {}
         }
+        .address-more {
+            margin-bottom: 1em;
+        }
     }
 
     // used for comment-embeddable
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index b14ac6ce8..69e4ccea6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -9,7 +9,7 @@
       {{ errorMsg }}
    </div>
 
-   <address-render-box :address="entity.selected.address"></address-render-box>
+   <address-render-box :address="selectedAddress"></address-render-box>
 
    <div class="row">
       <div v-if="showDateFrom" class='col-lg-6 address-valid date-since'>
@@ -104,6 +104,35 @@ export default {
       },
       showDateTo() {
          return !this.context.edit && this.options.useDate.validTo;
+      },
+      selectedAddress() {
+         let address = {};
+
+         address['country'] = (this.entity.selected.country) ? this.entity.selected.country : null;
+         address['postcode'] = (this.entity.selected.postcode) ? this.entity.selected.postcode : null;
+
+         if (this.entity.selected.address) {
+            let number = (this.entity.selected.address.streetNumber) ? this.entity.selected.address.streetNumber : null;
+            let street = (this.entity.selected.address.street) ? this.entity.selected.address.street : null;
+            address['text'] = number + ', ' + street;
+
+            address['street'] = (this.entity.selected.address.street) ? this.entity.selected.address.street : null;
+            address['streetNumber'] = (this.entity.selected.address.streetNumber) ? this.entity.selected.address.streetNumber : null;
+            address['floor'] = (this.entity.selected.address.floor) ? this.entity.selected.address.floor : null;
+            address['corridor'] = (this.entity.selected.address.corridor) ? this.entity.selected.address.corridor : null;
+            address['steps'] = (this.entity.selected.address.steps) ? this.entity.selected.address.steps : null;
+            address['flat'] = (this.entity.selected.address.flat) ? this.entity.selected.address.flat : null;
+            address['buildingName'] = (this.entity.selected.address.buildingName) ? this.entity.selected.address.buildingName : null;
+            address['distribution'] = (this.entity.selected.address.distribution) ? this.entity.selected.address.distribution : null;
+            address['extra'] = (this.entity.selected.address.extra) ? this.entity.selected.address.extra : null;
+         }
+
+         if (this.entity.selected.valid) {
+            address['validFrom'] = (this.entity.selected.valid.from) ? dateToISO(this.entity.selected.valid.from) : null;
+            address['validTo'] = (this.entity.selected.valid.to) ? dateToISO(this.entity.selected.valid.to) : null;
+         }
+
+         return address;
       }
    }
 }

From efd9380d13057b8981b2c7fba069be3d0a01fd38 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 12:32:05 +0200
Subject: [PATCH 201/217] Address use next/previous button if datePane and if
 context new

---
 .../Resources/public/vuejs/Address/components/AddAddress.vue  | 4 ++--
 1 file changed, 2 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 272a17bd9..80668270f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -103,7 +103,7 @@
 
          <template v-slot:footer>
             <!--<button class="btn btn-cancel change-icon" @click="resetPane">{{ $t('action.cancel') }}</button>-->
-            <button v-if="useDatePane" class="btn btn-update change-icon" @click="closeEditPane">
+            <button v-if="!this.context.edit && this.useDatePane" class="btn btn-update change-icon" @click="closeEditPane">
                {{ $t('nav.next')}}
                <i class="fa fa-fw fa-arrow-right"></i>
             </button>
@@ -131,7 +131,7 @@
             </a>
          </template>
          <template v-slot:action>
-            <li v-if="useDatePane">
+            <li v-if="!this.context.edit && this.useDatePane">
                <button class="btn btn-update change-icon" @click="closeEditPane">
                   {{ $t('nav.next')}}
                   <i class="fa fa-fw fa-arrow-right"></i>

From 27674985bd3aee6b9c753a76a5c7ee163dcc3043 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 17 Sep 2021 16:29:55 +0200
Subject: [PATCH 202/217] rdv: add pagination in calendar item list + refactor
 list views

---
 .../Controller/CalendarController.php         |  45 ++++--
 .../Repository/CalendarRepository.php         |   6 +
 .../Resources/views/Calendar/list.html.twig   | 135 ------------------
 .../listByAccompanyingCourse.html.twig        | 121 +++++++++++++++-
 .../views/Calendar/listByUser.html.twig       |   5 +-
 5 files changed, 161 insertions(+), 151 deletions(-)
 delete mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index fff20940a..e7226b1bd 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -36,7 +36,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -55,16 +57,24 @@ class CalendarController extends AbstractController
 
     protected SerializerInterface $serializer;
 
+    protected PaginatorFactory $paginator;
+
+    private CalendarRepository $calendarRepository;
+
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        PaginatorFactory $paginator,
+        CalendarRepository $calendarRepository
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
         $this->serializer = $serializer;
+        $this->paginator = $paginator;
+        $this->calendarRepository = $calendarRepository;
     }
 
     /**
@@ -73,31 +83,40 @@ class CalendarController extends AbstractController
      */
     public function listAction(Request $request): Response
     {
-        $em = $this->getDoctrine()->getManager();
         $view = null;
 
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($user instanceof User) {
 
-            $calendarItems = $em->getRepository(Calendar::class)
-                ->findByUser($user)
-                ;
+            $calendarItems = $this->calendarRepository->findByUser($user);
+
             $view = '@ChillCalendar/Calendar/listByUser.html.twig';
+
+            return $this->render($view, [
+                'calendarItems' => $calendarItems,
+                'user' => $user
+            ]);
+
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $calendarItems = $em->getRepository(Calendar::class)->findBy(
+
+            $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
+            $paginator = $this->paginator->create($total);
+            $calendarItems = $this->calendarRepository->findBy(
                 ['accompanyingPeriod' => $accompanyingPeriod],
-                ['startDate' => 'DESC']
+                ['startDate' => 'DESC'],
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
             );
 
             $view = '@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig';
-        }
 
-        return $this->render($view, [
-            'calendarItems' => $calendarItems,
-            'user' => $user,
-            'accompanyingCourse' => $accompanyingPeriod,
-        ]);
+            return $this->render($view, [
+                'calendarItems' => $calendarItems,
+                'accompanyingCourse' => $accompanyingPeriod,
+                'paginator' => $paginator
+            ]);
+        }
     }
 
     /**
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index edb51bb35..b87f4f525 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -3,7 +3,9 @@
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -14,9 +16,13 @@ use Doctrine\Persistence\ManagerRegistry;
  */
 class CalendarRepository extends ServiceEntityRepository
 {
+
+    // private EntityRepository $repository;
+
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Calendar::class);
+       // $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 
     // /**
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
deleted file mode 100644
index 44295e192..000000000
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ /dev/null
@@ -1,135 +0,0 @@
-{% set user_id = null %}
-{% if user %}
-    {% set user_id = user.id %}
-{% endif %}
-
-{% set accompanying_course_id = null %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
-
-{% if context == 'user' %}
-    <h2>{{ 'My calendar list' |trans }}</h2>
-{% else %}
-    <h2>{{ 'Calendar list' |trans }}</h2>
-{% endif %}
-
-{% if context == 'user' %}
-    <div id="myCalendar"></div>
-{% else %}
-
-    {% if calendarItems|length == 0 %}
-        <p class="chill-no-data-statement">
-            {{ "There is no calendar items."|trans }}
-            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
-        </p>
-    {% else %}
-
-    <div class="flex-table list-records context-{{ context }}">
-
-        {% for calendar in calendarItems %}
-
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-
-
-                        {% if calendar.startDate and calendar.endDate %}
-                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
-                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
-                            {% else %}
-                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
-                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
-
-                                <div class="duration">
-                                    <p>
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
-                                    </p>
-                                </div>
-                            {% endif %}
-
-                        {% endif %}
-
-                        
-                    </div>
-                    <div class="item-col">
-                        <ul class="list-content">
-                            {% if calendar.user %}
-                            <li>
-                                <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
-                            </li>
-                            {% endif %}
-
-                            {% if calendar.mainUser is not empty %}
-                            <li>
-                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
-                            </li>
-                            {% endif %}
-
-                        </ul>
-                        <ul class="record_actions">
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                            </li>
-                            {# TOOD
-                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                            </li>
-                            {# TOOD
-                            {% endif %}
-                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                            </li>
-                            {#
-                            {% endif %}
-                            #}
-                        </ul>
-                    </div>
-                </div>
-
-                {%
-                    if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
-                    or calendar.thirdParties|length > 0
-                    or calendar.users|length > 0
-                %}
-                <div class="item-row details">
-                    <div class="item-col">
-
-                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
-                    </div>
-
-                    {% if calendar.comment.comment is not empty %}
-                    <div class="item-col comment">
-                        {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                    </div>
-                    {% endif %}
-                </div>
-                {% endif %}
-
-            </div>
-        {% endfor %}
-    </div>
-    {% endif %}
-
-    {% if context != 'user' %}
-    {# TODO set this condition in configuration #}
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-                {{ 'Add a new calendar' | trans }}
-            </a>
-        </li>
-    </ul>
-    {% endif %}
-
-
-
-{% endif %}
-
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index c0230344d..1ade76a26 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -4,6 +4,123 @@
 
 {% block title %}{{ 'Calendar list' |trans }}{% endblock title %}
 
+{% set user_id = null %}
+{% set accompanying_course_id = accompanyingCourse.id %}
+
 {% block content %}
-    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock %}
+
+<h2>{{ 'Calendar list' |trans }}</h2>
+
+{% if calendarItems|length == 0 %}
+    <p class="chill-no-data-statement">
+        {{ "There is no calendar items."|trans }}
+        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
+    </p>
+{% else %}
+
+    <div class="flex-table list-records context-accompanyingCourse">
+
+        {% for calendar in calendarItems %}
+
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
+
+                        {% if calendar.startDate and calendar.endDate %}
+                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                            {% else %}
+                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+
+                                <div class="duration">
+                                    <p>
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
+                                    </p>
+                                </div>
+                            {% endif %}
+
+                        {% endif %}
+
+                    </div>
+                    <div class="item-col">
+                        <ul class="list-content">
+                            {% if calendar.user %}
+                            <li>
+                                <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+                            {% if calendar.mainUser is not empty %}
+                            <li>
+                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
+                            </li>
+                            {% endif %}
+
+                        </ul>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                            </li>
+                            {# TOOD
+                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                            </li>
+                            {# TOOD
+                            {% endif %}
+                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
+                            #}
+                            <li>
+                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                            </li>
+                            {#
+                            {% endif %}
+                            #}
+                        </ul>
+                    </div>
+                </div>
+
+                {%
+                    if calendar.comment.comment is not empty
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0
+                %}
+                <div class="item-row details">
+                    <div class="item-col">
+
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': accompanyingCourse, 'with_display': 'row', 'entity': calendar } %}
+                    </div>
+
+                    {% if calendar.comment.comment is not empty %}
+                    <div class="item-col comment">
+                        {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                    </div>
+                    {% endif %}
+                </div>
+                {% endif %}
+
+            </div>
+        {% endfor %}
+
+        {% if calendarItems|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+
+    </div>
+{% endif %}
+
+
+<ul class="record_actions">
+    <li>
+        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
+            {{ 'Add a new calendar' | trans }}
+        </a>
+    </li>
+</ul>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
index 004000fc6..6171a0026 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -5,7 +5,10 @@
 {% block title %}{{ 'My calendar list' |trans }}{% endblock title %}
 
 {% block content %}
-    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'user'} %}
+
+<h2>{{ 'My calendar list' |trans }}</h2>
+<div id="myCalendar"></div>
+
 {% endblock %}
  
 {% block js %}

From 5b81bffcf6c1336d00f62669e30a41b81be52f42 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 17 Sep 2021 16:33:11 +0200
Subject: [PATCH 203/217] rdv: twig - headings change

---
 .../Resources/views/Calendar/listByAccompanyingCourse.html.twig | 2 +-
 .../Resources/views/Calendar/listByUser.html.twig               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index 1ade76a26..07aed8686 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -9,7 +9,7 @@
 
 {% block content %}
 
-<h2>{{ 'Calendar list' |trans }}</h2>
+<h1>{{ 'Calendar list' |trans }}</h1>
 
 {% if calendarItems|length == 0 %}
     <p class="chill-no-data-statement">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
index 6171a0026..055d967a7 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByUser.html.twig
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-<h2>{{ 'My calendar list' |trans }}</h2>
+<h1>{{ 'My calendar list' |trans }}</h1>
 <div id="myCalendar"></div>
 
 {% endblock %}

From 3385cb2ddab707369d2fa8ffd6c8009344059955 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 20 Sep 2021 13:38:49 +0200
Subject: [PATCH 204/217] rdv: rename twig view file

---
 .../ChillCalendarBundle/Controller/CalendarController.php       | 2 +-
 ...anyingCourse.html.twig => newByAccompanyingCourse.html.twig} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/Bundle/ChillCalendarBundle/Resources/views/Calendar/{newAccompanyingCourse.html.twig => newByAccompanyingCourse.html.twig} (100%)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index e7226b1bd..467c8eed2 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -130,7 +130,7 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillCalendar/Calendar/newAccompanyingCourse.html.twig';
+            $view = '@ChillCalendar/Calendar/newByAccompanyingCourse.html.twig';
         } 
         // elseif ($user instanceof User) {
         //     $view = '@ChillCalendar/Calendar/newUser.html.twig';
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig

From e8d8a57b4b7a7357dcbc86aa209044d0ab8a6bcf Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 20 Sep 2021 15:23:54 +0200
Subject: [PATCH 205/217] rdv: rdv -> activity: pass calendar data to new
 activity controller

---
 .../Controller/ActivityController.php         | 18 +++++++++++++++++
 .../views/Activity/selectType.html.twig       |  7 ++++++-
 .../Controller/CalendarController.php         | 20 ++++++++++++++++++-
 .../Resources/views/Calendar/show.html.twig   | 12 +++++++++--
 .../translations/messages.fr.yml              |  3 ++-
 5 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 0988eedfe..2ede8737f 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -139,6 +139,12 @@ class ActivityController extends AbstractController
             ];
         }
 
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        } else {
+            $activityData = [];
+        }
+
         if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
@@ -147,6 +153,7 @@ class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
+            'activityData' => $activityData
         ]);
     }
 
@@ -166,10 +173,21 @@ class ActivityController extends AbstractController
         $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
             ->find($activityType_id);
 
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+            dump($activityData);
+        }
+
         if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
             !$activityType->isActive()) {
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            if (NULL !== $activityData) {
+                $params['activityData'] = $activityData;
+            }
+
             return $this->redirectToRoute('chill_activity_activity_select_type', $params);
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
index 996d95b0f..4120d8285 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
@@ -18,7 +18,12 @@
                     {% set accompanying_course_id = accompanyingCourse.id %}
                 {% endif %}
 
-                <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'activityType_id': activityType.id, 'accompanying_period_id': accompanying_course_id }) }}">
+                <a href="{{ path('chill_activity_activity_new', {
+                    'person_id': person_id,
+                    'activityType_id': activityType.id,
+                    'accompanying_period_id': accompanying_course_id,
+                    'activityData': activityData
+                }) }}">
 
                     <div class="bloc btn btn-primary btn-lg btn-block">
                         {{ activityType.name|localize_translatable_string }}
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 467c8eed2..103887d36 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -215,10 +215,28 @@ class CalendarController extends AbstractController
             throw $this->createNotFoundException('Template not found');
         }
 
+        $personsId = [];
+        foreach ($entity->getPersons() as $p) {
+            array_push($personsId, $p->getId());
+        }
+
+        $professionalsId = [];
+        foreach ($entity->getProfessionals() as $p) {
+            array_push($professionalsId, $p->getId());
+        }
+
+        $activityData = [
+            'personsId' => $personsId,
+            'professionalsId' => $professionalsId,
+            'date' => $entity->getStartDate()->format('Y-m-d'),
+            'durationTime' => $entity->getEndDate()->diff($entity->getStartDate())->format("%H:%M")
+        ];
+
         return $this->render($view, [
             'accompanyingCourse' => $accompanyingPeriod,
             'entity'      => $entity,
-            'user' => $user
+            'user' => $user,
+            'activityData' => $activityData
             //'delete_form' => $deleteForm->createView(),
         ]);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index 971abe67d..e8830a33d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -65,13 +65,21 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar_list', { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar_list',
+            { 'accompanying_period_id': accompanying_course_id, 'user_id': user_id }) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
+    <li>
+        <a class="btn btn-create" href="{{ chill_path_add_return_path('chill_activity_activity_new',
+            { 'accompanying_period_id': accompanying_course_id, 'activityData': activityData }) }}">
+            {{ 'Transform to activity'|trans }}
+        </a>
+    </li>
     {% if accompanyingCourse %}
     <li>
-        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
+        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit',
+            { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
             {{ 'Edit'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 0eb7349a4..562233546 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -23,4 +23,5 @@ Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item created!": "Rendez-vous créé"
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
 From the day: Du
-to the day: au
\ No newline at end of file
+to the day: au
+Transform to activity: Transformer en échange
\ No newline at end of file

From 17036e83ba3ac68fd9376d8ff1ef15437cbd22af Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 20 Sep 2021 17:02:24 +0200
Subject: [PATCH 206/217] rdv: rdv-> activity: convert some fields

---
 .../Controller/ActivityController.php         | 29 +++++++++++++++++++
 .../Controller/CalendarController.php         |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 2ede8737f..6d9d61355 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -205,6 +205,35 @@ class ActivityController extends AbstractController
         $entity->setType($activityType);
         $entity->setDate(new \DateTime('now'));
 
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+
+            $durationTimeInMinutes = $activityData['durationTime'];
+            $hours = floor($durationTimeInMinutes / 60);
+            $minutes = $durationTimeInMinutes % 60;
+
+            $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+            if ($duration) {
+                $entity->setDurationTime($duration);
+            }
+
+            $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+            if ($date) {
+                $entity->setDate($date);
+            }
+
+            foreach($activityData['personsId'] as $personId){
+                $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
+                $entity->addPerson($person);
+            }
+
+            foreach($activityData['professionalsId'] as $professionalsId){
+                $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
+                $entity->addThirdParty($professional);
+            }
+
+        }
+
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 103887d36..0513e933c 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -225,11 +225,14 @@ class CalendarController extends AbstractController
             array_push($professionalsId, $p->getId());
         }
 
+        $durationTime = $entity->getEndDate()->diff($entity->getStartDate());
+        $durationTimeInMinutes = $durationTime->days*1440 + $durationTime->h*60 + $durationTime->i;
+
         $activityData = [
             'personsId' => $personsId,
             'professionalsId' => $professionalsId,
             'date' => $entity->getStartDate()->format('Y-m-d'),
-            'durationTime' => $entity->getEndDate()->diff($entity->getStartDate())->format("%H:%M")
+            'durationTime' => $durationTimeInMinutes
         ];
 
         return $this->render($view, [

From c6bbe46baebbf743521eb54b62202e2096c89c1e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 21 Sep 2021 09:46:09 +0200
Subject: [PATCH 207/217] rdv: rdv -> activity: fix some bugs (duplicate person
 var name, case keys are missing)

---
 .../Controller/ActivityController.php         | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 6d9d61355..beaff22d4 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -173,10 +173,9 @@ class ActivityController extends AbstractController
         $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
             ->find($activityType_id);
 
-
+        $activityData = null;
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
-            dump($activityData);
         }
 
         if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
@@ -184,10 +183,9 @@ class ActivityController extends AbstractController
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
 
-            if (NULL !== $activityData) {
+            if (null !== $activityData) {
                 $params['activityData'] = $activityData;
             }
-
             return $this->redirectToRoute('chill_activity_activity_select_type', $params);
         }
 
@@ -208,30 +206,36 @@ class ActivityController extends AbstractController
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            $durationTimeInMinutes = $activityData['durationTime'];
-            $hours = floor($durationTimeInMinutes / 60);
-            $minutes = $durationTimeInMinutes % 60;
-
-            $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
-            if ($duration) {
-                $entity->setDurationTime($duration);
+            if (array_key_exists('durationTime', $activityData)) {
+                $durationTimeInMinutes = $activityData['durationTime'];
+                $hours = floor($durationTimeInMinutes / 60);
+                $minutes = $durationTimeInMinutes % 60;
+                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+                if ($duration) {
+                    $entity->setDurationTime($duration);
+                }
             }
 
-            $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
-            if ($date) {
-                $entity->setDate($date);
+            if (array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+                if ($date) {
+                    $entity->setDate($date);
+                }
             }
 
-            foreach($activityData['personsId'] as $personId){
-                $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
-                $entity->addPerson($person);
+            if (array_key_exists('personsId', $activityData)) {
+                foreach($activityData['personsId'] as $personId){
+                    $concernedPerson = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
+                    $entity->addPerson($concernedPerson);
+                }
             }
 
-            foreach($activityData['professionalsId'] as $professionalsId){
-                $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
-                $entity->addThirdParty($professional);
+            if (array_key_exists('professionalsId', $activityData)) {
+                foreach($activityData['professionalsId'] as $professionalsId){
+                    $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
+                    $entity->addThirdParty($professional);
+                }
             }
-
         }
 
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
@@ -251,6 +255,7 @@ class ActivityController extends AbstractController
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
             $params['id'] = $entity->getId();
 
             return $this->redirectToRoute('chill_activity_activity_show', $params);

From 99f2692684ad05898e52366c5d8d32122c25d6ba Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 21 Sep 2021 10:06:06 +0200
Subject: [PATCH 208/217] activity: correction of displaying activity when
 durationTime or travelTime is null

---
 .../Resources/views/Activity/list.html.twig        |  2 +-
 .../Resources/views/Activity/show.html.twig        | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 07b59c7e7..c227f5539 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -19,7 +19,7 @@
                             {% endif %}
 
                             <div class="duration">
-                                {% if t.durationTimeVisible > 0 %}
+                                {% if activity.durationTime and t.durationTimeVisible %}
                                     <p>
                                         <i class="fa fa-fw fa-hourglass-end"></i>
                                         {{ activity.durationTime|date('H:i') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 81ebddc05..1f54692d9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -64,12 +64,22 @@
 
     {% if t.durationTimeVisible %}
     <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{{ entity.durationTime|date('H:i') }}</dd>
+    <dd>{% if entity.durationTime is not null %}
+            {{ entity.durationTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.travelTimeVisible %}
     <dt class="inline">{{ 'Travel Time'|trans }}</dt>
-    <dd>{{ entity.travelTime|date('H:i') }}</dd>
+    <dd>{% if entity.travelTime is not null %}
+            {{ entity.travelTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.commentVisible %}

From 1a6c37e5a6cbd37f740107a7453ee2c0d6a90b90 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 21 Sep 2021 15:44:45 +0200
Subject: [PATCH 209/217] rdv->activity: create event for storing the linked
 activity to a calendar

---
 .../Controller/CalendarController.php         |  1 +
 .../ChillCalendarExtension.php                |  1 +
 .../Event/ListenToActivityCreate.php          | 40 +++++++++++++++++++
 .../Resources/config/services/event.yml       | 10 +++++
 4 files changed, 52 insertions(+)
 create mode 100644 src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 0513e933c..c87f7ebd1 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -229,6 +229,7 @@ class CalendarController extends AbstractController
         $durationTimeInMinutes = $durationTime->days*1440 + $durationTime->h*60 + $durationTime->i;
 
         $activityData = [
+            'calendarId' => $id,
             'personsId' => $personsId,
             'professionalsId' => $professionalsId,
             'date' => $entity->getStartDate()->format('Y-m-d'),
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 8660fac52..eaa8a1416 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -29,6 +29,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/controller.yml');
         $loader->load('services/fixtures.yml');
         $loader->load('services/form.yml');
+        $loader->load('services/event.yml');
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
new file mode 100644
index 000000000..76a47015d
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Chill\CalendarBundle\Event;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class ListenToActivityCreate
+{
+
+    private RequestStack $requestStack;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    public function postPersist(Activity $activity, LifecycleEventArgs $event): void
+    {
+        // Get the calendarId from the request
+        $request = $this->requestStack->getCurrentRequest();
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+            if (array_key_exists('calendarId', $activityData)) {
+                $calendarId = $activityData['calendarId'];
+            }
+        }
+
+        // Attach the activity to the calendar
+        $em = $event->getObjectManager();
+
+        $calendar = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($calendarId);
+        $calendar->setActivity($activity);
+
+        $em->persist($calendar);
+        $em->flush();
+
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml
new file mode 100644
index 000000000..348677174
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/event.yml
@@ -0,0 +1,10 @@
+services:
+    Chill\CalendarBundle\Event\ListenToActivityCreate:
+        autowire: true
+        autoconfigure: true
+        tags:
+            -
+                name: 'doctrine.orm.entity_listener'
+                event: 'postPersist'
+                entity: 'Chill\ActivityBundle\Entity\Activity'
+        
\ No newline at end of file

From d172ae96826dd3ea0c485ecdfe71ec6d56604201 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 21 Sep 2021 16:48:43 +0200
Subject: [PATCH 210/217] rdv -> activity: add comment

---
 .../Controller/ActivityController.php                  | 10 ++++++++++
 .../Controller/CalendarController.php                  |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index beaff22d4..a454626b7 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -39,6 +39,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Form\ActivityType;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -236,6 +237,15 @@ class ActivityController extends AbstractController
                     $entity->addThirdParty($professional);
                 }
             }
+
+            if (array_key_exists('comment', $activityData)) {
+                $comment = new CommentEmbeddable();
+                $comment->setComment($activityData['comment']);
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new \DateTime('now'));
+                $entity->setComment($comment);
+            }
+
         }
 
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index c87f7ebd1..71e461464 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -233,7 +233,8 @@ class CalendarController extends AbstractController
             'personsId' => $personsId,
             'professionalsId' => $professionalsId,
             'date' => $entity->getStartDate()->format('Y-m-d'),
-            'durationTime' => $durationTimeInMinutes
+            'durationTime' => $durationTimeInMinutes,
+            'comment' => $entity->getComment()->getComment(),
         ];
 
         return $this->render($view, [

From 6b91808987f2c814489a43f3ad1864f2fb64c2ed Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 14:08:29 +0200
Subject: [PATCH 211/217] fix error with doctrine:fixtures:load

---
 .../ChillCalendarBundle/Event/ListenToActivityCreate.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index 76a47015d..f3c4e7a59 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -20,6 +20,11 @@ class ListenToActivityCreate
     {
         // Get the calendarId from the request
         $request = $this->requestStack->getCurrentRequest();
+
+        if (null === $request) {
+            return;
+        }
+        
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
             if (array_key_exists('calendarId', $activityData)) {
@@ -37,4 +42,4 @@ class ListenToActivityCreate
         $em->flush();
 
     }
-}
\ No newline at end of file
+}

From 694213e79af95abbed8e9d43a6953b94fae5ac48 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 15:45:09 +0200
Subject: [PATCH 212/217] household banner: don't limit maximum number of
 members

---
 .../Resources/views/Household/banner.html.twig            | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index f5348e6be..990a7cdd3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -20,7 +20,7 @@
                                 <i class="fa fa-fw fa-users" title="{{- 'household.Current household members'|trans }}"></i>
                             </span>
 
-                            {%- for m in members|slice(0, 5) -%}
+                            {%- for m in members -%}
                                 <span
                                     class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
                                     title="{{ m.position.label.fr }}">
@@ -35,12 +35,6 @@
                                     </a>
                                 </span>
                             {%- endfor -%}
-
-                            {% if members|length > 5 %}
-                                <span class="current-members-more">
-                                    {{ 'household.and x other persons'|trans({'x': members|length-5}) }}
-                                </span>
-                            {% endif %}
                         {%- endif -%}
                     </div>
                 </div>

From ee3776288be03cb5c7fae16dd7cf4a75d366d311 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 15:52:44 +0200
Subject: [PATCH 213/217] vue_accourse, resources bloc: change for flex-bloc
 placement

---
 .../Resources/public/vuejs/AccompanyingCourse/App.vue  |  3 ++-
 .../vuejs/AccompanyingCourse/components/Resources.vue  | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 797f246fe..d0ad5056f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -96,7 +96,8 @@ export default {
          }
          & > div {
             margin: 1em 3em 0;
-            &.flex-table {
+            &.flex-table,
+            &.flex-bloc {
                margin: 1em 0 0;
             }
          }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 7cfb85bce..5706fe315 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -10,7 +10,7 @@
       <label class="chill-no-data-statement">{{ $tc('resources.counter', counter) }}</label>
    </div>
 
-   <div class="flex-table mb-3">
+   <div class="flex-bloc mb-3">
       <resource-item
          v-for="resource in resources"
          v-bind:resource="resource"
@@ -76,3 +76,11 @@ export default {
    }
 }
 </script>
+
+<style lang="scss">
+div.flex-bloc {
+   div.item-bloc {
+      flex-basis: 50%;
+   }
+}
+</style>

From f93c13234ab454fceda78358c3c9b5a579c2fb77 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 16:20:33 +0200
Subject: [PATCH 214/217] accourse stickyNav: insert a component, replace
 deprecated anchor name by id

---
 .../public/vuejs/AccompanyingCourse/App.vue   |  2 +-
 .../AccompanyingCourse/components/Comment.vue |  2 +-
 .../AccompanyingCourse/components/Confirm.vue |  2 +-
 .../components/CourseLocation.vue             |  2 +-
 .../components/OriginDemand.vue               |  2 +-
 .../components/PersonsAssociated.vue          |  2 +-
 .../components/Referrer.vue                   |  2 +-
 .../components/Requestor.vue                  |  2 +-
 .../components/Resources.vue                  |  2 +-
 .../AccompanyingCourse/components/Scopes.vue  |  2 +-
 .../components/SocialIssue.vue                |  2 +-
 .../components/StickyNav.vue                  | 46 +++++++++----------
 .../components/StickyNav/Item.vue             |  6 +--
 13 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index d0ad5056f..e4baa082b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -80,7 +80,7 @@ export default {
                left: -22px;
                top: 4px;
             }
-            a[name^="section"] {
+            a[id^="section"] {
                position: absolute;
                top: -2.5em;  // reference for stickNav
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index b64d46103..1bff3f44d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-80"></a>{{ $t('comment.title') }}</h2>
+      <h2><a id="section-90"></a>{{ $t('comment.title') }}</h2>
 
       <!--div class="error flash_message" v-if="errors.length > 0">
          {{ errors[0] }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index b7834039d..b8d131f2d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-90"></a>
+   <h2><a id="section-100"></a>
       {{ $t('confirm.title') }}
    </h2>
    <div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 83bc1126f..afe13845c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-20"></a>
+      <h2><a id="section-20"></a>
          {{ $t('courselocation.title') }}
       </h2>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
index af0fcf2b7..30001028c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-30"></a>{{ $t('origin.title') }}</h2>
+      <h2><a id="section-30"></a>{{ $t('origin.title') }}</h2>
 
       <div class="mb-4">
          <label for="selectOrigin">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 79a9df5a6..07761b31b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
+   <h2><a id="section-10"></a>{{ $t('persons_associated.title')}}</h2>
 
    <div v-if="currentParticipations.length > 0">
       <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index 3d4de8442..d1ecfbed1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-60"></a>{{ $t('referrer.title') }}</h2>
+   <h2><a id="section-70"></a>{{ $t('referrer.title') }}</h2>
 
    <div>
       <label class="col-form-label" for="selectReferrer">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 5770e566e..7342eed66 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="vue-component">
 
-   <h2><a name="section-40"></a>{{ $t('requestor.title') }}</h2>
+   <h2><a id="section-40"></a>{{ $t('requestor.title') }}</h2>
 
    <div v-if="accompanyingCourse.requestor" class="flex-table">
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 5706fe315..0d22c4d0f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="vue-component">
 
-   <h2><a name="section-70"></a>{{ $t('resources.title')}}</h2>
+   <h2><a id="section-80"></a>{{ $t('resources.title')}}</h2>
 
    <div v-if="resources.length > 0">
       <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
index ca1b36770..903f85a86 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="vue-component">
-    <h2><a name="section-65"></a>{{ $t('scopes.title') }}</h2>
+    <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
 
     <ul>
       <li v-for="s in scopes">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index a73872953..6faaa5083 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="vue-component">
-     <h2><a name="section-50"></a>{{ $t('social_issue.title') }}</h2>
+     <h2><a id="section-50"></a>{{ $t('social_issue.title') }}</h2>
 
      <div class="my-4">
         <!--label for="field">{{ $t('social_issue.label') }}</label
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
index c42571721..1047ab9d2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
@@ -62,42 +62,42 @@ export default {
          // load datas DOM when mounted ready
          this.container = document.querySelector("#content");
          this.stickyNav = document.querySelector('#navmap');
-         this.anchors = document.querySelectorAll("h2 a[name^='section']");
-         this.initItemsMap();                  
-         
+         this.anchors = document.querySelectorAll("h2 a[id^='section']");
+         this.initItemsMap();
+
          // TODO resizeObserver not supports IE !
          // Listen when elements change size, then recalculate heightSum and initItemsMap
          const resizeObserver = new ResizeObserver(entries => {
             this.refreshPos();
          });
-         
+
          resizeObserver.observe(this.header);
          resizeObserver.observe(this.bannerName);
          resizeObserver.observe(this.bannerDetails);
          resizeObserver.observe(this.container);
       },
       initItemsMap() {
-         
+
          this.anchors.forEach(anchor => {
             this.items.push({
                pos: null,
                active: false,
-               key: parseInt(anchor.name.slice(8).slice(0, -1)),
-               name: '#' + anchor.name
+               key: parseInt(anchor.id.slice(8).slice(0, -1)),
+               id: '#' + anchor.id
             })
          });
       },
       refreshPos() {
-         
+
          //console.log('refreshPos');
          this.heightSum = this.header.offsetHeight + this.bannerName.offsetHeight + this.bannerDetails.offsetHeight;
-         
+
          this.anchors.forEach((anchor, i) => {
             this.items[i].pos = this.findPos(anchor)['y'];
          });
       },
       findPos(element) {
-         
+
           let posX = 0, posY = 0;
           do {
               posX += element.offsetLeft;
@@ -105,38 +105,38 @@ export default {
               element = element.offsetParent;
           }
           while( element != null );
-          
+
           let pos = [];
           pos['x'] = posX;
           pos['y'] = posY;
-          
+
           return pos;
       },
       handleScroll(event) {
-         
+
          let pos = this.findPos(this.stickyNav);
          let top = this.heightSum + this.top - window.scrollY;
-         //console.log(window.scrollY); 
-         
-         if (top > this.limit) {            
+         //console.log(window.scrollY);
+
+         if (top > this.limit) {
             this.stickyNav.style.position = 'absolute';
             this.stickyNav.style.left = '10px';
          } else {
             this.stickyNav.style.position = 'fixed';
             this.stickyNav.style.left = pos['x'] + 'px';
          }
-         
+
          this.switchActive();
       },
       switchActive() {
-         
+
          this.items.forEach((item, i) => {
             let next = (this.items[i+1]) ? this.items[i+1].pos : '100000';
-            item.active = 
+            item.active =
                 (window.scrollY >= item.pos & window.scrollY < next) ? true : false;
          }, this);
-         
-         // last item never switch active because scroll reach bottom of page 
+
+         // last item never switch active because scroll reach bottom of page
          if (document.body.scrollHeight == window.scrollY + window.innerHeight) {
             this.items[this.items.length-1].active = true;
             this.items[this.items.length-2].active = false;
@@ -151,7 +151,7 @@ export default {
 <style lang="scss">
 div#content {
    position: relative;
-   
+
    div#navmap {
       position: absolute;
       top: 30px;
@@ -170,7 +170,7 @@ div#content {
             span {
                display: none;
             }
-            &:hover, 
+            &:hover,
             &.active {
                span {
                   display: inline;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
index 762ef1d11..9478744bc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
@@ -1,7 +1,7 @@
 <template>
    <a
-      v-if="item.key <= 7"
-      :href="item.name"
+      v-if="item.key <= 8"
+      :href="item.id"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>
@@ -9,7 +9,7 @@
    </a>
    <a
       v-else-if="step === 'DRAFT'"
-      :href="item.name"
+      :href="item.id"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>

From 95e019895297714d80112f504f8e9321ceef0848 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 23 Sep 2021 16:22:10 +0200
Subject: [PATCH 215/217] Address: twig insert, complete options for use cases

---
 .../ChillPersonBundle/Resources/views/Address/edit.html.twig  | 4 +++-
 .../ChillPersonBundle/Resources/views/Address/new.html.twig   | 4 ++--
 .../Resources/views/Household/address_edit.html.twig          | 3 ++-
 .../Resources/views/Household/address_move.html.twig          | 3 +++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index e2e9167b3..75994729c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -29,10 +29,12 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
+            stickyActions: true,
+            useValidFrom: true,
         } %}
         {#
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
         #}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index c88959340..91c384103 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -29,13 +29,13 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+            openPanesInModal: false,
             stickyActions: true,
             useValidFrom: true,
         } %}
         {#
             useValidTo: true,
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            openPanesInModal: false,
         #}
 
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index c909e62d3..c8342fb07 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,8 +10,9 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            stickyActions: true,
             openPanesInModal: false,
+            stickyActions: true,
+            useValidFrom: true,
         } %}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 2015a8599..b10ef7942 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -12,7 +12,10 @@
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
             openPanesInModal: false,
             stickyActions: true,
+            useValidFrom: true,
         } %}
+        {#
+        #}
     </div>
 
 {% endblock %}

From 463b615595238de05f8e1a2e4220870e257dea68 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 24 Sep 2021 09:13:05 +0200
Subject: [PATCH 216/217] Aside Activity: improve french translations

---
 .../src/translations/messages.fr.yml                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index a4ddec913..fa62befea 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -44,15 +44,15 @@ crud:
 
 #forms
 Activity creation: Nouvelle activité annexe
-Create a new aside activity type: Nouvelle categorie d'activité annexe
+Create a new aside activity type: Nouvelle catégorie d'activité annexe
 Create: Créer
 Back to the list: Retour à la liste
 Save activity: Sauver l'activité
 Reset form: Remise à zéro du formulaire
-Choose the agent for whom this activity is created: Choissisez l'utilisateur pour qui l'activité est creéé.
-Choose the activity category: Choissisez le type d'activité
+Choose the agent for whom this activity is created: Choisissez l'utilisateur pour qui l'activité est créée.
+Choose the activity category: Choisissez le type d'activité
 Choose the duration: Choisir la durée
-Choose a category: Choisir un categorie
+Choose a category: Choisir une catégorie
 Is active: Actif
 Agent: Utilisateur
 date: Date
@@ -62,7 +62,7 @@ Note: Note
 #list
 My aside activities: Mes activités annexes
 Date: Date
-Created by: Creér par
+Created by: Créée par
 
 #Aside activity delete
 Delete aside activity: Supprimer une activité annexe
@@ -70,6 +70,6 @@ Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-
 The activity has been successfully removed.: L'activité a été supprimée.
 
 #Menu
-Create an aside activity: "Creér une activité annexe"
+Create an aside activity: "Créer une activité annexe"
 Aside activity configuration menu: "Menu de configuration des activités annexes"
 Aside activity configuration: "Configuration des activités annexes"

From 9f07e6a272e6d3365f5045ca23e2b10d7a21b3d8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 24 Sep 2021 11:21:09 +0200
Subject: [PATCH 217/217] Address: fetch POST valid dates when applying changes
 from datePane

---
 .../Resources/public/vuejs/Address/App.vue    | 26 --------------
 .../vuejs/Address/components/AddAddress.vue   | 34 +++++++++++++++----
 .../vuejs/Address/components/DatePane.vue     |  2 +-
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index d429098a5..72bd16bc4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -53,32 +53,6 @@ export default {
          }
       },
 
-      /*
-      * Patch date
-      * TO MOVE in DatePane
-      addDateToAddressAndPostAddressTo(payload) {
-         payload.body = {
-            validFrom: {
-               datetime: `${this.context.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
-            }
-         };
-         console.log('addDateToAddress', payload);
-
-         this.$refs.addAddress.flag.loading = true;
-         return patchAddress(payload.addressId, payload.body)
-            .then(address => new Promise((resolve, reject) => {
-                  this.context.valid.from = address.validFrom;
-                  resolve();
-               })
-                  .then(this.postAddressTo(payload))
-            )
-            .catch((error) => {
-               this.$refs.addAddress.errorMsg.push(error);
-               this.$refs.addAddress.flag.loading = false;
-            });
-      },
-      */
-
       /*
       *  Post new created address to targetEntity
       */
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 80668270f..38afeae80 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -299,14 +299,16 @@ export default {
          return (typeof this.options.openPanesInModal !== 'undefined') ?
             this.options.openPanesInModal : this.defaultz.openPanesInModal;
       },
-      useDatePane() {
-         let vFrom = (typeof this.options.useDate !== 'undefined'
-            && typeof this.options.useDate.validFrom !== 'undefined') ?
-            this.options.useDate.validFrom : this.defaultz.useDate.validFrom ;
-         let vTo = (typeof this.options.useDate !== 'undefined'
-            && typeof this.options.useDate.validTo !== 'undefined') ?
+      validFrom() {
+         return (typeof this.options.useDate !== 'undefined' && typeof this.options.useDate.validFrom !== 'undefined') ?
+            this.options.useDate.validFrom : this.defaultz.useDate.validFrom;
+      },
+      validTo() {
+         return (typeof this.options.useDate !== 'undefined' && typeof this.options.useDate.validTo !== 'undefined') ?
             this.options.useDate.validTo : this.defaultz.useDate.validTo ;
-         return (vFrom || vTo) ? true : false;
+      },
+      useDatePane() {
+         return (this.validFrom || this.validTo) ? true : false;
       },
       hasSuggestions() {
          // TODO
@@ -335,6 +337,8 @@ export default {
    },
    mounted() {
 
+      console.log('validFrom', this.validFrom);
+      console.log('validTo', this.validTo);
       console.log('useDatePane', this.useDatePane);
 
       console.log('Mounted now !');
@@ -566,6 +570,22 @@ export default {
                'point': this.entity.selected.address.point.coordinates
             });
          }
+         if (this.validFrom) {
+            console.log('add validFrom in fetch body', this.entity.selected.valid.from);
+            newAddress = Object.assign(newAddress, {
+               'validFrom': {
+                  datetime: `${this.entity.selected.valid.from.toISOString().split('T')[0]}T00:00:00+0100`
+               }
+            });
+         }
+         if (this.validTo && null !== this.entity.selected.valid.to) {
+            console.log('add validTo in fetch body', this.entity.selected.valid.to);
+            newAddress = Object.assign(newAddress, {
+               'validTo': {
+                  datetime: `${this.entity.selected.valid.to.toISOString().split('T')[0]}T00:00:00+0100`
+               }
+            });
+         }
          if (this.entity.selected.writeNew.postcode) {
             let newPostcode = this.entity.selected.postcode;
             newPostcode = Object.assign(newPostcode, {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 69e4ccea6..6a83cbfe2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
+import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import ActionButtons from './ActionButtons.vue';