Merge remote-tracking branch 'origin/master' into features/create-social-action

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -2,8 +2,8 @@
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\PersonBundle\Form\HouseholdType;
 use Chill\MainBundle\Entity\Address;
+use Chill\PersonBundle\Form\HouseholdType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -13,6 +13,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Repository\Household\PositionRepository;
 
 /**
  * @Route("/{_locale}/person/household")
@@ -21,12 +22,13 @@ class HouseholdController extends AbstractController
 {
     private TranslatorInterface $translator;
 
-    /**
-     * @param TranslatorInterface $translator
-     */
-    public function __construct(TranslatorInterface $translator)
+    private PositionRepository $positionRepository;
+
+    public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository)
+
     {
         $this->translator = $translator;
+        $this->positionRepository = $positionRepository;
     }
     
     /**
@@ -41,37 +43,8 @@ class HouseholdController extends AbstractController
     {
         // TODO ACL
 
-        $positions = $this->getDoctrine()->getManager()
-            ->getRepository(Position::class)
-            ->findAll()
-            ;
-
-        // little performance improvement: 
-        // initialize members collection, which will avoid
-        // some queries
-        $household->getMembers()->initialize();
-        return $this->render('@ChillPerson/Household/summary.html.twig',
-            [
-                'household' => $household,
-                'positions' => $positions
-            ]
-        );
-    }
-
-    /**
-     * @Route(
-     *      "/{household_id}/members",
-     *      name="chill_person_household_members",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function members(Request $request, Household $household)
-    {
-        // TODO ACL
-        $positions = $this->getDoctrine()->getManager()
-            ->getRepository(Position::class)
-            ->findAll()
+        $positions = $this->positionRepository
+            ->findByActiveOrdered()
             ;
 
         // little performance improvement: 
@@ -85,11 +58,11 @@ class HouseholdController extends AbstractController
             $form = null;
         }
 
-        return $this->render('@ChillPerson/Household/members.html.twig',
+        return $this->render('@ChillPerson/Household/summary.html.twig',
             [
                 'household' => $household,
                 'positions' => $positions,
-                'form' => NULL !== $form ? $form->createView(): $form
+                'form' => NULL !== $form ? $form->createView() : null,
             ]
         );
     }
@@ -142,6 +115,28 @@ class HouseholdController extends AbstractController
         );
     }
 
+    /**
+     * @Route(
+     *      "/{household_id}/address/edit",
+     *      name="chill_person_household_address_edit",
+     *      methods={"GET", "HEAD", "POST"}
+     *  )
+     *  @ParamConverter("household", options={"id" = "household_id"})
+     */
+    public function addressEdit(Request $request, Household $household)
+    {
+        // TODO ACL
+        //$address = $this->findAddressById($household, $address_id); //TODO
+
+
+        return $this->render('@ChillPerson/Household/address_edit.html.twig',
+            [
+                'household' => $household,
+                //'address' => $address,
+            ]
+        );
+    }
+
     /**
      * @Route(
      *      "/{household_id}/members/metadata/edit",
@@ -162,7 +157,7 @@ class HouseholdController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('household.data_saved'));
 
-            return $this->redirectToRoute('chill_person_household_members', [
+            return $this->redirectToRoute('chill_person_household_summary', [
                 'household_id' => $household->getId()
             ]);
         }
@@ -191,25 +186,4 @@ class HouseholdController extends AbstractController
         return $form;
     }
 
-    /**
-     * @Route(
-     *      "/{household_id}/address/edit",
-     *      name="chill_person_household_address_edit",
-     *      methods={"GET", "HEAD", "POST"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function addressEdit(Request $request, Household $household)
-    {
-        // TODO ACL
-        //$address = $this->findAddressById($household, $address_id); //TODO
-
-
-        return $this->render('@ChillPerson/Household/address_edit.html.twig',
-            [
-                'household' => $household,
-                //'address' => $address,
-            ]
-        );
-    }
 }

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -173,7 +173,7 @@ class HouseholdMemberController extends ApiController
 
             return $this->redirect(
                 $request->get('returnPath', null) ??
-                $this->generator->generate('chill_person_household_members', [ 'household_id' => 
+                $this->generator->generate('chill_person_household_summary', [ 'household_id' => 
                     $member->getHousehold()->getId() ])
                 );
         }