Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

accompanyingPeriod button

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-21 10:32:11 +02:00
parent 026562c32f
commit 87a917d11c
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
View File

@ -34,13 +34,13 @@
</div> </div>
{% if context == 'person' and activity.accompanyingPeriod is not empty %} {% if context == 'person' and activity.accompanyingPeriod is not empty %}
<div class="accompanyingPeriodLink" style="margin-top: 1rem"> <div class="mt-3">
<a href="{{ chill_path_add_return_path( <a class="btn btn-sm btn-outline-primary"
"chill_person_accompanying_course_index", title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
{ 'accompanying_period_id': activity.accompanyingPeriod.id } href="{{ chill_path_add_return_path(
) }}"> "chill_person_accompanying_course_index",
<i class="fa fa-random"></i> { 'accompanying_period_id': activity.accompanyingPeriod.id }
{{ activity.accompanyingPeriod.id }} ) }}"><i class="fa fa-random"></i>
</a> </a>
</div> </div>
{% endif %} {% endif %}
@ -48,6 +48,7 @@
</div> </div>
<div class="item-col"> <div class="item-col">
<ul class="list-content"> <ul class="list-content">
{% if activity.user and t.userVisible %} {% if activity.user and t.userVisible %}
<li> <li>
<abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr> <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
@ -70,7 +71,7 @@
<li> <li>
<b>{{ 'location'|trans ~ ': ' }}</b> <b>{{ 'location'|trans ~ ': ' }}</b>
Domicile de l'usager Domicile de l'usager
{# {# TODO
{% if activity.location %}{{ activity.location }}{% endif %} {% if activity.location %}{{ activity.location }}{% endif %}
#} #}
</li> </li>

36
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
View File

@ -45,19 +45,15 @@
{% endif %} {% endif %}
{% if context == 'user' and calendar.accompanyingPeriod is not empty %} {% if context == 'user' and calendar.accompanyingPeriod is not empty %}
<div class="accompanyingPeriodLink" style="margin-top: 1rem"> <a class="btn btn-sm btn-outline-primary"
<a title="{{ 'Period number %number%'|trans({'%number%': calendar.accompanyingPeriod.id}) }}"
href="{{ chill_path_add_return_path( href="{{ chill_path_add_return_path(
"chill_user_accompanying_course_index", "chill_user_accompanying_course_index",
{ 'accompanying_period_id': calendar.accompanyingPeriod.id } { 'accompanying_period_id': calendar.accompanyingPeriod.id }
) }}" ) }}"><i class="fa fa-random"></i>
>
<i class="fa fa-random"></i>
{{ calendar.accompanyingPeriod.id }}
</a> </a>
</div>
{% endif %} {% endif %}
</div> </div>
<div class="item-col"> <div class="item-col">
<ul class="list-content"> <ul class="list-content">
@ -66,14 +62,14 @@
<b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b> <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
</li> </li>
{% endif %} {% endif %}
{% if calendar.mainUser is not empty %} {% if calendar.mainUser is not empty %}
<li> <li>
<b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b> <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
</li> </li>
{% endif %} {% endif %}
<li> <li>
{%- if calendar.comment.isEmpty -%} {%- if calendar.comment.isEmpty -%}
<span class="chill-no-data-statement">{{ 'No comments'|trans }}</span> <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
@ -81,8 +77,8 @@
{{ calendar.comment|chill_entity_render_box }} {{ calendar.comment|chill_entity_render_box }}
{%- endif -%} {%- endif -%}
</li> </li>
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
@ -107,19 +103,19 @@
</ul> </ul>
</div> </div>
</div> </div>
{% {%
if calendar.comment.comment is not empty if calendar.comment.comment is not empty
or calendar.users|length > 0 or calendar.users|length > 0
or calendar.thirdParties|length > 0 or calendar.thirdParties|length > 0
or calendar.users|length > 0 or calendar.users|length > 0
%} %}
<div class="item-row details"> <div class="item-row details">
<div class="item-col"> <div class="item-col">
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %} {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
</div> </div>
{% if calendar.comment.comment is not empty %} {% if calendar.comment.comment is not empty %}
<div class="item-col comment"> <div class="item-col comment">
{{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }} {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
@ -127,7 +123,7 @@
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

2
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
View File

@ -1,5 +1,5 @@
$social-issue-color: #4bafe8; $social-issue-color: #4bafe8;
$social-action-color: $pink; $social-action-color: $orange;
/// ///
/// Social Issue mixin /// Social Issue mixin

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -146,6 +146,7 @@ and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number%
'Period opened': 'Période ouverte' 'Period opened': 'Période ouverte'
'Close accompanying period': 'Clôre la période' 'Close accompanying period': 'Clôre la période'
'Open accompanying period': 'Ouvrir la période' 'Open accompanying period': 'Ouvrir la période'
Period number %number%: 'Période n° %number%'
'Add an accompanying period in the past': Ajouter une période d'accompagnement dans le passé 'Add an accompanying period in the past': Ajouter une période d'accompagnement dans le passé
Begin a new accompanying period: Commencer une nouvelle période d'accompagnement Begin a new accompanying period: Commencer une nouvelle période d'accompagnement
Create an accompanying period: Créer une période d'accompagnement Create an accompanying period: Créer une période d'accompagnement