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

---
 .../_components/Entity/AddressRenderBox.vue   |  2 +-
 .../components/Household.vue                  | 37 ++++++++++---------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  9 ++++-
 .../_components/Entity/PersonRenderBox.vue    | 24 ++++++------
 4 files changed, 38 insertions(+), 34 deletions(-)

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