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 01/30] 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 02/30] 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 03/30] 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 04/30] 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 05/30] 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 06/30] 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 07/30] 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 08/30] 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 09/30] 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 10/30] 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 11/30] 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 12/30] 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 13/30] 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 14/30] 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 15/30] 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 16/30] 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 17/30] 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 18/30] 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 19/30] 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 20/30] 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 21/30] 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 22/30] 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 23/30] 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 24/30] 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 25/30] 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 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 26/30] 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 27/30] 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 28/30] 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 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 29/30] 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 30/30] 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>