Merge branch 'master' into notification/completion

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_confirm_delete.html.twig

@@ -0,0 +1,31 @@
+
+{% macro insert_onthefly(type, entity) %}
+    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+        action: 'show', displayBadge: true,
+        targetEntity: { name: type, id: entity.id },
+        buttonText: entity|chill_entity_render_string
+    } %}
+{% endmacro %}
+
+<div>
+    {% if accompanyingCourse.participations is not empty %}
+        <div class="col mb-4">
+            <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
+            {% for r in accompanyingCourse.participations %}
+                {{ _self.insert_onthefly('person', r.person) }}
+            {% endfor %}
+        </div>
+    {% endif %}
+
+    {% if accompanyingCourse.socialIssues is not empty %}
+        <div class="col mb-4">
+            <h4 class="item-key">{{ 'Social issues'|trans }}</h4>
+            {% for s in accompanyingCourse.socialIssues %}
+                {{ s|chill_entity_render_box }}
+            {% endfor %}
+        </div>
+    {% endif %}
+
+</div>
+
+

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_accompanying_course.html.twig

@@ -0,0 +1,18 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title %}{{ 'Delete accompanying period'|trans }}{% endblock %}
+
+
+{% block content %}
+
+    {% include '@ChillPerson/AccompanyingCourse/_confirm_delete.html.twig' %}
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Delete accompanying period'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the accompanying period "%id%" ?'|trans({ '%id%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_person_accompanying_course_edit',
+            'cancel_parameters' : {'accompanying_period_id' : accompanyingCourse.id},
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/confirm_delete_person.html.twig

@@ -0,0 +1,18 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title %}{{ 'Delete accompanying period'|trans }}{% endblock %}
+
+
+{% block content %}
+
+    {% include '@ChillPerson/AccompanyingCourse/_confirm_delete.html.twig' %}
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Delete accompanying period'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the accompanying period "%id%" ?'|trans({ '%id%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_person_accompanying_period_list',
+            'cancel_parameters' : {'person_id' : person_id},
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -154,6 +154,15 @@
             </div>
         {% endif %}
 
+        {% if accompanyingCourse.administrativeLocation is not null %}
+            <div class="mbloc col col-sm-6 col-lg-4">
+                <div class="administrative-location">
+                    <h4 class="item-key">{{ 'accompanying_course.administrative_location'|trans }}</h4>
+                    {{ accompanyingCourse.administrativeLocation.name }} ({{ accompanyingCourse.administrativeLocation.locationType.title|localize_translatable_string }})
+                </div>
+            </div>
+        {% endif %}
+
     </div>
 
     <div class="social-actions my-4">