Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-28 01:25:00 +00:00
Code Issues Actions Projects Releases Wiki Activity

add concerned parties in show activity page (2 contexts)

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-06-03 19:13:58 +02:00
parent 32b3d74a1b
commit 987815471c
14 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig Normal file
View File

@@ -0,0 +1,37 @@
{% if context == 'person' %}
{% set blocs = [
{ 'title': 'Persons associated'|trans, 'items': entity.persons },
{ 'title': 'ThirdParties'|trans, 'items': entity.thirdParties },
{ 'title': 'Users concerned'|trans, 'items': entity.users },
] %}
{% else %}
{% set blocs = [
{ 'title': 'Persons in accompanying course'|trans, 'items': entity.persons },
{ 'title': 'Third persons'|trans, 'items': entity.persons },
{ 'title': 'ThirdParties'|trans, 'items': entity.thirdParties },
{ 'title': 'Users concerned'|trans, 'items': entity.users },
] %}
{% endif %}
<div class="flex-bloc concerned-groups {{ context }}">
{% for bloc in blocs %}
<div class="item-bloc">
<div class="item-row">
<div class="item-col">
<h4>{{ bloc.title }}</h4>
</div>
<div class="item-col">
<ul class="list-content">
{% for item in bloc.items %}
<li>
<span class="badge badge-primary">
{{ item|chill_entity_render_box({'only_denomination': true}) }}
</span>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endfor %}
</div>

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
View File

@@ -25,7 +25,7 @@
{{ form_row(edit_form.reasons) }}
{% endif %}
<h2 class="chill-red">Parties concernées</h2>
<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
{%- if edit_form.persons is defined -%}
{{ form_widget(edit_form.persons) }}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
View File

@@ -26,7 +26,7 @@
{{ form_row(form.reasons) }}
{% endif %}
<h2 class="chill-red">Parties concernées</h2>
<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
{%- if form.persons is defined -%}
{{ form_widget(form.persons) }}

9
src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
View File

@@ -1,5 +1,4 @@
<h1 >{{ "Activity"|trans }}</h1>
<dl class="chill_view_data">
<dt class="inline">{{ 'User'|trans }}</dt>
<dd>{{ entity.user }}</dd>
@@ -8,8 +7,13 @@
<dt class="inline">{{ 'Scope'|trans }}</dt>
<dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
{% endif %}
</dl>
<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context } %}
<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
<dl class="chill_view_data">
{%- if entity.person is defined -%}
<dt class="inline">{{ 'Person'|trans }}</dt>
@@ -39,7 +43,6 @@
{%- else -%}
<dd>{{ entity.comment|chill_entity_render_box }}</dd>
{%- endif -%}
</dl>
{% set person_id = null %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
View File

@@ -7,5 +7,5 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block content -%}
{% include 'ChillActivityBundle:Activity:show.html.twig' %}
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
{% endblock content %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
View File

@@ -7,5 +7,5 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block personcontent -%}
{% include 'ChillActivityBundle:Activity:show.html.twig' %}
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
{% endblock personcontent %}