diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index 6fbf78a86..0378e9413 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -171,7 +171,7 @@ class HouseholdMemberController extends ApiController /** * @Route( - * "/api/1.0/person/household/member/{id}/edit", + * "/{_locale}/person/household/member/{id}/edit", * name="chill_person_household_member_edit" * ) */ diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index d1cfb6fb9..db7ef2c2b 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -98,7 +98,7 @@ class Household return $this->members; } - public function getCurrentMembers(\DateTimeImmutable $now = null): Collection + public function getCurrentMembers(?\DateTimeImmutable $now = null): Collection { $criteria = new Criteria(); $expr = Criteria::expr(); @@ -118,6 +118,19 @@ class Household return $this->getMembers()->matching($criteria); } + /** + * Get the persons currently associated to the household. + * + * Return a list of Person, instead of a list of HouseholdMembers + * + * @return Person[] + */ + public function getCurrentPersons(?\DateTimeImmutable $now = null): Collection + { + return $this->getCurrentMembers($now) + ->map(function(HouseholdMember $m) { return $m->getPerson(); }); + } + public function getNonCurrentMembers(\DateTimeImmutable $now = null): Collection { $criteria = new Criteria(); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss index 6f52d2cae..dc1c96274 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss @@ -1,5 +1,7 @@ /// complete and overwrite flex-table in chillmain.scss -div.list-with-period { +div.list-with-period, +div.list-household-members, +div.list-household-members--summary { div.person { ul.record_actions { li { @@ -7,6 +9,9 @@ div.list-with-period { } } } + div.comment { + // for the comment for household-members + } div.periods { div.header, div.list-content { @@ -39,12 +44,14 @@ div.list-with-period { } } } + + .chill-entity__person { + .chill-entity__person__first-name, + .chill-entity__person__last-name { + font-size: 1.3em; + font-weight: 700; + } + } } -.chill-entity__person { - .chill-entity__person__first-name, - .chill-entity__person__last-name { - font-size: 1.3em; - font-weight: 700; - } -} + diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig index afcd2799c..44eed7782 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig @@ -7,9 +7,11 @@ {%- for n in person.altNames -%} {%- if loop.first -%}({% else %} {%- endif -%} - {{ n.label }} + {{- n.label -}} - {%- if loop.last %}) {% endif -%} + {%- if loop.last -%}) {%- endif -%} {%- endfor -%} {%- endif -%} - {%- if showLink is defined -%}{%- endif -%} + {%- if showLink is defined -%}{%- endif -%} +{#- tricks to remove easily whitespace after template -#} +{%- if true -%}{%- endif -%} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig index 57b89851d..cf12b1c4f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig @@ -1,4 +1,4 @@ -