Merge branch 'household_integration' into person_renderbox_thirdparty_onthefly

This commit is contained in:
Mathieu Jaumotte 2021-09-15 12:19:18 +02:00
commit df28494f16

View File

@ -34,6 +34,9 @@
</div> </div>
{% endif %} {% endif %}
<pre>WIP .. AccompanyingCourse Resume dashboard</pre>
{#
<h1>{{ 'Resume Accompanying Course'|trans }}</h1> <h1>{{ 'Resume Accompanying Course'|trans }}</h1>
<div class="associated-persons mb-5"> <div class="associated-persons mb-5">
@ -50,11 +53,13 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
#}
{% if 'DRAFT' != accompanyingCourse.step %} {% if 'DRAFT' != accompanyingCourse.step %}
{% if withoutHousehold|length > 0 %} {% if withoutHousehold|length > 0 %}
{% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %} {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{#
</div> </div>
<div class="location mb-5"> <div class="location mb-5">
@ -75,12 +80,11 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
#}
{% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %} {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
{% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %} {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
{% endif %} {% endif %}
{#
</div> </div>
<div class="requestor mb-5"> <div class="requestor mb-5">
@ -128,6 +132,8 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
#}
<div class="mt-5"></div>
<div class="social-actions mb-5"> <div class="social-actions mb-5">
<h2 class="mb-3">{{ 'Social actions'|trans }}</h2> <h2 class="mb-3">{{ 'Social actions'|trans }}</h2>