From 91bee4aad3b6f693967ef70351693cc723faaac7 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Dec 2021 18:55:21 +0100
Subject: [PATCH] wip goal-result on resume page

---
 .../AccompanyingCourseWork/index.html.twig    |  2 --
 ...st_recent_by_accompanying_period.html.twig | 36 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index eb885d50a..cf91a4e20 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -155,7 +155,6 @@
                         </div>
 
                         <div class="item-row column">
-                        {# SEULEMENT SI DÉTAILLÉ
                             {% if w.results|length > 0 %}
                                 <div class="objective_results without-objectives">
                                     <div class="objective">
@@ -194,7 +193,6 @@
                                     </div>
                                 {% endfor %}
                             {% endif %}
-                        #}
                         </div>
 
                         <div class="item-row separator">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index b5fcb6c40..4bab107c5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -43,7 +43,39 @@
                 </ul>
 
                 <ul class="small_in_title evaluations mb-3">
-                    {% for e in w.accompanyingPeriodWorkEvaluations %}
+                    A{% for g in w.goals %}
+                        <li class="with-objectives">
+                            <span class="item-key">{{ 'accompanying_course_work.goal'|trans ~ ' : ' }}</span>
+                            {{ g.goal.title|localize_translatable_string }}
+                            {% if g.results|length > 0 %}
+                                <span class="item-key">{{ 'accompanying_course_work.results'|trans }}</span>
+                                <ul>
+                                    {% for r in g.results %}
+                                        <li>
+                                            {{ r.title|localize_translatable_string }}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            {% endif %}
+                        </li>
+                    {% endfor %}
+                    B{% if w.results|length > 0 %}
+                        <li class="without-objectives">
+                            <span class="item-key">{{ 'accompanying_course_work.goal'|trans }}</span>
+                            <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+                            {% if w.results %}
+                                <span class="item-key">{{ 'accompanying_course_work.results'|trans }}</span>
+                                <ul>
+                                    {% for r in w.results %}
+                                        <li>
+                                            {{ r.title|localize_translatable_string }}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            {% endif %}
+                        </li>
+                    {% endif %}
+                    C{% for e in w.accompanyingPeriodWorkEvaluations %}
                         <li>
                             <span class="item-key">{{ 'accompanying_course_work.social_evaluation'|trans ~ ' : ' }}</span>
                             {{ e.evaluation.title|localize_translatable_string }}
@@ -55,7 +87,7 @@
                                 </li>
                                 {% endif %}
                                 {% if e.endDate %}
-                                    <li>
+                                <li>
                                     <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                                     <b>{{ e.endDate|format_date('short') }}</b>
                                 </li>