household: if no addresses, misc stuffs

This commit is contained in:
Mathieu Jaumotte 2021-08-01 16:17:29 +02:00
parent 96e979f92d
commit a096266ca5
3 changed files with 150 additions and 145 deletions

View File

@ -1,5 +1,5 @@
{% block content %} {% block content %}
<div class="flex-table accompanyingcourse-list"> <div class="flex-table">
{% for accompanying_period in accompanying_periods %} {% for accompanying_period in accompanying_periods %}
<div class="item-bloc"> <div class="item-bloc">
<div class="item-row"> <div class="item-row">
@ -102,6 +102,7 @@
<div class="item-row"> <div class="item-row">
<ul class="record_actions"> <ul class="record_actions">
{# TODO if enable_accompanying_course_with_multiple_persons is true ... #} {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
<li> <li>
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
@ -110,6 +111,8 @@
{{ 'See this period'|trans }} {{ 'See this period'|trans }}
</a> </a>
</li> </li>
{# TODO cause error in household context. only works in person context
<li> <li>
<a href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" <a href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
class="btn btn-update" title="{{ 'Edit Accompanying Course'|trans }}"></a> class="btn btn-update" title="{{ 'Edit Accompanying Course'|trans }}"></a>
@ -132,6 +135,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
#}
</ul> </ul>
</div> </div>

View File

@ -9,20 +9,20 @@
{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %} {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
<div class="form_control">
<ul class="record_actions"> <ul class="record_actions">
<li class="cancel"> <li class="cancel">
<a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel"> <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
{{ 'Household summary'|trans }} {{ 'Household summary'|trans }}
</a> </a>
</li> </li>
{#<li> {#
<li>
<a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create"> <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
{{ 'Create an accompanying period'|trans }} {{ 'Create an accompanying period'|trans }}
</a> </a>
</li>#} </li>
#}
</ul> </ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -7,6 +7,10 @@
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
{% if household.addresses|length == 0 %}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
{% else %}
<ul class="record_actions my-3"> <ul class="record_actions my-3">
<li style="margin: auto;"> <li style="margin: auto;">
<a class="btn btn-lg btn-create" <a class="btn btn-lg btn-create"
@ -18,11 +22,7 @@
<div class="address-timeline grid"> <div class="address-timeline grid">
{% 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> <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
{% endif %}
{% set row = 0 %} {% set row = 0 %}
{% set previousRowFrom = null %} {% set previousRowFrom = null %}
@ -68,6 +68,7 @@
{% set previousRowFrom = address.validFrom %} {% set previousRowFrom = address.validFrom %}
{% endfor %} {% endfor %}
</div> </div>
{% endif %}
<ul class="record_actions sticky-form-buttons"> <ul class="record_actions sticky-form-buttons">
<li class="cancel"> <li class="cancel">