Merge branch 'issue162_ACCent_display_addresses' into 'master'

Display of incomplete address

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

CHANGELOG.md

@@ -13,13 +13,13 @@ and this project adheres to
 <!-- write down unreleased development here -->
 * unnecessary whitespace removed from person banner after person-id + double parentheses removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/290)
 * [person]: delete accompanying period work, including related objects (cascade) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/36)
+* [address]: Display of incomplete address adjusted.
 
 ## Test releases
 
 ### Test release 2021-11-08
 
 * [person]: Display the name of a user when searching after a User (TMS)
->>>>>>> CHANGELOG.md
 * [person]: Add civility to the person
 * [person]: Various improvements on the edit person form
 * [person]: Set available_languages and available_countries as parameters for use in the edit person form

src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig

@@ -58,6 +58,13 @@
 
 {% macro inline(address, options) %}
     {% if options['has_no_address'] == true and address.isNoAddress == true %}
+        {% if address.postCode is not empty %}
+            <p class="postcode">
+                <span class="code">{{ address.postCode.code }}</span>
+                <span class="name">{{ address.postCode.name }}</span>
+            </p>
+            <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
@@ -108,9 +115,19 @@
 {%- if render == 'bloc' -%}
     <div class="chill-entity entity-address">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
+            {% if address.postCode is not empty %}
+            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+                <p class="postcode">
+                    <span class="code">{{ address.postCode.code }}</span>
+                    <span class="name">{{ address.postCode.name }}</span>
+                </p>
+                <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+            </div>    
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>
+        
         {% else %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
                 {% if options['with_picto'] %}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -74,7 +74,7 @@ Choose a postal code: Choisir un code postal
 address:
   address_homeless: L'adresse est-elle celle d'un domicile fixe ?
   real address: Adresse d'un domicile
-  consider homeless: N'est pas l'adresse d'un domicile (SDF)
+  consider homeless: Cette adresse est incomplète
 address more:
   floor: ét
   corridor: coul