diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index cb35bf089..30c7f561d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -41,12 +41,6 @@ table { } } -// règle la typo des étiquettes de dénomination rendues avec renderBox -.chill_denomination { - font-size: 1.3em; - font-weight: 700; -} - /* * ACCOMPANYING_COURSE * Header custom for Accompanying Course diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php index be737c705..b1bfef173 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php @@ -21,38 +21,38 @@ class Position * @ORM\Column(type="integer") * @Serializer\Groups({ "read" }) */ - private $id; + private ?int $id; /** * @ORM\Column(type="json") * @Serializer\Groups({ "read" }) */ - private $label = []; + private array $label = []; /** * @ORM\Column(type="boolean") * @Serializer\Groups({ "read" }) */ - private $shareHouseHold; + private bool $shareHouseHold = true; /** * @ORM\Column(type="boolean") * @Serializer\Groups({ "read" }) */ - private $allowHolder; + private bool $allowHolder = false; /** * @ORM\Column(type="float") * @Serializer\Groups({ "read" }) */ - private $ordering; + private float $ordering = 0.00; public function getId(): ?int { return $this->id; } - public function getLabel(): ?array + public function getLabel(): array { return $this->label; } @@ -64,7 +64,7 @@ class Position return $this; } - public function getShareHousehold(): ?bool + public function getShareHousehold(): bool { return $this->shareHouseHold; } @@ -76,12 +76,12 @@ class Position return $this; } - public function getAllowHolder(): ?bool + public function getAllowHolder(): bool { return $this->allowHolder; } - public function isAllowHolder(): ?bool + public function isAllowHolder(): bool { return $this->getAllowHolder(); } @@ -93,7 +93,7 @@ class Position return $this; } - public function getOrdering(): ?float + public function getOrdering(): float { return $this->ordering; } 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 14a615c65..da37ab580 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss @@ -2,6 +2,20 @@ div.list-with-period, div.list-household-members, div.list-household-members--summary { + + .chill-entity__person { + .chill-entity__person__first-name, + .chill-entity__person__last-name { + font-size: 1.3em; + font-weight: 700; + } + } + + .chill_denomination { + font-size: 1.3em; + font-weight: 700; + } + div.person { ul.record_actions { li { @@ -44,13 +58,4 @@ div.list-household-members--summary { } } } - .chill-entity__person { - .chill-entity__person__first-name, - .chill-entity__person__last-name, - // text is used in vue component 'Person' - .chill-entity__person__text { - font-size: 1.3em; - font-weight: 700; - } - } } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig index cf12b1c4f..795861529 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig @@ -4,7 +4,7 @@
{% set title = title %}

- + {{ 'household.Household'|trans }} (n°{{ household.id }})

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig index 610f80cde..cc1c8f321 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig @@ -6,127 +6,127 @@

{{ block('title') }}

{% for p in positions %} -

{{ p.label|localize_translatable_string }}

+

{{ p.label|localize_translatable_string }}

-{% if false == p.shareHousehold %} -

{{ 'household.Those members does not share address'|trans }}

-{% endif %} + {% if false == p.shareHousehold %} +

{{ 'household.Those members does not share address'|trans }}

+ {% endif %} -{%- set members = household.currentMembersByPosition(p) %} -{% if members|length > 0 %} -
- {% for m in members %} -
-
-
-
- {{ m.person|chill_entity_render_box({'addLink': true}) }} - {% if m.holder %} - {{ 'household.holder'|trans }} + {%- set members = household.currentMembersByPosition(p) %} + {% if members|length > 0 %} +
+ {% for m in members %} +
+
+
+
+ {{ m.person|chill_entity_render_box({'addLink': true}) }} + {% if m.holder %} + {{ 'household.holder'|trans }} + {% endif %} +
+
+ {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} +
+
+
+
    + {% if m.startDate is not empty %} +
  • {{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}
    • + {% endif %} + {% if m.endDate is not empty %} +
  • {{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}
    • + {% endif %} +
+ +
+
+ {% if m.comment is not empty %} +
+
+ {{ m.comment|chill_markdown_to_html }} +
+
{% endif %}
-
- {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} -
-
-
-
    - {% if m.startDate is not empty %} -
  • {{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}
    • - {% endif %} - {% if m.endDate is not empty %} -
  • {{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}
    • - {% endif %} -
- + {% endfor %} +
+ {% else %} +

{{ 'household.Any persons into this position'|trans }}

+ {% endif %} + + {% set members = household.nonCurrentMembersByPosition(p) %} + {% if members|length > 0 %} +

+ + +
+
+ {% for m in members %} +
+
+
+
+ {{ m.person|chill_entity_render_box({'addLink': true}) }} + {% if m.holder %} + {{ 'household.holder'|trans }} + {% endif %} +
+
+ {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} +
+
+
+
    + {% if m.startDate is not empty %} +
  • {{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}
    • + {% endif %} + {% if m.endDate is not empty %} +
  • {{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}
    • + {% endif %} +
+ +
+
+ {% if m.comment is not empty %} +
+
+ {{ m.comment|chill_markdown_to_html }} +
+
+ {% endif %} +
+ {% endfor %}
- {% if m.comment is not empty %} -
-
- {{ m.comment|chill_markdown_to_html }} -
-
- {% endif %} -
- {% endfor %} -
-{% else %} -

{{ 'household.Any persons into this position'|trans }}

-{% endif %} -{% set members = household.nonCurrentMembersByPosition(p) %} -{% if members|length > 0 %} -

- - -
-
- {% for m in members %} -
-
-
-
- {{ m.person|chill_entity_render_box({'addLink': true}) }} - {% if m.holder %} - {{ 'household.holder'|trans }} - {% endif %} -
-
- {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} -
-
-
-
    - {% if m.startDate is not empty %} -
  • {{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}
    • - {% endif %} - {% if m.endDate is not empty %} -
  • {{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}
    • - {% endif %} -
- -
-
- {% if m.comment is not empty %} -
-
- {{ m.comment|chill_markdown_to_html }} -
-
- {% endif %} -
- - {% endfor %} -
-
- -{% endif %} + {% endif %} {% endfor %} +