From 8809abedf683ffe964e20f29843a77c76cce3a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 12 Jul 2022 18:08:54 +0200
Subject: [PATCH] fixed: rendering of course in list of courses by household

---
 .../views/AccompanyingPeriod/_list.html.twig  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 986392056..b140bb4c1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -48,10 +48,13 @@
 {% endmacro %}
 
 {% block content %}
+
+    {# WARNING: this list is rendered in either person context or houshold context #}
+
     {%- set acps = [] %}
     {%- set acpsClosed = [] %}
     {% for acp in accompanying_periods %}
-        {% if acp.step == 'CLOSED' or (acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
+        {% if acp.step == 'CLOSED' or (person is defined and acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
             {%- set acpsClosed = acpsClosed|merge([acp]) %}
         {% else %}
             {%- set acps = acps|merge([acp]) %}
@@ -69,24 +72,30 @@
     </div>
 
     {% if acpsClosed|length > 0 %}
-        <div class="accordion" id="member_{{ person.id }}">
+        {% if person is defined %}
+            {% set identifier = person.id %}
+        {% else  %}
+            {% set identifier = household.id %}
+        {% endif %}
+
+        <div class="accordion" id="member_{{ identifier }}">
             <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_{{ person.id }}">
+                <h2 class="accordion-header" id="heading_{{ identifier }}">
                     <button
                         class="accordion-button collapsed"
                         type="button"
                         data-bs-toggle="collapse"
-                        data-bs-target="#collapse_{{ person.id }}"
+                        data-bs-target="#collapse_{{ identifier }}"
                         aria-expanded="false"
-                        aria-controls="collapse_{{ person.id }}">
+                        aria-controls="collapse_{{ identifier }}">
                         <span class="folded">{{ 'periods.show closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                         <span class="unfolded text-secondary">{{ 'periods.hide closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                     </button>
                 </h2>
 
-                <div id="collapse_{{ person.id }}"
+                <div id="collapse_{{ identifier }}"
                      class="accordion-collapse collapse"
-                     aria-labelledby="heading_{{ person.id }}"
+                     aria-labelledby="heading_{{ identifier }}"
                      data-bs-parent="#nonCurrent">
 
                     <div class="flex-table accompanyingcourse-list">