address history: improve template, insert buttons with validFrom/validTo difference

src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig

@@ -21,10 +21,19 @@
 {% block title %}{{ 'Addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
 
 {% block personcontent %}
-<div class="person-addresses">
+<div class="person-address">
 
     <h1>{{ 'Addresses history'|trans }}</h1>
 
+    <ul class="record_actions my-3">
+        <li style="margin: auto;">
+            <a class="btn btn-lg btn-create"
+               href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
+                {{ 'Add an address'|trans }}
+            </a>
+        </li>
+    </ul>
+
     <div class="address-timeline grid">
 
         {% if person.addresses|length == 0 %}
@@ -33,29 +42,51 @@
             <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
         {% endif %}
 
+        <div class="col-a">
+            <h3 class="mb-5">{{ 'Person addresses'|trans }}</h3>
+        </div>
+        <div class="col-b"></div>
+        <div class="col-c">
+            <h3 class="mb-5">{{ 'Household addresses'|trans }}</h3>
+        </div>
+
+        {% set row = 0 %}
+        {% set previousRowFrom = null %}
+
         {% for address in person.addresses %}
 
-            {# if person address #}
-            <div class="col-a content{{ ' row' ~ loop.index }}">
-                <div class="address">
-                    {% if address.isNoAddress == true %}
-                        <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-                    {% else %}
-                        {{ address|chill_entity_render_box({
-                            'multiline': false, 'with_valid_from': false
-                        }) }}
+            {% set row = row + 1 %}
+            {% if address.validTo is not empty and address.validTo < previousRowFrom %}
+                <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="date">
+                    {% if address.validTo is not empty %}
+                        {{ address.validTo|format_date('short') }}
                     {% endif %}
+                </div>
 
+                {% set row = row + 1 %}
+            {% endif %}
+
+
+            {# if person address #}
+                <div class="{{ 'row' ~ row ~ ' ' }}col-a content">
+                    {{ address|chill_entity_render_box({
+                        'render': 'bloc',
+                        'multiline': true,
+                        'extended_infos': true,
+                        'has_no_address': true
+                    }) }}
                     <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
-                        </li>
+                        <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
                     </ul>
                 </div>
-            </div>
             {# endif #}
 
-            <div class="col-b"></div>
+            <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
 
             {# if household address #}{#
                 <div class="col-c content rowXX">
@@ -65,10 +96,11 @@
 
             <div class="date">
                 {% if address.validFrom is not empty %}
-                    {{ address.validFrom|format_date('long') }}
+                    {{ address.validFrom|format_date('short') }}
                 {% endif %}
             </div>
 
+            {% set previousRowFrom = address.validFrom %}
         {% endfor %}
 
         {# TEST HOUSEHOLD POSITION
@@ -86,7 +118,7 @@
                 <ul class="record_actions"><li><a href="" class="btn btn-edit"></a></li></ul>
             </div>
         </div>
-        <div class="date">01 janvier 1970</div>
+        <div class="date">01/01/1970</div>
         {# END TEST #}
 
     </div>
@@ -104,6 +136,5 @@
             </a>
         </li>
     </ul>
-
 </div>
 {% endblock %}

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

@@ -5,68 +5,83 @@
 {% block content %}
 <div class="household-address">
 
-<h1>{{ block('title') }}</h1>
+    <h1>{{ block('title') }}</h1>
 
-<div class="address-timeline grid">
+    <ul class="record_actions my-3">
+        <li style="margin: auto;">
+            <a class="btn btn-lg btn-create"
+               href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                {{ 'Move household'|trans }}
+            </a>
+        </li>
+    </ul>
 
-    {% if household.addresses|length == 0 %}
-        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-    {% else %}
-        <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
-    {% endif %}
+    <div class="address-timeline grid">
 
-    {% for address in household.addresses %}
+        {% if household.addresses|length == 0 %}
+            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+        {% else %}
+            <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
+        {% endif %}
 
-        <div class="col-b"></div>
+        {% set row = 0 %}
+        {% set previousRowFrom = null %}
 
-        <div class="col-c content{{ ' row' ~ loop.index }}">
-            <div class="address">
-                {% if address.isNoAddress == true %}
-                    <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-                {% else %}
-                    {% if address.street is not empty %}
-                    <div class="street">
-                        <span class="streetNumber">{{ address.street }}</span>
-                        {% if address.streetNumber is not empty %}
-                            <span class="streetNumber">, {{ address.streetNumber }}</span>
-                        {% endif %}
-                    </div>
-                    {% endif %}
-                    {% if address.postCode is not empty %}
-                        <div class="postCode">
-                            <span>{{ address.postCode.code }}</span> <span>{{ address.postCode.name }}</span>
-                            <span class="country">({{ address.postCode.country.name|localize_translatable_string }})</span>
-                        </div>
+        {% for address in household.addresses %}
+
+            {% set row = row + 1 %}
+            {% if address.validTo is not empty and address.validTo < previousRowFrom %}
+
+                <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="date">
+                    {% if address.validTo is not empty %}
+                        {{ address.validTo|format_date('short') }}
                     {% endif %}
+                </div>
 
+                {% set row = row + 1 %}
+            {% endif %}
+
+            <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+            <div class="{{ 'row' ~ row ~ ' ' }}col-c content">
+                {{ address|chill_entity_render_box({
+                    'render': 'bloc',
+                    'multiline': true,
+                    'extended_infos': true,
+                    'has_no_address': true
+                }) }}
+                <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>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="date">
+                {% if address.validFrom is not empty %}
+                    {{ address.validFrom|format_date('short') }}
                 {% endif %}
             </div>
 
-            <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>
-                </li>
-            </ul>
-        </div>
+            {% set previousRowFrom = address.validFrom %}
+        {% endfor %}
+    </div>
 
-        <div class="date">
-            {% if address.validFrom is not empty %}
-                {{ address.validFrom|format_date('long') }}
-            {% endif %}
-        </div>
-
-    {% endfor %}
-
-</div>
-
-<ul class="record_actions">
-    <li>
-        <a class="btn btn-create"
-        href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-        {{ 'Move household'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_household_summary', { 'household_id' : household.id } ) }}" class="btn btn-cancel">
+                {{ 'Back to household'|trans }}
+            </a>
+        </li>
+        <li>
+            <a class="btn btn-create"
+            href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+            {{ 'Move household'|trans }}
+            </a>
+        </li>
+    </ul>
 
 </div>
 {% endblock %}