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

Activity show page: move notify button and notification-box in post menu area

Browse Source
This commit is contained in:
Mathieu Jaumotte 2022-01-10 15:14:50 +01:00
parent 5a739380cd
commit 8afd1ee275
6 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,15 +3,9 @@
<h1>{{ "Activity"|trans }}</h1>
{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
{% if notifications is not empty %}
{{ notifications|raw }}
{% endif %}
<div class="flex-table">
<div class="item-bloc">
<div class="item-row">
<div class="wrap-list">
<div class="wl-row">
@ -203,9 +197,6 @@
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">{{ 'notification.Notify'|trans }}</a>
</li>
{% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
<li>
<a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">

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

@ -21,3 +21,21 @@
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock content %}
{% block block_post_menu %}
<div class="post-menu pt-4">
<div class="d-grid gap-2">
<a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
<i class="fa fa-paper-plane fa-fw"></i>
{{ 'notification.Notify'|trans }}
</a>
</div>
{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
{% if notifications is not empty %}
{{ notifications|raw }}
{% endif %}
</div>
{% endblock %}

22
src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
View File

@ -1,10 +1,20 @@
{# available variables: notification, activity #}
{% if activity is not null %}
{% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
<a href="{{ path('chill_activity_activity_show', {'id': activity.id }) }}">Go to Activity</a>
{% else %}
you are not allowed to see it details. This is the minimal data: {{ activity.id }}
{% endif %}
<div class="flex-table">
{% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
<a href="{{ path('chill_activity_activity_show', {'id': activity.id }) }}">Go to Activity</a>
{% else %}
<div class="alert alert-warning border-warning border-1">
{{ 'This is the minimal activity data'|trans ~ ': ' ~ activity.id }}<br>
{{ 'you are not allowed to see it details'|trans }}
</div>
{% endif %}
</div>
{% else %}
You get notified of an activity which does not exists any more.
<div class="alert alert-warning border-warning border-1">
{{ 'You get notified of an activity which does not exists any more'|trans }}
</div>
{% endif %}

4
src/Bundle/ChillActivityBundle/translations/messages.fr.yml
View File

@ -224,3 +224,7 @@ Aggregate by activity reason: Aggréger par sujet de l'activité
Last activities: Les dernières activités
See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide.
you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès.
This is the minimal activity data: Activité n°

4
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
View File

@ -14,8 +14,8 @@
} %}
{% else %}
<div class="alert alert-warning border-warning border-1">
{{ 'This is the minimal details'|trans ~ ': ' ~ period.id }}<br>
{{ 'You are getting a notification for a period you are not allowed to see.'|trans }}
{{ 'This is the minimal period details'|trans ~ ': ' ~ period.id }}<br>
{{ 'You are getting a notification for a period you are not allowed to see'|trans }}
</div>
{% endif %}
</div>

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

@ -485,6 +485,6 @@ period_notification:
Social issues are: Les problématiques sociales renseignées sont les suivantes
See it online: Visualisez le parcours en ligne
You are getting a notification for a period which does not exists any more: Cette notification ne correspond pas à une période d'accompagnement valide
You are getting a notification for a period you are not allowed to see.: La notification fait référence à une période d'accompagnement à laquelle vous n'avez pas accès.
This is the minimal details: Dossier n°
You are getting a notification for a period which does not exists any more: Cette notification ne correspond pas à une période d'accompagnement valide.
You are getting a notification for a period you are not allowed to see: La notification fait référence à une période d'accompagnement à laquelle vous n'avez pas accès.
This is the minimal period details: Période d'accompagnement n°