+ {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
{{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
{% if not hasPersonLocation %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
index 9b48883ef..88bdf80c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
@@ -14,7 +14,7 @@
{% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', period) %}
- {% set simultaneous = p.household.getMembersDuringMembership(p) %}
+ {% set simultaneous = p.household.getPersonsDuringMembership(p) %}
{% if simultaneous|length == 0 %}
{{ 'household.Any simultaneous members'|trans }}
{% else %}
- {% for m in simultaneous -%}
+ {% for person in simultaneous -%}
{% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
action: 'show', displayBadge: true,
- targetEntity: { name: 'person', id: m.person.id },
- buttonText: m.person|chill_entity_render_string,
- isDead: m.person.deathdate is not null
+ targetEntity: { name: 'person', id: person.id },
+ buttonText: person|chill_entity_render_string,
+ isDead: person.deathdate is not null
} %}
{%- endfor -%}
{% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index e9df78a8f..c0af2efc3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -1,13 +1,15 @@
{% macro button_person_after(person) %}
{% set household = person.getCurrentHousehold %}
- {% if household is not null %}
+ {% if household is not null and is_granted('CHILL_PERSON_HOUSEHOLD_SEE', household) %}
{% endif %}
-
-
-
+ {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE', person) %}
+
+
+
+ {% endif %}
{% endmacro %}
{% macro accompanying_period(acp, person) %}
@@ -251,7 +253,8 @@
{%- set acpsClosed = [] %}
{%- for acp in person.accompanyingPeriodInvolved %}
{%- if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
- {% if acp.step == 'CLOSED' %}
+ {# filter for "current" periods: either the person is a requestor, or is member of the period and not closed #}
+ {% if acp.step == 'CLOSED' or (acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
{%- set acpsClosed = acpsClosed|merge([acp]) %}
{% else %}
{%- set acps = acps|merge([acp]) %}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index 0859ba7bd..c6a06a663 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -113,7 +113,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
->generate(self::class)
->addCheckFor(null, [self::CREATE, self::REASSIGN_BULK])
->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
- ->addCheckFor(Person::class, [self::SEE])
+ ->addCheckFor(Person::class, [self::SEE, self::CREATE])
->build();
}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
index 86deda604..0a00b4000 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -71,6 +71,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
'location' => Address::class,
'locationPerson' => Person::class,
'administrativeLocation' => Location::class,
+ 'pinnedComment' => AccompanyingPeriod\Comment::class,
];
private ClosingMotiveRender $closingMotiveRender;
@@ -164,6 +165,8 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
'works' => $this->normalizer->normalize($period->getWorks(), $format, $workContext),
+ 'comments' => $this->normalizer->normalize($period->getComments(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
+ 'pinnedComment' => $this->normalizer->normalize($period->getPinnedComment(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
];
}
@@ -183,6 +186,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
'hasLocationPerson' => false,
'hasAdministrativeLocation' => false,
'works' => [],
+ 'comments' => [],
]
);
}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index 7cf8af3e5..b7b805be8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -135,4 +135,51 @@ final class HouseholdTest extends TestCase
$this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
$this->assertEquals(new DateTimeImmutable('2021-12-31'), $inside->getEndDate());
}
+
+ public function testHouseholdGetPersonsDuringMembership()
+ {
+ $household = new Household();
+ $person1 = new Person();
+ $person2 = new Person();
+ $personOut = new Person();
+
+ $household->addMember(
+ $member1 = (new HouseholdMember())
+ ->setStartDate(new DateTimeImmutable('2021-01-01'))
+ ->setEndDate(new DateTimeImmutable('2021-12-01'))
+ ->setPerson($person1)
+ );
+
+ $household->addMember(
+ $member2a = (new HouseholdMember())
+ ->setStartDate(new DateTimeImmutable('2021-01-01'))
+ ->setEndDate(new DateTimeImmutable('2021-05-01'))
+ ->setPerson($person2)
+ );
+
+ $household->addMember(
+ $member2b = (new HouseholdMember())
+ ->setStartDate(new DateTimeImmutable('2021-11-01'))
+ ->setEndDate(new DateTimeImmutable('2022-06-01'))
+ ->setPerson($person2)
+ );
+
+ $household->addMember(
+ $memberOut = (new HouseholdMember())
+ ->setStartDate(new DateTimeImmutable('2019-01-01'))
+ ->setEndDate(new DateTimeImmutable('2019-12-01'))
+ ->setPerson($personOut)
+ );
+
+ $this->assertCount(0, $household->getPersonsDuringMembership($memberOut));
+
+ $this->assertCount(1, $household->getPersonsDuringMembership($member1));
+ $this->assertContains($person2, $household->getPersonsDuringMembership($member1));
+
+ $this->assertCount(1, $household->getPersonsDuringMembership($member2a));
+ $this->assertContains($person1, $household->getPersonsDuringMembership($member2a));
+
+ $this->assertCount(1, $household->getPersonsDuringMembership($member2b));
+ $this->assertContains($person1, $household->getPersonsDuringMembership($member2b));
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
index c42dc9a5a..7e6330988 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@@ -68,6 +68,8 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
'closingMotive' => '@ignored',
'confidential' => true,
'confidentialText' => 'confidentiel',
+ 'comments' => '@ignored',
+ 'pinnedComment' => '@ignored',
'createdAt' => '@ignored',
'createdBy' => '@ignored',
'emergency' => true,