Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

remove links to route 'household members'

Browse Source
This commit is contained in:
Julien Fastré 2021-06-18 13:53:19 +02:00
parent e1f01a47f8
commit 04ccca092b
3 changed files with 15 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
View File

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

2
src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
View File

@ -12,7 +12,7 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a
href="{{ chill_return_path_or('chill_person_household_members', { 'household_id': household.id}) }}"
href="{{ chill_return_path_or('chill_person_household_summary', { 'household_id': household.id}) }}"
class="sc-button bt-cancel"
>
{{ 'Cancel'|trans }}

64
src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
View File

@ -61,19 +61,6 @@ class HouseholdMemberControllerTest extends WebTestCase
],
true)
);
if ($client->getResponse()->getStatusCode() === 422) {
var_dump(\json_decode($client->getResponse()->getContent(), true));
var_dump($date);
$household = self::$container->get(EntityManagerInterface::class)
->getRepository(Household::class)
->find($householdId);
$ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
foreach ($ms as $m) {
var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
}
}
$this->assertEquals(Response::HTTP_OK,
$client->getResponse()->getStatusCode()
@ -124,20 +111,6 @@ class HouseholdMemberControllerTest extends WebTestCase
true)
);
if ($client->getResponse()->getStatusCode() === 422) {
var_dump(\json_decode($client->getResponse()->getContent(), true));
var_dump($date);
$household = self::$container->get(EntityManagerInterface::class)
->getRepository(Household::class)
->find($householdId);
$ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
foreach ($ms as $m) {
var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
}
}
$this->assertEquals(Response::HTTP_OK,
$client->getResponse()->getStatusCode()
);
@ -195,19 +168,6 @@ class HouseholdMemberControllerTest extends WebTestCase
true)
);
if ($client->getResponse()->getStatusCode() === 422) {
var_dump(\json_decode($client->getResponse()->getContent(), true));
var_dump($date);
$household = self::$container->get(EntityManagerInterface::class)
->getRepository(Household::class)
->find($householdId);
$ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
foreach ($ms as $m) {
var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
}
}
$this->assertEquals(Response::HTTP_OK,
$client->getResponse()->getStatusCode()
);
@ -277,19 +237,21 @@ class HouseholdMemberControllerTest extends WebTestCase
$participation = $person->getCurrentHouseholdParticipationShareHousehold();
if (NULL !== $participation && NULL === $participation->getEndDate()
&& $participation->getStartDate() > $yesterday) {
continue;
if (NULL == $participation ||
(
NULL === $participation->getEndDate()
&& $participation->getStartDate() <= $yesterday
)) {
$i++;
yield [
$id,
$household->getId(),
$positions[\random_int(0, count($positions) - 1)]['id'],
new \DateTimeImmutable('tomorrow')
];
}
$i++;
yield [
$id,
$household->getId(),
$positions[\random_int(0, count($positions) - 1)]['id'],
new \DateTimeImmutable('tomorrow')
];
} while ($i <= 1);
}