use chill_entity_render_box/string and design a badge-person

This commit is contained in:
Mathieu Jaumotte 2021-08-21 14:56:10 +02:00
parent b301c1d405
commit 883cb858a9
4 changed files with 40 additions and 23 deletions

View File

@ -163,7 +163,7 @@ div.wrap-list {
width: 75%;
margin: auto 0 0 auto;
p.wl-item {
.wl-item {
margin: 0.1em;
padding: 0em;
display: inline-block;

View File

@ -27,5 +27,15 @@
}
}
// specific chill badge for persons
span.badge-person {
padding: 0 0.5em !important;
background-color: $white;
border: 1px solid $chill-ll-gray;
border-bottom: 2px solid $chill-green;
border-radius: 6px;
a {
text-decoration: none;
}
}

View File

@ -60,37 +60,38 @@
<div class="item-row separator">
<div class="wrap-list">
{% if accompanying_period.participations.count > 0 %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
<div class="wl-col list">
{% for p in accompanying_period.participations %}
<p class="wl-item">
<a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
{{ p.person.firstname ~ ' ' ~ p.person.lastname }}
</a>
</p>
{% endfor %}
</div>
</div>
{% endif %}
{% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Requestor'|trans }}</h3></div>
<div class="wl-col list">
{% if accompanying_period.requestorPerson is not null %}
<p class="wl-item">
{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
</p>
<span class="wl-item">{{ accompanying_period.requestorPerson|chill_entity_render_string }}</span>
{% endif %}
{% if accompanying_period.requestorThirdParty is not null %}
<p class="wl-item">
{{ accompanying_period.requestorThirdParty.name }}
</p>
<span class="wl-item">{{ accompanying_period.requestorThirdParty|chill_entity_render_string }}</span>
{% endif %}
</div>
</div>
{% endif %}
{% if accompanying_period.participations.count > 0 %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
<div class="wl-col list">
{% for p in accompanying_period.participations %}
<span class="wl-item badge-person">
<a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
{{ p.person|chill_entity_render_string }}
</a>
{# or in renderbox mode
{{ p.person|chill_entity_render_box({'render': 'label', 'addAltNames': false, 'addLink': true, 'hLevel': 5 }) }}
#}
</span>
{% endfor %}
</div>
</div>
{% endif %}
{% if accompanying_period.socialIssues.count > 0 %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>

View File

@ -71,26 +71,31 @@
{% for app in apps %}
<div class="wl-row separator">
<div class="wl-col title">
<div class="date">
{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
</div>
{% if app.accompanyingPeriod.user is not null %}
<div class="user">
<abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
{{ app.accompanyingPeriod.user|chill_entity_render_box }}
</div>
{% endif %}
</div>
<div class="wl-col list">
{% for issue in app.accompanyingPeriod.socialIssues %}
{{ issue|chill_entity_render_box }}
{% endfor %}
{# ^^ display all socialIssues
{# ^^ display all socialIssues, or slice vv
|slice(0,2)
{% if app.accompanyingPeriod.socialIssues|length > 2 %}
<span class="more">{{ 'and %number% other'|transchoice(app.accompanyingPeriod.socialIssues|length-2) }}</span>
{% endif %}
#}
<ul class="record_actions">
<li>
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}"
@ -99,6 +104,7 @@
</a>
</li>
</ul>
</div>
</div>
{% endfor %}