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 %} +
+{% endblock %} + +{% block content %} + +