From 2688c0f0ce12a77b5c192b51897f47d0df6d17cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 28 Jun 2021 23:48:06 +0200
Subject: [PATCH] fix missing div in accompanying course work list

---
 .../views/AccompanyingCourse/index.html.twig  | 154 +++++++++---------
 .../list_by_accompanying_period.html.twig     |   2 +-
 .../translations/messages.fr.yml              |   1 +
 3 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 09eee9351..14024bb9c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -222,90 +222,94 @@
 
     <h2>{{ 'Social actions'|trans }}</h2>
 
-    {% for w in works %}
-    <div class="item">
-        <div class="title">
-          <h2 class="action_title">
-            {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
-          </h2>
-        </div>
-
-        <div class="timeline">
-          <ul class="timeline">
-            <li class="completed">
-              <div class="date">
-                <span>{{ w.createdAt|format_date('long') }}</span>
-              </div>
-              <div class="label">
-                <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
-              </div>
-            </li>
-            <li class="completed">
-              <div class="date">
-                <span>{{ w.startDate|format_date('long') }}</span>
-              </div>
-              <div class="label">
-                <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
-              </div>
-            </li>
-            <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
-              <div class="date">
-                <span>{{ w.endDate|format_date('long') }}</span>
-              </div>
-              <div class="label">
-                <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
-              </div>
-            </li>
-          </ul>
-        </div>
-
-        {% if w.results|length > 0 %}
-          <div class="objective_results objective_results__without-objectives">
-            <div class="obj without_objective">
-              <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
-              <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
-            </div>
-            <div class="res results">
-              <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-              <ul class="result_list">
-                {% for r in w.results %}
-                  <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
-                {% endfor %}
-              </ul>
-            </div>
+    <div id="accompanying_course_work_list">
+      {% for w in works %}
+      <div class="item">
+          <div class="title">
+            <h2 class="action_title">
+              {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
+            </h2>
           </div>
-        {% endif %}
 
-        {% if w.goals|length > 0 %}
-          {% for g in w.goals %}
-            <div class="objective_results objective_results--with-objectives">
-              <div class="objective obj">
+          <div class="timeline">
+            <ul class="timeline">
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.createdAt|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.startDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
+                <div class="date">
+                  <span>{{ w.endDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+
+          {% if w.results|length > 0 %}
+            <div class="objective_results objective_results__without-objectives">
+              <div class="obj without_objective">
                 <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
-                <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
               </div>
-              <div class="results res">
-                {% if g.results|length == 0 %}
-                  <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-                  <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
-                {% else %}
-                  <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-                  <ul class="result_list">
-                    {% for r in g.results %}
-                      <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
-                    {% endfor %}
-                  </ul>
-                {% endif %}
+              <div class="res results">
+                <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                <ul class="result_list">
+                  {% for r in w.results %}
+                    <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                  {% endfor %}
+                </ul>
               </div>
             </div>
-          {% endfor %}
-        {% endif %}
+          {% endif %}
 
-        <div class="updatedBy">
-          {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
-        </div>
+          {% if w.goals|length > 0 %}
+            {% for g in w.goals %}
+              <div class="objective_results objective_results--with-objectives">
+                <div class="objective obj">
+                  <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                  <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+                </div>
+                <div class="results res">
+                  {% if g.results|length == 0 %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
+                  {% else %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <ul class="result_list">
+                      {% for r in g.results %}
+                        <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                      {% endfor %}
+                    </ul>
+                  {% endif %}
+                </div>
+              </div>
+            {% endfor %}
+          {% endif %}
 
+          <div class="updatedBy">
+            {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
+          </div>
+
+      </div>
+      {% else %}
+        <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>    
+      {% endfor %}
     </div>
-    {% endfor %}
 
 
     {% block contentActivity %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index 28626f7c2..8dfe1bfd5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -102,7 +102,7 @@
         </div>
       </div>
     {% else %}
-      <p class="chill-no-data-statement">{{ 'accompanying_course_work.No work'|trans }}</p>
+      <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
     {% endfor %}
    </div>
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index b27128ff7..234eeb656 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -357,4 +357,5 @@ accompanying_course_work:
     no_results: Aucun résultat - orientation
     results: Résultats - orientations
     goal: Objectif - motif - dispositif
+    Any work: Aucune action d'accompagnement