Merge branch 'issue576_address_show_more_if_no_address' into 'master'

addAddress: can add extra info even if noAddress

See merge request Chill-Projet/chill-bundles!423

CHANGELOG.md

@@ -11,13 +11,17 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
 
 
 ## Test releases
 
+### 2022-05-06
+
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
 ### 2021-04-29
 
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)

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) {

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"

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>