Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

create-edit composition placed in separate page to avoid confusion

Browse Source
This commit is contained in:
Julie Lenaerts
2022-03-09 14:06:18 +01:00
parent d6933fce35
commit e28da7e99b
4 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
View File

@@ -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
]
));
}
}