Merge branch 'master' into ticket-app-master

# Conflicts: # .eslint-baseline.json # src/Bundle/ChillMainBundle/Entity/User.php # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue # src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue # src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
2025-09-29 18:14:59 +00:00 · 2025-09-05 18:32:01 +02:00
parent 25561cdf63 af13bf9088
commit 2665e43a61
192 changed files with 6915 additions and 1173 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -281,11 +281,6 @@ abbr.referrer {   // still used ?
    font-style: italic;
 }

-.created-updated {
-    border: 1px solid black;
-    padding: 10px;
-}
-
 /// Masonry blocs on AccompanyingCourse resume page
 div#dashboards {
    div.mbloc {
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
@@ -10,7 +10,8 @@

    /// SOCIAL-ISSUE AND SOCIAL-ACTION
    &.entity-social-issue,
-    &.entity-social-action {
+    &.entity-social-action,
+    &.entity-event-theme {
        margin-right: 0.3em;
        font-size: 120%;
        span.badge {
@@ -32,4 +33,9 @@
            @include badge_social($social-action-color);
        }
    }
+    &.entity-event-theme {
+        span.badge {
+            @include badge_social($event-theme-color);
+        }
+    }
 }
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
@@ -8,7 +8,7 @@
                            <h1>
                                <i class="fa fa-random fa-fw"></i>
                                {{ 'Accompanying Course'|trans }}
-                                <span class="id-number">{{ accompanyingCourse.id }}</span>
+                                <span class="id-number">({{ 'accompanying_period.number'|trans({ 'id': accompanyingCourse.id}) }})</span>
                            </h1>
                        </div>
                    </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -78,11 +78,6 @@
            {%- if options['addEntity'] -%}
                <span class="badge rounded-pill bg-secondary">{{ 'Person'|trans }}</span>
            {%- endif -%}
-            {%- if options['addId'] -%}
-                <span class="id-number" title="{{ 'Person'|trans ~ ' n° ' ~ person.id }}">
-                    {{ person.id|upper -}}
-                </span>
-            {%- endif -%}
        </div>
        {%- if options['addInfo'] -%}
            <p class="moreinfo">
@@ -99,6 +94,12 @@
                {%- if options['addAge'] -%}
                    <span class="age">&nbsp;{{ 'years_old'|trans({ 'age': person.age }) }}</span>
                {%- endif -%}
+                {%- if options['addId'] -%}
+                    {%- set personId = person|chill_person_id_render_text %}
+                    <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ personId }}">
+                    ({{ personId }})
+                </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 ? person.gender.genderTranslation.value : 'neutral',
@@ -108,6 +109,12 @@
                    <span class="age">{{- 'years_old'|trans({ 'age': person.age }) -}}</span>
                {%- endif -%}
            {%- endif -%}
