From 678c7d18b418958e2141440fed37499c014db11d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 22 Jul 2021 11:34:37 +0200
Subject: [PATCH] fix data-toggle collapse mechanism

+ cleaning links in theses files
---
 .../views/AccompanyingCourse/index.html.twig  |  4 ++--
 .../views/Household/members.html.twig         | 20 ++++++++-----------
 .../views/Household/summary.html.twig         | 19 +++++++-----------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 099b2c27b..33439d074 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -29,7 +29,7 @@
          </div>
          <ul class="record_actions">
            <li>
-            <button class="btn btn-primary" data-toggle="collapse" href="#withoutHouseholdList">
+            <button class="btn btn-primary" data-bs-toggle="collapse" href="#withoutHouseholdList">
               {{ 'Add to household now'|trans }}
             </button>
            </li>
@@ -50,7 +50,7 @@
             </ul>
 
             <input type="hidden" name="expand_suggestions" value="true" />
-            <input type="hidden" name="accompanying_period_id", value="{{ accompanyingCourse.id }}" />
+            <input type="hidden" name="accompanying_period_id" value="{{ accompanyingCourse.id }}" />
 
             <ul class="record_actions">
               <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
index c761747aa..38b9c1474 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
@@ -48,10 +48,8 @@
 
   <ul class="record_actions">
     <li>
-      <a 
-        href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id, 'edit': 1 }) }}"
-        class="btn btn-edit"
-        >
+      <a href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id, 'edit': 1 }) }}"
+        class="btn btn-edit">
         {{ 'household.Comment and expecting birth'|trans }}
       </a>
     </li>
@@ -94,14 +92,14 @@
               </ul>
               <ul class="record_actions">
                 <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}" 
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
                         class="btn btn-misc" title="{{ 'household.Leave household'|trans }}" />
                         <i class="fa fa-sign-out"></i>
                         {{ 'household.Leave household'|trans }}
                     </a>
                 </li>
                 <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
                         class="btn btn-edit" title="{{ 'household.Update membership'|trans }}"/></a>
                 </li>
               </ul>
@@ -124,7 +122,7 @@
   {% set members = household.nonCurrentMembersByPosition(p) %}
   {% if members|length > 0 %}
     <p><!-- force a space after table --></p>
-    <button class="btn btn-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+    <button class="btn btn-green" type="button" data-bs-toggle="collapse" data-bs-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
       {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
     </button>
 
@@ -155,9 +153,8 @@
                 </ul>
                 <ul class="record_actions">
                   <li>
-                    <a 
-                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="btn btn-edit" title="{{ 'household.Update membership'|trans }}" /></a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
+                    class="btn btn-edit" title="{{ 'household.Update membership'|trans }}"></a>
                   </li>
                 </ul>
               </div>
@@ -180,8 +177,7 @@
 
 <ul class="record_actions sticky-form-buttons">
   <li>
-    <a 
-    href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
       class="btn btn-create">
       {{ 'household.Add a member'|trans }}
     </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index abfdb45aa..d8436b36a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -61,10 +61,8 @@
 
   <ul class="record_actions">
     <li>
-      <a 
-        href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-        class="btn btn-edit"
-        >
+      <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+        class="btn btn-edit">
         {{ 'household.Comment and expecting birth'|trans }}
       </a>
     </li>
@@ -108,7 +106,7 @@
               </ul>
               <ul class="record_actions">
                 <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
                         class="btn btn-edit" />
                         {{ 'household.Update membership'|trans }}
                     </a>
@@ -147,7 +145,7 @@
   {% set members = household.nonCurrentMembersByPosition(p) %}
   {% if members|length > 0 %}
     <p><!-- force a space after table --></p>
-    <button class="btn btn-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+    <button class="btn btn-green" type="button" data-bs-toggle="collapse" data-bs-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
       {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
     </button>
 
@@ -178,10 +176,8 @@
                 </ul>
                 <ul class="record_actions">
                   <li>
-                    <a 
-                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="btn btn-edit" 
-                    />
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
+                    class="btn btn-edit">
                       {{ 'household.Update membership'|trans }}
                     </a>
                   </li>
@@ -205,8 +201,7 @@
 
 <ul class="record_actions">
   <li>
-    <a 
-    href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
       class="btn btn-create">
       {{ 'household.Add a member'|trans }}
     </a>