From fb1552f6b709c8a0602eb5b6e4492248b96a2ca3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:07:41 +0100
Subject: [PATCH] update changelog and csfixes

---
 CHANGELOG.md                                  |  1 +
 .../HouseholdCompositionController.php        | 54 +++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..6fe2e95ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 7064a083d..1144688fe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -128,6 +128,33 @@ class HouseholdCompositionController extends AbstractController
         );
     }
 
+    /**
+     * @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,
+            ]
+        ));
+    }
+
     /**
      * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
      */
@@ -191,31 +218,4 @@ class HouseholdCompositionController extends AbstractController
             ]
         ));
     }
-
-    /**
-     * @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
-            ]
-        ));
-    }
 }