+            {%- if options['addId'] -%}
+                {%- set personId = person|chill_person_id_render_text %}
+                <span class="id-number same-size" title="{{ 'Person'|trans ~ ' ' ~ personId }}">
+                    ({{ personId }})
+                </span>
+            {%- endif -%}
            </p>
        {%- endif -%}
    {#- tricks to remove easily whitespace after template -#}
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -31,7 +31,7 @@
    {% if form.memo is defined %}
    <fieldset>
        <legend><h2>{{ 'Memo'|trans }}</h2></legend>
-        {{ form_row(form.memo, {'label' : 'Memo'} ) }}
+        {{ form_widget(form.memo, {'label' : 'Memo'} ) }}
    </fieldset>
    {% endif %}

@@ -85,15 +85,17 @@
                    {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
                </div>
                <div id="personAcceptSMS">
-                    {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+                    {{ form_row(form.acceptSms, {'label' : 'Accept short text message ?'}) }}
                </div>
            {%- endif -%}
-            {%- if form.otherPhoneNumbers is defined -%}
-                {{ form_widget(form.otherPhoneNumbers) }}
-                {{ form_errors(form.otherPhoneNumbers) }}
+            {%- if form.otherPhonenumbers is defined -%}
+                {{ form_widget(form.otherPhonenumbers) }}
+                {{ form_errors(form.otherPhonenumbers) }}
            {%- endif -%}
            {%- if form.contactInfo is defined -%}
-                {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
+                {{ form_label(form.contactInfo) }}
+                {{ form_widget(form.contactInfo) }}
+                {{ form_errors(form.contactInfo) }}
            {%- endif -%}
        </fieldset>
    {%- endif -%}
@@ -134,6 +136,20 @@
    </fieldset>
    {%- endif -%}

+    {% if form.identifiers|length > 0 %}
+        <fieldset>
+            <legend><h2>{{ 'person.Identifiers'|trans }}</h2></legend>
+            <div>
+                {% for f in form.identifiers %}
+                    {{ form_row(f) }}
+                {% endfor %}
+            </div>
+        </fieldset>
+    {% else %}
+        {{ form_widget(form.identifiers) }}
+    {% endif %}
+
+
    {{ form_rest(form) }}

    <ul class="record_actions sticky-form-buttons">
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -32,9 +32,16 @@
                    <div class="wl-col list">
                        <div class="d-flex flex-column justify-content-center">
                            {% if app != null %}
-                                <div class="date">
-                                    {{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
-                                </div>
+                                {% if acp.closingDate != null %}
+                                    {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
+                                        '%opening_date%': acp.openingDate|format_date('long'),
+                                        '%closing_date%': acp.closingDate|format_date('long')}
+                                    ) }}
+                                {% else %}
+                                    <div class="date">
+                                        {{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
+                                    </div>
+                                {% endif %}
                            {% endif %}

                            {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', acp.id) %}
@@ -70,6 +77,20 @@
                    </div>
                </div>

+                {% if acp.step == 'CLOSED' and acp.closingMotive is not null %}
+                    <div class="wl-row">
+                        <div class="wl-col title">
+                            <h3 class="closingMotive">{{ 'Closing motive'|trans }}</h3>
+                        </div>
+                        <div class="wl-col list">
+                            <div>
+                                {{ acp.closingMotive.name|localize_translatable_string }}
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+
+
                {% if acp.user is not null %}
                    <div class="wl-row">
                        <div class="wl-col title">
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -1,19 +1,3 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
 {% extends "@ChillPerson/Person/layout.html.twig"  %}

 {% set activeRouteKey = 'chill_person_view' %}
@@ -78,6 +62,16 @@ This view should receive those arguments:
                    {% else %}
                        <dd>{{ 'gender.not defined'|trans }}</dd>
                    {% endif %}
+
+                    {% if person.genderComment.comment is not empty %}
+                        <dt>{{ 'Gender comment'|trans }}&nbsp;:</dt>
+                        <dd>
+                            <div class="chill-user-quote">
+                                {{ person.genderComment.comment|chill_markdown_to_html }}
+                            </div>
+                        </dd>
+                    {% endif %}
+
                </dl>
            </figure>
        </div>
@@ -126,16 +120,6 @@ This view should receive those arguments:
            </figure>
        </div>

-        {% if person.genderComment.comment is not empty %}
-            <div class="col-12">
-                <figure class="person-details">
-                    <h2 class="chill-beige">{{ 'Gender comment'|trans }}&nbsp;:</h2>
-                    <div class="chill-user-quote">
-                        {{ person.genderComment.comment|chill_markdown_to_html }}
-                    </div>
-                </figure>
-            </div>
-        {% endif %}
    </div>

    <div class="row">
@@ -241,17 +225,20 @@ This view should receive those arguments:
                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                        {% endif %}
                    </dd>
-                    <dt>{{ 'Comment on the marital status'|trans }}&nbsp;:</dt>
-
-                    <dd>
-                        {% if person.maritalStatusComment.comment is not empty %}
-                            <blockquote class="chill-user-quote">
-                                {{ person.maritalStatusComment.comment|chill_markdown_to_html }}
-                            </blockquote>
-                        {% else %}
-                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% if person.maritalStatusComment.comment is not empty %}
+                        <dt>{{ 'Comment on the marital status'|trans }}&nbsp;:</dt>
+                        <dd>
+                                <blockquote class="chill-user-quote">
+                                    {{ person.maritalStatusComment.comment|chill_markdown_to_html }}
+                                </blockquote>
+                        </dd>
+                    {% endif %}
+                    {% for identifier in person.identifiers %}
+                        {% if identifier.definition.isActive and (identifier|chill_entity_render_string) is not empty %}
+                            <dt>{{ identifier.definition.label|localize_translatable_string }}&nbsp;:</dt>
+                            <dd>{{ identifier|chill_entity_render_box }}</dd>
                        {% endif %}
-                    </dd>
+                    {% endfor %}
                </dl>
                {%- endif -%}
            </figure>
@@ -341,7 +328,7 @@ This view should receive those arguments:
    </div>
    {% endif %}

-    <div class="created-updated">
+    <div>
        {% if person.createdBy %}
            <div class="createdBy">
                {{ 'Created by'|trans}}: <b>{{ person.createdBy|chill_entity_render_box({'at_date': person.createdAt}) }}</b>,<br>