From 83a888a32d4fc8d33416d6ca02a4ce447b83e257 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 19:44:06 +0200
Subject: [PATCH 1/3] addAddress: can add extra info even if noAddress

---
 .../Address/components/AddAddress/AddressMore.vue      | 10 +++++-----
 .../public/vuejs/Address/components/EditPane.vue       |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index 93a64ad19..a26478126 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -1,7 +1,7 @@
 <template>
    <h4 class="h3">{{ $t('fill_an_address') }}</h4>
    <div class="row my-3">
-      <div class="col-lg-6">
+      <div class="col-lg-6" v-if="!isNoAddress">
          <div class="form-floating my-1">
             <input class="form-control"
             type="text"
@@ -35,8 +35,8 @@
             <label for="flat">{{ $t('flat') }}</label>
          </div>
       </div>
-      <div class="col-lg-6">
-         <div class="form-floating my-1">
+      <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="buildingName"
@@ -54,7 +54,7 @@
             v-model="extra"/>
             <label for="extra">{{ $t('extra') }}</label>
          </div>
-         <div class="form-floating my-1">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="distribution"
@@ -70,7 +70,7 @@
 <script>
 export default {
    name: "AddressMore",
-   props: ['entity'],
+   props: ['entity', 'isNoAddress'],
    computed: {
       floor: {
          set(value) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 503ca5b33..9636a173f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -75,8 +75,9 @@
          </div>
       </div>
 
-      <address-more v-if="!isNoAddress"
-         v-bind:entity="entity">
+      <address-more
+         v-bind:entity="entity"
+         v-bind:isNoAddress="isNoAddress">
       </address-more>
 
       <action-buttons v-if="insideModal === false"

From 62d59e6037a76fbf15519f1ac94607094b90e321 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 20:00:11 +0200
Subject: [PATCH 2/3] address: show address extra info even if noAddress

---
 .../Resources/views/Entity/address.html.twig           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 3dfc27d2f..eef84b8a2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -29,6 +29,11 @@
             </p>
             <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
         {% endif %}
+        {% if address.extra is not empty %}
+        <span>
+            {{ address.extra }}
+        </span>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
@@ -89,6 +94,11 @@
                 <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
             </div>
             {% endif %}
+            {% if address.extra is not empty %}
+            <div>
+                {{ address.extra }}
+            </div>
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>

From 192ab02be2844138d1c130b16032928aa1b0fd3a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 20:02:26 +0200
Subject: [PATCH 3/3] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..554f2e350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures