Merge branch 'master' into notification/completion

This commit is contained in:
2022-01-10 16:11:06 +01:00
78 changed files with 1268 additions and 277 deletions

View File

@@ -1,9 +1,15 @@
{% macro recordAction(period) %}
{% macro recordAction(period, person = null) %}
{# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
<li>
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
</li>
{% if period.step == 'DRAFT' %}
<li>
<a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
</li>
{% endif %}
{# DISABLED if new accompanying course, this is not necessary
{% if person is defined %}
<li>
@@ -39,7 +45,7 @@
{% for period in accompanying_periods %}
{% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
'recordAction': _self.recordAction(period)
'recordAction': _self.recordAction(period, person)
} %}
{% endfor %}