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

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

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