Merge branch 'issue324_person' into 'master'

fix some person issues See merge request Chill-Projet/chill-bundles!254
2025-06-07 18:44:08 +00:00 · 2021-12-12 14:39:59 +00:00 · 2021-12-12 14:39:59 +00:00 · c6cda437c4
commit c6cda437c4
parent 133ac67794 7e045e964a
11 changed files with 52 additions and 13 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -17,6 +17,12 @@ and this project adheres to
 * [action] add an unrelated issue within action creation.
 * [origin] fix origin: use correctly the translatable strings
    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');` 
+* [main] change order of civilities in civility fixtures (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] set min attr in the minimum of children field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add marital status date in person view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show number of children + allow set number of children to null (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show acceptSMS option (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add death information in person render box in twig and vue render boxes (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)

 ## Test releases

--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
@ -26,8 +26,8 @@ class LoadCivility extends Fixture implements FixtureGroupInterface
    public function load(ObjectManager $manager): void
    {
        $civilities = [
-            ['name' => ['fr' => 'Monsieur'], 'abbrev' => ['fr' => 'M.']],
            ['name' => ['fr' => 'Madame'], 'abbrev' => ['fr' => 'Mme']],
+            ['name' => ['fr' => 'Monsieur'], 'abbrev' => ['fr' => 'M.']],
            ['name' => ['fr' => 'Docteur'], 'abbrev' => ['fr' => 'Dr']],
            ['name' => ['fr' => 'Professeur'], 'abbrev' => ['fr' => 'Pr']],
            ['name' => ['fr' => 'Madame la Directrice'], 'abbrev' => ['fr' => 'Mme']],
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@ -80,6 +80,7 @@ class Configuration implements ConfigurationInterface
            ->append($this->addFieldNode('memo'))
            ->append($this->addFieldNode('number_of_children'))
            ->append($this->addFieldNode('acceptEmail'))
+            ->append($this->addFieldNode('deathdate'))
            ->arrayNode('alt_names')
            ->defaultValue([])
            ->arrayPrototype()
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@ -244,6 +244,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     * @Assert\Date(
     *     groups={"general", "creation"}
     * )
+     * @Assert\GreaterThan(propertyPath="birthDate")
+     * @Assert\LessThanOrEqual("today")
     */
    private ?DateTimeImmutable $deathdate = null;

@ -1774,7 +1776,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
        return $this;
    }

-    public function setNumberOfChildren(int $numberOfChildren): self
+    public function setNumberOfChildren(?int $numberOfChildren): self
    {
        $this->numberOfChildren = $numberOfChildren;

--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@ -93,6 +93,7 @@ class PersonType extends AbstractType
            ])
            ->add('numberOfChildren', IntegerType::class, [
                'required' => false,
+                'attr' => ['min' => 0],
            ]);

        if ($this->configAltNamesHelper->hasAltNames()) {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@ -18,6 +18,7 @@

                   <span class="firstname">{{ person.firstName }}</span>
                   <span class="lastname">{{ person.lastName }}</span>
+                   <span v-if="person.deathdate" class="deathdate"> (‡)</span>
                   <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                       <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                   </span>
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@ -10,6 +10,7 @@
    * addAge        bool
    * addCenter     bool
    * hLevel        integer
+    * addDeath      bool
    * address_multiline     bool
    * customButtons [
        'before'    Twig\Markup, (injected with macro)
@ -24,7 +25,12 @@

 {% macro raw(person, options) %}
    <span class="firstname">{{ person.firstName }}</span>
-    <span class="lastname">{{ person.lastName }}</span>
+    <span class="lastname">
+        {{ person.lastName }}
+        {%- if options['addDeath'] -%}
+            {% if person.deathdate is not null %} (‡){% endif %}
+        {% endif %}
+    </span>
    {%- if options['addAltNames'] -%}
        <span class="altnames">
        {%- for n in person.altNames -%}
@ -82,21 +88,17 @@
                    {{ 'Date of death'|trans }}:
                {%- endif -%}
                {#- must be on one line to avoid spaces with dash -#}
-                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'Deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
-                {% if options['addAge'] %}
-                    <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
-                    </span>
-                {% endif %}
+                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
+                {%- if options['addAge'] -%}
+                    <span class="age">{{ 'years_old'|trans({ 'age': person.age }) }}</span>
+                {%- endif -%}
            {%- elseif person.birthdate is not null -%}
                <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                {{ 'Born the date'|trans({'gender': person.gender,
                    'birthdate': person.birthdate|format_date("medium") }) }}
                </time>
                {%- if options['addAge'] -%}
-                    <span class="age">
-                        {{- 'years_old'|trans({ 'age': person.age }) -}}
-                    </span>
+                    <span class="age">{{- 'years_old'|trans({ 'age': person.age }) -}}</span>
                {%- endif -%}
            {%- endif -%}
            </p>
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@ -92,6 +92,13 @@ This view should receive those arguments:
                        {%- endif -%}
                    </dd>

+                    {%- if chill_person.fields.deathdate == 'visible' -%}
+                        {%- if person.deathdate is not null -%}
+                        <dt>{{ 'Date of death'|trans }}&nbsp;:</dt>
+                        <dd>{{ person.deathdate|format_date('long') }}</dd>
+                        {%- endif -%}
+                    {%- endif -%}
+
                    {%- if chill_person.fields.place_of_birth == 'visible' -%}
                    <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
                    {% if person.placeOfBirth is not empty %}
@ -111,6 +118,7 @@ This view should receive those arguments:
                                {% endif %}
                            {% endapply %}</dd>
                    {%- endif -%}
+
                </dl>
            </figure>
        </div>
@ -159,12 +167,27 @@ This view should receive those arguments:
                    </dd>
                </dl>
                {%- endif -%}
+                {%- if chill_person.fields.number_of_children == 'visible' -%}
+                <dl>
+                    <dt>{{'Number of children'|trans}}&nbsp;:</dt>
+                    <dd>
+                    {% if person.numberOfChildren is not null %}
+                        {{ person.numberOfChildren }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
                {%- if chill_person.fields.marital_status == 'visible' -%}
                <dl>
                    <dt>{{'Marital status'|trans}}&nbsp;:</dt>
                    <dd>
                        {% if person.maritalStatus is not null %}
                            {{ person.maritalStatus.name|localize_translatable_string }}
+                            {% if person.maritalStatusDate is not null %}
+                                {{ 'person.from_the'|trans }} {{ person.maritalStatusDate|format_date('long') }}
+                            {% endif %}
                        {% else %}
                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                        {% endif %}
@ -217,6 +240,7 @@ This view should receive those arguments:
                <dl>
                    <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <p>{% if person.acceptSMS %}{{ 'Accept short text message'|trans }}{% endif %}</p>
                </dl>
                {% endif %}

--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@ -51,6 +51,7 @@ class PersonRender extends AbstractChillEntityRender
            'hLevel' => $options['hLevel'] ?? 3,
            'customButtons' => $options['customButtons'] ?? [],
            'customArea' => $options['customArea'] ?? [],
+            'addDeath' => $options['addDeath'] ?? true,
        ];

        return
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@ -19,6 +19,7 @@ person:
            woman {et elle-même}
            other {et lui·elle-même}
        }
+    from_the: depuis le

 household:
    Household: Ménage