mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-12 13:24:25 +00:00
Add minor fixes to summary page:
* add messages when no resources * add address to person * replace household link label with household number
This commit is contained in:
parent
a35f3363b2
commit
1119e20a49
@ -91,7 +91,7 @@
|
|||||||
<li>
|
<li>
|
||||||
<i class="fa fa-li fa-map-marker"></i>
|
<i class="fa fa-li fa-map-marker"></i>
|
||||||
{%- if p.person.lastAddress is not empty -%}
|
{%- if p.person.lastAddress is not empty -%}
|
||||||
{{ p.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
{{ p.person.currentHouseholdAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
@ -110,7 +110,7 @@
|
|||||||
) }}"
|
) }}"
|
||||||
class="sc-button">
|
class="sc-button">
|
||||||
<i class="fa fa-home"></i>
|
<i class="fa fa-home"></i>
|
||||||
{{ 'household.Household file'|trans }}
|
n° {{ p.person.getCurrentHousehold.id }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -124,101 +124,106 @@
|
|||||||
|
|
||||||
|
|
||||||
<h2>{{ 'Resources'|trans }}</h2>
|
<h2>{{ 'Resources'|trans }}</h2>
|
||||||
<div class="flex-bloc">
|
|
||||||
{% for r in accompanyingCourse.resources %}
|
|
||||||
<div class="item-bloc">
|
|
||||||
{% if r.person %}
|
|
||||||
|
|
||||||
<div class="item-row">
|
{% if accompanyingCourse.resources|length == 0 %}
|
||||||
<div class="item-col">
|
<p class="chill-no-data-statement">{{ 'Any resource for this accompanying course'|trans }}</p>
|
||||||
<h3>
|
{% else %}
|
||||||
{{ r.person.firstname ~ ' ' ~ r.person.lastname }}
|
<div class="flex-bloc">
|
||||||
<span class="badge badge-pill badge-secondary">{{ 'Usager' }}</span>
|
{% for r in accompanyingCourse.resources %}
|
||||||
</h3>
|
<div class="item-bloc">
|
||||||
<p>
|
{% if r.person %}
|
||||||
{% set born = (r.person.gender == 'woman') ? 'née': 'né' %}
|
|
||||||
{% set gender = (r.person.gender == 'woman') ? 'fa-venus' :
|
|
||||||
(r.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
|
|
||||||
{% set genderTitle = (r.person.gender == 'woman') ? 'femme' :
|
|
||||||
(r.person.gender == 'homme') ? 'fa-mars' : 'neutre' %}
|
|
||||||
<i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="item-col">
|
|
||||||
<ul class="list-content fa-ul">
|
|
||||||
<li>
|
|
||||||
{% if r.person.mobilenumber %}
|
|
||||||
<i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.person.mobilenumber }}">{{ r.person.mobilenumber }}</a>
|
|
||||||
{% else %}
|
|
||||||
<i class="fa fa-li fa-phone"></i>
|
|
||||||
{% if r.person.phonenumber %}
|
|
||||||
<a href="{{ 'tel:' ~ r.person.phonenumber }}">{{ r.person.phonenumber }}</a>
|
|
||||||
{% else %}
|
|
||||||
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<i class="fa fa-li fa-map-marker"></i>
|
|
||||||
{%- if r.person.lastAddress is not empty -%}
|
|
||||||
{{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
|
||||||
{%- else -%}
|
|
||||||
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
|
||||||
{%- endif -%}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<ul class="record_actions">
|
|
||||||
<li>
|
|
||||||
<a href="{{ path('chill_person_view', { person_id: r.person.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endif %}
|
<div class="item-row">
|
||||||
{% if r.thirdParty %}
|
<div class="item-col">
|
||||||
|
<h3>
|
||||||
|
{{ r.person.firstname ~ ' ' ~ r.person.lastname }}
|
||||||
|
<span class="badge badge-pill badge-secondary">{{ 'Usager' }}</span>
|
||||||
|
</h3>
|
||||||
|
<p>
|
||||||
|
{% set born = (r.person.gender == 'woman') ? 'née': 'né' %}
|
||||||
|
{% set gender = (r.person.gender == 'woman') ? 'fa-venus' :
|
||||||
|
(r.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
|
||||||
|
{% set genderTitle = (r.person.gender == 'woman') ? 'femme' :
|
||||||
|
(r.person.gender == 'homme') ? 'fa-mars' : 'neutre' %}
|
||||||
|
<i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="item-col">
|
||||||
|
<ul class="list-content fa-ul">
|
||||||
|
<li>
|
||||||
|
{% if r.person.mobilenumber %}
|
||||||
|
<i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.person.mobilenumber }}">{{ r.person.mobilenumber }}</a>
|
||||||
|
{% else %}
|
||||||
|
<i class="fa fa-li fa-phone"></i>
|
||||||
|
{% if r.person.phonenumber %}
|
||||||
|
<a href="{{ 'tel:' ~ r.person.phonenumber }}">{{ r.person.phonenumber }}</a>
|
||||||
|
{% else %}
|
||||||
|
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<i class="fa fa-li fa-map-marker"></i>
|
||||||
|
{%- if r.person.lastAddress is not empty -%}
|
||||||
|
{{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
||||||
|
{%- else -%}
|
||||||
|
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
||||||
|
{%- endif -%}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<ul class="record_actions">
|
||||||
|
<li>
|
||||||
|
<a href="{{ path('chill_person_view', { person_id: r.person.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="item-row">
|
{% endif %}
|
||||||
<div class="item-col">
|
{% if r.thirdParty %}
|
||||||
<h3>
|
|
||||||
{{ r.thirdParty.name }}
|
|
||||||
<span class="badge badge-pill badge-secondary">{{ 'Tiers' }}</span>
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="item-col">
|
|
||||||
<ul class="list-content fa-ul">
|
|
||||||
<li><i class="fa fa-li fa-envelope-o"></i>
|
|
||||||
<a href="{{ 'mailto:' ~ r.thirdParty.email }}">
|
|
||||||
{{ r.thirdParty.email|chill_print_or_message("thirdparty.No_email") }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li><i class="fa fa-li fa-phone"></i>
|
|
||||||
{% if r.thirdParty.telephone %}
|
|
||||||
<a href="{{ 'tel:' ~ r.thirdParty.telephone }}">{{ r.thirdParty.telephone }}</a>
|
|
||||||
{% else %}
|
|
||||||
<span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
|
|
||||||
{% endif %}
|
|
||||||
</li>
|
|
||||||
<li><i class="fa fa-li fa-map-marker"></i>
|
|
||||||
{%- if r.thirdParty.address is not empty -%}
|
|
||||||
{{ r.thirdParty.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
|
||||||
{%- else -%}
|
|
||||||
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
|
||||||
{%- endif -%}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<ul class="record_actions">
|
|
||||||
<li>
|
|
||||||
<a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.thirdParty.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endif %}
|
<div class="item-row">
|
||||||
</div>
|
<div class="item-col">
|
||||||
{% endfor %}
|
<h3>
|
||||||
</div>
|
{{ r.thirdParty.name }}
|
||||||
|
<span class="badge badge-pill badge-secondary">{{ 'Tiers' }}</span>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="item-col">
|
||||||
|
<ul class="list-content fa-ul">
|
||||||
|
<li><i class="fa fa-li fa-envelope-o"></i>
|
||||||
|
<a href="{{ 'mailto:' ~ r.thirdParty.email }}">
|
||||||
|
{{ r.thirdParty.email|chill_print_or_message("thirdparty.No_email") }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li><i class="fa fa-li fa-phone"></i>
|
||||||
|
{% if r.thirdParty.telephone %}
|
||||||
|
<a href="{{ 'tel:' ~ r.thirdParty.telephone }}">{{ r.thirdParty.telephone }}</a>
|
||||||
|
{% else %}
|
||||||
|
<span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
|
<li><i class="fa fa-li fa-map-marker"></i>
|
||||||
|
{%- if r.thirdParty.address is not empty -%}
|
||||||
|
{{ r.thirdParty.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
|
||||||
|
{%- else -%}
|
||||||
|
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
|
||||||
|
{%- endif -%}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<ul class="record_actions">
|
||||||
|
<li>
|
||||||
|
<a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.thirdParty.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<h2>{{ 'Social actions'|trans }}</h2>
|
<h2>{{ 'Social actions'|trans }}</h2>
|
||||||
|
|
||||||
|
|||||||
@ -189,6 +189,7 @@ See accompanying period: Voir cette période d'accompagnement
|
|||||||
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
|
||||||
|
Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
|
||||||
|
|
||||||
# pickAPersonType
|
# pickAPersonType
|
||||||
Pick a person: Choisir une personne
|
Pick a person: Choisir une personne
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user