Merge branch 'improve_address' into person_renderbox_thirdparty_onthefly

src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig

@@ -9,12 +9,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            stickyActions: true
-        } %}
-        {#
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            stickyActions: true,
             openPanesInModal: false,
-        #}
+        } %}
     </div>
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig

@@ -10,12 +10,9 @@
         {% 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 }),
-            forceRedirect: true,
+            openPanesInModal: false,
             stickyActions: true,
         } %}
-        {#
-            openPanesInModal: false,
-        #}
     </div>
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -18,14 +18,13 @@
                 {% 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 }),
-                    forceRedirect: true,
                     mode: 'new',
-                    useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
                 } %}
                 {#
+                    useValidFrom: true,
                 #}
 
             </li>
@@ -67,7 +66,6 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 

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="row household-resume">
+        <div class="item-bloc col-5 col-address">
+            <h2>{{ 'Address'|trans }}</h2>
 
-            <div class="item-bloc col-5 col-address">
+            {% 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, 'extended_infos': true }) }}
+            {% endif %}
 
-                <h2>{{ 'Address'|trans }}</h2>
-
-                {{ address|chill_entity_render_box({'multiline': true}) }}
-
-                <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 }),
+                        hideAddress: 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>