resume page: add persons and others infos

This commit is contained in:
Mathieu Jaumotte 2021-11-22 17:51:45 +01:00
parent 92753604fa
commit 4f1c373704
4 changed files with 45 additions and 5 deletions

View File

@ -2,7 +2,11 @@
{% for activity in activities | slice(0,5) %} {% for activity in activities | slice(0,5) %}
{% set t = activity.type %} {% set t = activity.type %}
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a> {#
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
class="btn btn-sm btn-show" title="{{ 'voir' }}">
</a>
#}
{% include '@ChillActivity/Activity/activity-badge-title.html.twig' %} {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}

View File

@ -52,13 +52,43 @@
{% if accompanyingCourse.locationStatus != 'none' %} {% if accompanyingCourse.locationStatus != 'none' %}
{{ accompanyingCourse.location|chill_entity_render_box }} {{ accompanyingCourse.location|chill_entity_render_box }}
{% endif %} {% endif %}
<!--
<div class="mt-5">
<h4>Origine de la demande</h4>
<p>bim bam boum</p>
</div>
<div class="mt-3">
<h4>Services</h4>
<ul>
<li>one</li>
<li>two</li>
</ul>
</div>
-->
</div> </div>
{% if accompanyingCourse.resources is not empty {% if accompanyingCourse.participations is not empty
and (accompanyingCourse.requestorThirdParty is not null or accompanyingCourse.resources is not empty
or (accompanyingCourse.requestorThirdParty is not null
or accompanyingCourse.requestorPerson is not null) or accompanyingCourse.requestorPerson is not null)
%} %}
<div class="col-md-6 resources mb-5"> <div class="col-md-6 persons mb-5">
<div class="mb-3">
{% if accompanyingCourse.participations is not empty %}
<h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
{% for r in accompanyingCourse.participations %}
{% if r.person is not null %}
{{ _self.insert_onthefly('person', r.person) }}
{% elseif r.thirdParty is not null %}
{{ _self.insert_onthefly('thirdparty', r.thirdParty) }}
{% endif %}
{% endfor %}
{% else %}
<span class="chill-no-data-statement visually-hidden">{{ 'No participations'|trans }}</span>
{% endif %}
</div>
<div class="mb-3"> <div class="mb-3">
{% if accompanyingCourse.requestorPerson is not null %} {% if accompanyingCourse.requestorPerson is not null %}
<h4 class="item-key">{{ 'Requestor'|trans }}</h4> <h4 class="item-key">{{ 'Requestor'|trans }}</h4>

View File

@ -1,6 +1,11 @@
<div class="accompanying_course_work-list"> <div class="accompanying_course_work-list">
{% for w in works | slice(0,5) %} {% for w in works | slice(0,5) %}
<a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"></a>
{#
<a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
class="btn btn-sm btn-show" title="{{ 'voir' }}">
</a>
#}
<h2 class="badge-title"> <h2 class="badge-title">
<span class="title_label"> <span class="title_label">

View File

@ -208,6 +208,7 @@ See this period: Voir cette période
Requestor: Demandeur Requestor: Demandeur
No requestor: Pas de demandeur No requestor: Pas de demandeur
No resources: "Pas d'interlocuteurs privilégiés" No resources: "Pas d'interlocuteurs privilégiés"
Persons associated: Usagers concernés
Referrer: Référent Referrer: Référent
Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible. Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
Add to household now: Ajouter à un ménage Add to household now: Ajouter à un ménage