diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index c33fc636e..d9bc07ffb 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php @@ -75,7 +75,7 @@ class AccompanyingCourseController extends Controller return $this->redirectToRoute('chill_person_accompanying_course_edit', [ 'accompanying_period_id' => $period->getId() ]); - + } /** @@ -96,9 +96,15 @@ class AccompanyingCourseController extends Controller } } + $activities = $this->getDoctrine()->getManager()->getRepository('ChillActivityBundle:Activity')->findBy( + ['accompanyingPeriod' => $accompanyingCourse], + ['date' => 'DESC'], + ); + return $this->render('@ChillPerson/AccompanyingCourse/index.html.twig', [ 'accompanyingCourse' => $accompanyingCourse, - 'withoutHousehold' => $withoutHousehold + 'withoutHousehold' => $withoutHousehold, + 'activities' => $activities ]); } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 4c3ad8b56..364f8c7fd 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -67,9 +67,9 @@
{% set born = (p.person.gender == 'woman') ? 'née': 'né' %} - {% set gender = (p.person.gender == 'woman') ? 'fa-venus' : + {% set gender = (p.person.gender == 'woman') ? 'fa-venus' : (p.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %} - {% set genderTitle = (p.person.gender == 'woman') ? 'femme' : + {% set genderTitle = (p.person.gender == 'woman') ? 'femme' : (p.person.gender == 'man') ? 'homme' : 'neutre' %} {{ born ~ ' le ' ~ p.person.birthdate|format_date('short') }}
@@ -103,9 +103,9 @@ {% if p.person.isSharingHousehold %}{% set born = (r.person.gender == 'woman') ? 'née': 'né' %} - {% set gender = (r.person.gender == 'woman') ? 'fa-venus' : + {% set gender = (r.person.gender == 'woman') ? 'fa-venus' : (r.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %} - {% set genderTitle = (r.person.gender == 'woman') ? 'femme' : + {% set genderTitle = (r.person.gender == 'woman') ? 'femme' : (r.person.gender == 'homme') ? 'fa-mars' : 'neutre' %} {{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }}
@@ -174,10 +174,10 @@