Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-28 13:06:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Take Null value for gender into account and fix OnTheFly makeFetch

Browse Source
This commit is contained in:
Julie Lenaerts 2024-10-22 14:39:17 +02:00
parent 30b66d5806
commit 588f02cdf4
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillMainBundle/translations/messages.fr.yml
View File

@ -713,5 +713,6 @@ news:
gender: gender:
genderTranslation: traduction grammaticale genderTranslation: traduction grammaticale
not defined: Non défini

12
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
View File

@ -24,12 +24,12 @@ const getCivilities = () =>
throw Error('Error with request resource response'); throw Error('Error with request resource response');
}); });
const getGenders = () => const getGenders = () => makeFetch("GET", '/api/1.0/main/gender.json')
makeFetch("GET", '/api/1.0/main/gender.json'). // .then(response => {
.then(response => { // console.log(response)
if (response.ok) { return response.json(); } // if (response.ok) { return response.json(); }
throw Error('Error with request resource response'); // throw Error('Error with request resource response');
}); // });
const getCentersForPersonCreation = () => makeFetch('GET', '/api/1.0/person/creation/authorized-centers', null); const getCentersForPersonCreation = () => makeFetch('GET', '/api/1.0/person/creation/authorized-centers', null);

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
View File

@ -39,7 +39,7 @@
<p v-if="options.addInfo === true" class="moreinfo"> <p v-if="options.addInfo === true" class="moreinfo">
<gender-icon-render-box v-if="person.gender" :gender="person.gender"></gender-icon-render-box> <gender-icon-render-box v-if="person.gender" :gender="person.gender"></gender-icon-render-box>
<time v-if="person.birthdate && !person.deathdate" :datetime="person.birthdate" :title="birthdate"> <time v-if="person.birthdate && !person.deathdate" :datetime="person.birthdate" :title="birthdate">
{{ $t(`renderbox.birthday.${person.gender.genderTranslation}`) + ' ' + $d(birthdate, 'text') }} {{ $t(person.gender ? `renderbox.birthday.${person.gender.genderTranslation}` : 'renderbox.birthday.neutral') + ' ' + $d(birthdate, 'text') }}
</time> </time>
<time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate" <time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate"

2
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
View File

@ -103,7 +103,7 @@
{%- endif -%} {%- endif -%}
{%- elseif person.birthdate is not null -%} {%- elseif person.birthdate is not null -%}
<time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}"> <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
{{ 'Born the date'|trans({'gender': person.gender.genderTranslation.value, {{ 'Born the date'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral',
'birthdate': person.birthdate|format_date("medium") }) }} 'birthdate': person.birthdate|format_date("medium") }) }}
</time> </time>
{%- if options['addAge'] -%} {%- if options['addAge'] -%}

6
src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
View File

@ -45,7 +45,7 @@
<div class="ms-auto"> <div class="ms-auto">
{% if acp.requestoranonymous == false and acp.requestorPerson is same as(person) %} {% if acp.requestoranonymous == false and acp.requestorPerson is same as(person) %}
<span class="as-requestor badge bg-info" title="{{ 'Requestor'|trans|e('html_attr') }}"> <span class="as-requestor badge bg-info" title="{{ 'Requestor'|trans|e('html_attr') }}">
{{ 'Requestor'|trans({'gender': person.gender}) }} {{ 'Requestor'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
</span> </span>
{% endif %} {% endif %}
@ -119,7 +119,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if participating %} {% if participating %}
{{ 'person.And himself'|trans({'gender': person.gender.genderTranslation.value}) }} {{ 'person.And himself'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -131,7 +131,7 @@
<div class="wl-col title"> <div class="wl-col title">
<h3> <h3>
{% if acp.requestorPerson is not null %} {% if acp.requestorPerson is not null %}
{{ 'Requestor'|trans({'gender': acp.requestorPerson.gender.genderTranslation.value}) }} {{ 'Requestor'|trans({'gender': acp.requestorPerson.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
{% else %} {% else %}
{{ 'Requestor'|trans({'gender': 'other'})}} {{ 'Requestor'|trans({'gender': 'other'})}}
{% endif %} {% endif %}

7
src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
View File

@ -73,8 +73,11 @@ This view should receive those arguments:
{% endfor %} {% endfor %}
<dt>{{ 'Gender'|trans }}&nbsp;:</dt> <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
<dd>{{ ( person.gender.label|localize_translatable_string ) }}</dd> {% if person.gender %}
<dd>{{ ( person.gender.label|localize_translatable_string ) }}</dd>
{% else %}
<dd>{{ 'gender.not defined'|trans }}</dd>
{% endif %}
</dl> </dl>
</figure> </figure>
</div> </div>