From f1c29a8bd3b782d26871c37a5965c3cc91be63ae Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 22 Sep 2021 12:08:16 +0200
Subject: [PATCH] Household summary: improve Address display when there is no
 address

---
 .../views/Household/summary.html.twig         | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index d8c53dbf5..115f5a208 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -16,42 +16,39 @@
 
     {% set address = household.currentAddress %}
 
-    {% if address is empty %}
-        <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
-    {% else %}
-        <div class="row household-resume">
-
-            <div class="item-bloc col-5 col-address">
-
-                <h2>{{ 'Address'|trans }}</h2>
+    <div class="row household-resume">
+        <div class="item-bloc col-5 col-address">
+            <h2>{{ 'Address'|trans }}</h2>
 
+            {% if address is empty %}
+                <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+            {% else %}
                 {{ address|chill_entity_render_box({'multiline': true}) }}
+            {% endif %}
 
-                <ul class="list-inline text-right mt-2">
-                    <li class="list-inline-item">
-                        {# include vue_address component #}
-                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-                            targetEntity: { name: 'household', id: household.id },
-                            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                            mode: 'new',
-                            buttonSize: 'btn-sm',
-                            buttonText: 'Move household',
-                            modalTitle: 'Move household',
-                            buttonDisplayText: false,
-                        } %}
-                        {#
-                            openPanesInModal: false
-                        #}
-                    </li>
-                    <li class="list-inline-item">
-                        <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
-                           href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
-                            <i class="fa fa-list fa-fw"></i>
-                        </a>
-                    </li>
-                </ul>
-
-            </div>
+            <ul class="list-inline text-right mt-2">
+                <li class="list-inline-item">
+                    {# include vue_address component #}
+                    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                        targetEntity: { name: 'household', id: household.id },
+                        backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
+                        forceRedirect: true,
+                        mode: 'new',
+                        buttonSize: 'btn-sm',
+                        buttonText: 'Move household',
+                        modalTitle: 'Move household',
+                        buttonDisplayText: false,
+                    } %}
+                </li>
+                <li class="list-inline-item">
+                    <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
+                       href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
+                        <i class="fa fa-list fa-fw"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+        {% if address is not empty %}
             <div class="item-bloc col-7 col-comment">
                 {% if form is null %}
 
@@ -106,10 +103,9 @@
                     {{ form_end(form) }}
 
                 {% endif %}
-
             </div>
-        </div>
-    {% endif %}
+        {% endif %}
+    </div>
 
     <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>