From e28da7e99b5cb4aef0350686caf5d51f8bba6f93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:06:18 +0100
Subject: [PATCH] create-edit composition placed in separate page to avoid
 confusion

---
 .../HouseholdCompositionController.php        | 47 ++++++++++++-------
 .../HouseholdComposition/create.html.twig     | 26 ++++++++++
 .../HouseholdComposition/index.html.twig      | 35 +++++---------
 .../translations/messages.fr.yml              |  1 +
 4 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 22e92eb02..7064a083d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -129,23 +129,10 @@ class HouseholdCompositionController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
      */
-    public function index(Household $household, Request $request): Response
+    public function newAction(Household $household, Request $request): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit an household');
-        }
-
-        $count = $this->householdCompositionRepository->countByHousehold($household);
-        $paginator = $this->paginatorFactory->create($count);
-        $compositions = $this->householdCompositionRepository->findByHousehold(
-            $household,
-            ['startDate' => 'DESC', 'id' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
         if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
             $isEdit = $request->query->has('edit');
 
@@ -195,14 +182,40 @@ class HouseholdCompositionController extends AbstractController
         }
 
         return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
+            '@ChillPerson/HouseholdComposition/create.html.twig',
             [
                 'household' => $household,
-                'compositions' => $compositions,
                 'form' => isset($form) ? $form->createView() : null,
                 'isPosted' => isset($form) ? $form->isSubmitted() : false,
                 'editId' => $request->query->getInt('edit', -1),
             ]
         ));
     }
+
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     */
+    public function index(Household $household, Request $request): Response
+    {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
+        $count = $this->householdCompositionRepository->countByHousehold($household);
+        $paginator = $this->paginatorFactory->create($count);
+        $compositions = $this->householdCompositionRepository->findByHousehold(
+            $household,
+            ['startDate' => 'DESC', 'id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions
+            ]
+        ));
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
new file mode 100644
index 000000000..334832a63
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
index 7ff72b2cd..cce83e64c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
@@ -15,7 +15,7 @@
     {% else %}
         <div class="flex-table">
             {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                     <div class="item-bloc">
                         <div class="item-row">
                             <div class="item-col">
@@ -42,7 +42,7 @@
                             <div class="item-row">
                                 <ul class="record_actions">
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
                                         <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,7 +54,7 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
+                {# {% else %}
                     {{ form_start(form) }}
 
                     {{ form_widget(form) }}
@@ -68,32 +68,19 @@
                         </li>
                     </ul>
                     {{ form_end(form) }}
-                {% endif %}
+                {% endif %} #}
             {% endfor %}
         </div>
     {% endif %}
 
-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
+    {# {% if editId == -1 %} #}
         <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                        {{ 'Create'|trans }}
-                    </button>
-                </li>
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
+                        class="btn btn-sm btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
         </ul>
-    {% endif %}
+    {# {% endif %} #}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e4265fca0..bc238570d 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -566,6 +566,7 @@ household_composition:
     Currently no composition: Aucune composition familiale renseignée.
     Add a composition: Ajouter une composition familiale
     Update composition: Modifier la composition familiale
+    Create: Créér une nouvelle composition familiale
 
 # docgen
 Linked evaluations: Évaluations associées