diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php index 28a28f21f..951030b8e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php @@ -26,9 +26,20 @@ class HouseholdController extends AbstractController public function summary(Request $request, Household $household) { // 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 + 'household' => $household, + 'positions' => $positions ] ); } diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php index 2146bbb7c..3377b6f74 100644 --- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php @@ -29,21 +29,21 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface { $household = $parameters['household']; - $menu->addChild($this->translator->trans('Summary'), [ + $menu->addChild($this->translator->trans('household.Household summary'), [ 'route' => 'chill_person_household_summary', 'routeParameters' => [ 'household_id' => $household->getId() ]]) ->setExtras(['order' => 10]); - $menu->addChild($this->translator->trans('Members'), [ + $menu->addChild($this->translator->trans('household.Household members'), [ 'route' => 'chill_person_household_members', 'routeParameters' => [ 'household_id' => $household->getId() ]]) ->setExtras(['order' => 20]); - $menu->addChild($this->translator->trans('Addresses'), [ + $menu->addChild($this->translator->trans('household.Addresses'), [ 'route' => 'chill_person_household_addresses', 'routeParameters' => [ 'household_id' => $household->getId() diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index d0305d183..b5bbd1c86 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -1,14 +1,53 @@ {% extends '@ChillPerson/Household/layout.html.twig' %} -{% block title 'Household summary'|trans %} +{% block title 'household.Household summary'|trans %} {% block content %}
Household with id {{ household.id }}
+TODO
+{% if false == p.shareHousehold %} +{{ 'household.Those members does not share address'|trans }}
+{% endif %} + +