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

Merge remote-tracking branch 'origin/master' into issue545_datepicker

Browse Source
This commit is contained in:
Julien Fastré
2022-04-25 09:37:35 +02:00
parent c6be7955fd 83dd8f810c
commit 30bb2e8393
27 changed files with 307 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
View File

@@ -59,8 +59,8 @@ const appMessages = {
ok: "Oui, l'usager quitte le parcours",
show_household_number: "Voir le ménage (n° {id})",
show_household: "Voir le ménage",
person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.",
update_household: "Renseigner l'appartenance",
person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Veuillez les associer à un ménage dès que possible.",
update_household: "Associer à un ménage",
participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
},
requestor: {

1
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
View File

@@ -40,6 +40,7 @@
{% endif %}
{{ form_start(form) }}
{{ form_errors(form) }}
{{ form_errors(form.content) }}
{{ form_widget(form.content) }}
<ul class="record_actions">
<li>

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
View File

@@ -17,6 +17,8 @@
<div class="col-md-10">
<h1>{{ 'My accompanying periods'|trans }}</h1>
<p>{{ 'Number of periods'|trans }}: <span class="badge rounded-pill bg-primary">{{ pagination.totalItems }}</span></p>
<div class="flex-table accompanyingcourse-list">
{% for period in accompanyingPeriods %}
{% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}

8
src/Bundle/ChillPersonBundle/Resources/views/Notification/accompanying_course_designation.md.twig
View File

@@ -1,14 +1,14 @@
{{ 'period_notification.You are designated to a new period'|trans }}
{{ 'period_notification.You are designated to a new period'|trans|raw }}
{{ 'period_notification.See it online'|trans }}:
{{ 'period_notification.See it online'|trans|raw }}:
{{ absolute_url(path('chill_person_accompanying_course_index', {'accompanying_period_id': accompanyingCourse.id}, false)) }}
{{ 'period_notification.Persons are'|trans }}:
{{ 'period_notification.Persons are'|trans|raw }}:
{% for p in accompanyingCourse.getCurrentParticipations %}
* {{ p.person|chill_entity_render_string }}
{% endfor %}
{{ 'period_notification.Social issues are'|trans }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}.
{{ 'period_notification.Social issues are'|trans|raw }}: {% for s in accompanyingCourse.socialIssues %}{{ s|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}.