From fd8f4a98c0c76c0cdea8bb368e52ba28afadac22 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 19 Aug 2021 15:41:54 +0200
Subject: [PATCH] vue Address: fix ShowAddress multiline option

---
 .../vuejs/Address/components/ShowAddress.vue  | 117 +++++++++---------
 .../_components/Entity/PersonRenderBox.vue    |   4 +-
 .../vuejs/_components/ThirdPartyRenderbox.vue |   4 +-
 3 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index ebca46a5d..044a619fc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -1,41 +1,22 @@
 <template>
-<div class="chill-entity entity-address my-3"></div>
-   
-   <component :is="component" :class="'address'+ isMultiline">
-      <p v-if="address.text"
-         class="street">
-         {{ address.text }},
-      </p>
-      <p v-if="address.postcode"
-         class="postcode">
-         {{ address.postcode.code }} {{ address.postcode.name }}
-      </p>
-      <p v-if="address.country"
-         class="country">
-         {{ address.country.name.fr }}
-      </p>
+   <component :is="component" class="chill-entity entity-address my-3">
 
-      <div v-if="address.floor">
-         <span class="floor">
-            <b>{{ $t('floor') }}</b>: {{ address.floor }}
-         </span>
-      </div>
-      <div v-if="address.corridor">
-         <span class="corridor">
-            <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-         </span>
-      </div>
-      <div v-if="address.steps">
-         <span class="steps">
-            <b>{{ $t('steps') }}</b>: {{ address.steps }}
-         </span>
-      </div>
-      <div v-if="address.flat">
-         <span class="flat">
-            <b>{{ $t('flat') }}</b>: {{ address.flat }}
-         </span>
-      </div>
-      <div>
+      <component :is="component" class="address" :class="multiline">
+         <p v-if="address.text"
+            class="street">
+            {{ address.text }},
+         </p>
+         <p v-if="address.postcode"
+            class="postcode">
+            {{ address.postcode.code }} {{ address.postcode.name }}
+         </p>
+         <p v-if="address.country"
+            class="country">
+            {{ address.country.name.fr }}
+         </p>
+      </component>
+
+      <div v-if="isMultiline">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}
@@ -56,24 +37,46 @@
                <b>{{ $t('flat') }}</b>: {{ address.flat }}
             </span>
          </div>
-         <div v-if="address.buildingName">
-            <span class="buildingName">
-               <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
-            </span>
-         </div>
-         <div v-if="address.extra">
-            <span class="extra">
-               <b>{{ $t('extra') }}</b>: {{ address.extra }}
-            </span>
-         </div>
-         <div v-if="address.distribution">
-            <span class="distribution">
-               <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
-            </span>
+         <div>
+            <div v-if="address.floor">
+               <span class="floor">
+                  <b>{{ $t('floor') }}</b>: {{ address.floor }}
+               </span>
+            </div>
+            <div v-if="address.corridor">
+               <span class="corridor">
+                  <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
+               </span>
+            </div>
+            <div v-if="address.steps">
+               <span class="steps">
+                  <b>{{ $t('steps') }}</b>: {{ address.steps }}
+               </span>
+            </div>
+            <div v-if="address.flat">
+               <span class="flat">
+                  <b>{{ $t('flat') }}</b>: {{ address.flat }}
+               </span>
+            </div>
+            <div v-if="address.buildingName">
+               <span class="buildingName">
+                  <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
+               </span>
+            </div>
+            <div v-if="address.extra">
+               <span class="extra">
+                  <b>{{ $t('extra') }}</b>: {{ address.extra }}
+               </span>
+            </div>
+            <div v-if="address.distribution">
+               <span class="distribution">
+                  <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
+               </span>
+            </div>
          </div>
       </div>
-   </component>
 
+   </component>
 </template>
 
 <script>
@@ -83,25 +86,25 @@ export default {
       address: {
          type: Object
       },
-      multiline: {
+      isMultiline: {
          default: true,
          type: Boolean
       }
    },
    computed: {
       component(){
-         return this.multiline == true ? "div" : "span";
+         return this.isMultiline == true ? "div" : "span";
       },
-      isMultiline(){
-         return this.multiline == true ? " multiline" : "";
+      multiline(){
+         return this.isMultiline == true ? "multiline" : "";
       }
    }
 };
 </script>
 
 <style lang="scss" scoped>
-p{
-   &:after{
+p {
+   &:after {
       content: " ";
       margin-right: 0.3em;
    }
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 2d81b3654..d82546f82 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -64,9 +64,9 @@
         <div class="item-col">
             <ul class="list-content fa-ul">
                 <!-- ADDRESS -->
-                <li v-if="person.current_household_address" class="chill-entity entity-address">
+                <li v-if="person.current_household_address">
                     <i class="fa fa-li fa-map-marker"></i>
-                    <show-address :address="person.current_household_address" :multiline="false"></show-address>
+                    <show-address :address="person.current_household_address" :isMultiline="false"></show-address>
                 </li>
                 <!-- PHONENUMBER -->
                 <!-- todo: change href for phonenumbers and format phone number? -->
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/ThirdPartyRenderbox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/ThirdPartyRenderbox.vue
index b3df82cd2..ed09794bd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/ThirdPartyRenderbox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/ThirdPartyRenderbox.vue
@@ -49,9 +49,9 @@
         <div class="item-col">
             <ul class="list-content fa-ul">
                 <!-- ADDRESS -->
-                <li v-if="thirdparty.resource.address" class="chill-entity entity-address">
+                <li v-if="thirdparty.resource.address">
                     <i class="fa fa-li fa-map-marker"></i>
-                    <show-address :address="thirdparty.resource.address" :multiline="false"></show-address>
+                    <show-address :address="thirdparty.resource.address" :isMultiline="false"></show-address>
                 </li>
                 <!-- PHONENUMBER -->
                 <!-- todo: change href for phonenumbers -->