Merge branch 'issue215_gender_neuter_fix' into 'master'

change all instances of neuter to both

See merge request Chill-Projet/chill-bundles!618

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php

@@ -77,6 +77,7 @@ class GenderFilter implements
                 'Woman' => Person::FEMALE_GENDER,
                 'Man' => Person::MALE_GENDER,
                 'Both' => Person::BOTH_GENDER,
+                'Unknown' => Person::NO_INFORMATION,
                 'Not given' => 'null',
             ],
             'multiple' => true,

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js

@@ -12,7 +12,7 @@ const visMessages = {
             Holder: 'Titulaire',
             Legend: 'Calques',
             concerned: 'concerné',
-            both: 'neutre, non binaire',
+            // both: 'neutre, non binaire',
             woman: 'féminin',
             man: 'masculin',
             undefined: "genre non précisé",
@@ -64,8 +64,9 @@ const visMessages = {
                 placeholder: "Choisissez le genre de l'usager",
                 woman: "Féminin",
                 man: "Masculin",
-                neuter: "Neutre, non binaire",
+                both: "Neutre, non binaire",
-                undefined: "Non renseigné"
+                undefined: "Non renseigné",
+                unknown: "Non renseigné"
             }
         },
         error_only_one_person: "Une seule personne peut être sélectionnée !",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js

@@ -153,6 +153,8 @@ const getGender = (gender) => {
             return visMessages.fr.visgraph.woman
         case 'man':
             return visMessages.fr.visgraph.man
+        case 'unknown':
+            return visMessages.fr.visgraph.unknown
         default:
             return visMessages.fr.visgraph.undefined
     }

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

@@ -81,7 +81,7 @@
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-map-marker"></i><p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
                 </li>
-                
+
                 <template v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
                    <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
                       <i class="fa fa-li fa-map-marker"></i>
@@ -223,13 +223,13 @@ export default {
       }
     },
     getGenderIcon: function () {
-      return this.person.gender === 'woman' ? 'fa-venus' : this.person.gender === 'man' ? 'fa-mars' : this.person.gender === 'neuter' ? 'fa-neuter' : 'fa-genderless';
+      return this.person.gender === 'woman' ? 'fa-venus' : this.person.gender === 'man' ? 'fa-mars' : this.person.gender === 'both' ? 'fa-neuter' : 'fa-genderless';
     },
     getGenderTranslation: function () {
       return this.person.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
     },
     getGender() {
-      return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'neuter' ? 'person.gender.neuter' : 'person.gender.undefined';
+      return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'both' ? 'person.gender.both' : 'person.gender.undefined';
     },
     birthdate: function () {
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -82,7 +82,7 @@
          <option selected disabled >{{ $t('person.gender.placeholder') }}</option>
          <option value="woman">{{ $t('person.gender.woman') }}</option>
          <option value="man">{{ $t('person.gender.man') }}</option>
-         <option value="neuter">{{ $t('person.gender.neuter') }}</option>
+         <option value="both">{{ $t('person.gender.both') }}</option>
       </select>
       <label>{{ $t('person.gender.title') }}</label>
    </div>
@@ -291,8 +291,12 @@ export default {
                return 'fa-venus';
             case 'man':
                return 'fa-mars';
-            case 'neuter':
+            case 'both':
                return 'fa-neuter';
+           case 'unknown':
+               return 'fa-genderless';
+           default:
+               return 'fa-genderless';
          }
       },
       genderTranslation() {
@@ -301,8 +305,12 @@ export default {
                return 'person.gender.woman';
             case 'man':
                return 'person.gender.man';
-            case 'neuter':
+            case 'both':
-               return 'person.gender.neuter';
+               return 'person.gender.both';
+           case 'unknown':
+               return 'person.gender.unknown';
+           default:
+               return 'person.gender.unknown';
          }
       },
       feminized() {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js

@@ -36,7 +36,8 @@ const personMessages = {
             placeholder: "Choisissez le genre de l'usager",
             woman: "Féminin",
             man: "Masculin",
-            neuter: "Neutre, non binaire",
+            both: "Neutre, non binaire",
+            unknown: "Non renseigné",
             undefined: "Non renseigné"
          },
          civility: {

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -86,9 +86,9 @@
         </div>
         {%- if options['addInfo'] -%}
             {% set gender = (person.gender == 'woman') ? 'fa-venus' :
-                (person.gender == 'man') ? 'fa-mars' : (person.gender == 'neuter') ? 'fa-neuter' : 'fa-genderless' %}
+                (person.gender == 'man') ? 'fa-mars' : (person.gender == 'both') ? 'fa-neuter' : 'fa-genderless' %}
             {% set genderTitle = (person.gender == 'woman') ? 'woman' :
-                (person.gender == 'man') ? 'man' : (person.gender == 'neuter') ? 'neuter' : 'Not given'|trans %}
+                (person.gender == 'man') ? 'man' : (person.gender == 'both') ? 'both' : 'Not given'|trans %}
             <p class="moreinfo">
                 <i class="fa fa-fw {{ gender }}" title="{{ genderTitle|trans }}"></i>
 

src/Bundle/ChillPersonBundle/migrations/Version20231121070151.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Change gender instances of 'neuter' to 'both'.
+ */
+final class Version20231121070151 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Change gender instances of "neuter" to "both"';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("UPDATE chill_person_person SET gender = 'both' WHERE chill_person_person.gender = 'neuter'");
+    }
+
+    public function down(Schema $schema): void {}
+}

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -61,10 +61,10 @@ Spoken languages': 'Langues parlées'
 'Unknown spoken languages': 'Langues parlées inconnues'
 Male: Homme
 Female: Femme
-Neuter: Neutre
+#Both: Neutre
 man: Homme
 woman: Femme
-neuter: Neutre
+#both: Neutre
 Man: Homme
 Woman: Femme
 both: Indéterminé

src/Bundle/ChillPersonBundle/translations/messages.nl.yml

@@ -61,14 +61,14 @@ Remove phone: Verwijderen
 'Unknown spoken languages': 'Gesproken talen ongekend'
 Male: Man
 Female: Vrouw
-Neuter: Non-binair
+Both: Non-binair
 man: Man
 woman: Vrouw
-neuter: Non-binair
+both: Non-binair
 Man: Man
 Woman: Vrouw
-both: Onbepaald
+#both: Onbepaald
-Both: Onbepaald
+#Both: Onbepaald
 Divorced: Gescheiden
 Separated: Uit elkaar
 Widow: Weduwe/weduwnaar