From c1ec2933e589f74c32487bc1dbade2acd3e59169 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 17:08:44 +0200
Subject: [PATCH 01/19] person: create a new person: add a civility field

---
 src/Bundle/ChillPersonBundle/Form/CreationPersonType.php    | 6 ++++++
 .../Resources/views/Person/create.html.twig                 | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 2aed9df97..22fd0a12d 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCenterType;
+use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\GenderType;
@@ -55,6 +56,11 @@ final class CreationPersonType extends AbstractType
         $builder
             ->add('firstName')
             ->add('lastName')
+            ->add('civility', PickCivilityType::class, [
+                'required' => false,
+                'label' => 'Civility',
+                'placeholder' => 'choose civility',
+            ])
             ->add('gender', GenderType::class, [
                 'required' => true, 'placeholder' => null,
             ])
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 3a9083310..a5c99379f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -93,6 +93,8 @@
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
+    {{ form_row(form.civility, { 'label' : 'Civility'|trans }) }}
+
     {{ form_row(form.birthdate, { 'label' : 'Date of birth'|trans }) }}
 
     {{ form_row(form.phonenumber, { 'label' : 'Phonenumber'|trans }) }}

From 7a2151f23a7e550d763fbb32cc5f7fd03a6ddb73 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 18:04:36 +0200
Subject: [PATCH 02/19] AddPerson: add civility when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  3 +-
 .../Resources/public/vuejs/_api/OnTheFly.js   |  8 ++++-
 .../public/vuejs/_components/AddPersons.vue   |  2 +-
 .../vuejs/_components/OnTheFly/Person.vue     | 30 +++++++++++++++++--
 .../Resources/public/vuejs/_js/i18n.js        |  4 +++
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 669c225dd..5949a1e56 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -210,7 +210,6 @@ export default {
          let
             type = this.type,
             data = {} ;
-
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
@@ -238,7 +237,7 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.civility !== 'undefined' && null !== data.profession) {
+                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
                      // console.log('onthefly data', data);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
index 20ed1c8da..338094122 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -14,8 +14,13 @@ const getPersonAltNames = () =>
    fetch('/api/1.0/person/config/alt_names.json').then(response => {
       if (response.ok) { return response.json(); }
       throw Error('Error with request resource response');
-   });;
+   });
 
+const getCivilities = () =>
+   fetch('/api/1.0/main/civility.json').then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
 
 /*
 * POST a new person
@@ -56,6 +61,7 @@ const patchPerson = (id, body) => {
 export {
    getPerson,
    getPersonAltNames,
+   getCivilities,
    postPerson,
    patchPerson
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 90505a1e2..47cae34b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -277,7 +277,7 @@ export default {
          }
       },
       saveFormOnTheFly({ type, data }) {
-         // console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
+         console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
          if (type === 'person') {
             makeFetch('POST', '/api/1.0/person/person.json', data)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index e6fa85902..940b4de41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,6 +87,20 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
+   <div class="form-floating mb-3">
+      <select
+         class="form-select form-select-lg"
+         id="civility"
+         v-model="civility"
+         >
+         <option selected disabled >{{ $t('person.civility.placeholder') }}</option>
+         <option v-for="c in config.civilities" :value="c.id" :key="c.id">
+            {{ c.name.fr }}
+         </option>
+      </select>
+      <label>{{ $t('person.civility.title') }}</label>
+   </div>
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="birthdate"><i class="fa fa-fw fa-birthday-cake"></i></span>
       <input type="date"
@@ -134,7 +148,7 @@
 </template>
 
 <script>
-import { getPerson, getPersonAltNames } from '../../_api/OnTheFly';
+import { getCivilities, getPerson, getPersonAltNames } from '../../_api/OnTheFly';
 import PersonRenderBox from '../Entity/PersonRenderBox.vue';
 
 export default {
@@ -151,7 +165,8 @@ export default {
             altNames: []
          },
          config: {
-            altNames: []
+            altNames: [],
+            civilities: []
          },
          errors: []
       }
@@ -171,6 +186,10 @@ export default {
          set(value) { this.person.gender = value; },
          get() { return this.person.gender; }
       },
+      civility: {
+         set(value) { this.person.civility = value; },
+         get() { return this.person.civility; }
+      },
       birthDate: {
          set(value) {
             if (this.person.birthdate) {
@@ -230,6 +249,13 @@ export default {
          .then(altNames => {
             this.config.altNames = altNames;
          });
+      getCivilities()
+         .then(civilities => {
+            if ('results' in civilities) {
+               this.config.civilities = civilities.results;
+            }
+         });
+
       if (this.action !== 'create') {
          this.loadData();
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 7b6a6373d..894a506c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -38,6 +38,10 @@ const personMessages = {
             man: "Masculin",
             neuter: "Neutre, non binaire",
             undefined: "Non renseigné"
+         },
+         civility: {
+            title: "Civilité",
+            placeholder: "Choisissez la civilité",
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From 7d3239d6d6f8b4581e79e9881cf477571d1a1af3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:37:16 +0200
Subject: [PATCH 03/19] person: fix adding civility to a person with OnTheFly
 form

---
 .../public/vuejs/_components/OnTheFly/Person.vue  |  6 +++---
 .../Normalizer/PersonJsonNormalizer.php           | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 940b4de41..96ed08f1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,7 +87,7 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
-   <div class="form-floating mb-3">
+   <div v-if="action === 'create'" class="form-floating mb-3">
       <select
          class="form-select form-select-lg"
          id="civility"
@@ -187,8 +187,8 @@ export default {
          get() { return this.person.gender; }
       },
       civility: {
-         set(value) { this.person.civility = value; },
-         get() { return this.person.civility; }
+         set(value) { this.person.civility = {id: value}; },
+         get() { return this.person.civility ? this.person.civility.id : undefined; }
       },
       birthDate: {
          set(value) {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 41c06e9ec..b4d4fc019 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
+use Chill\MainBundle\Repository\CivilityRepository;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
@@ -54,6 +56,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private PersonRepository $repository;
 
+    private CivilityRepository $civilityRepository;
+
     private ResidentialAddressRepository $residentialAddressRepository;
 
     public function __construct(
@@ -61,12 +65,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
         ResidentialAddressRepository $residentialAddressRepository,
+        CivilityRepository $civilityRepository,
         PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
     ) {
         $this->render = $render;
         $this->repository = $repository;
         $this->centerResolverManager = $centerResolverManager;
         $this->residentialAddressRepository = $residentialAddressRepository;
+        $this->civilityRepository = $civilityRepository;
         $this->phoneNumberHelper = $phoneNumberHelper;
     }
 
@@ -101,6 +107,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'center',
             'altNames',
             'email',
+            'civility'
         ];
 
         $fields = array_filter(
@@ -176,6 +183,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                 case 'email':
                     $person->setEmail($data[$item]);
 
+                    break;
+
+                case 'civility':
+                    //$civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, $context); // this seems the right way to do it, but this does not render a Civility object.
+                    $civility = $this->civilityRepository->findOneBy(['id' => $data[$item]['id']]);
+
+                    $person->setCivility($civility);
+
                     break;
             }
         }

From 4009f3ffda60eda7ef32aec915d8045f5218648e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:47:38 +0200
Subject: [PATCH 04/19] php code fix

---
 .../Serializer/Normalizer/PersonJsonNormalizer.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index b4d4fc019..f4f463118 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -50,14 +50,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private CenterResolverManagerInterface $centerResolverManager;
 
+    private CivilityRepository $civilityRepository;
+
     private PhoneNumberHelperInterface $phoneNumberHelper;
 
     private ChillEntityRenderExtension $render;
 
     private PersonRepository $repository;
 
-    private CivilityRepository $civilityRepository;
-
     private ResidentialAddressRepository $residentialAddressRepository;
 
     public function __construct(
@@ -107,7 +107,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'center',
             'altNames',
             'email',
-            'civility'
+            'civility',
         ];
 
         $fields = array_filter(

From 946ae31d112342e46c137ab65f3d0f26345290a6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:47:51 +0200
Subject: [PATCH 05/19] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6ae8c947..ce3ac06b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
 * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);

From ae45f5f40bbbc1243e689396d3445c953c628285 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 11:11:41 +0200
Subject: [PATCH 06/19] person: add address when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  7 ++++
 .../public/vuejs/_components/AddPersons.vue   |  1 +
 .../vuejs/_components/OnTheFly/Person.vue     | 34 +++++++++++++++++--
 .../Resources/public/vuejs/_js/i18n.js        |  3 ++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 5949a1e56..b080cc52d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -240,6 +240,13 @@ export default {
                      if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
+                     if (null !== data.addressId) {
+                        console.log(data)
+                        //TODO make a good address object
+                        // attach the addressId
+                        // test if this condition is safe
+
+                     }
                      // console.log('onthefly data', data);
                   }
                } else {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 47cae34b1..66fe64579 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -278,6 +278,7 @@ export default {
       },
       saveFormOnTheFly({ type, data }) {
          console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
+         //TODO: create a household if address in data.
          if (type === 'person') {
             makeFetch('POST', '/api/1.0/person/person.json', data)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 96ed08f1d..d7ab79c0a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -138,6 +138,16 @@
          aria-describedby="email" />
    </div>
 
+   <div v-if="action === 'create'" class="form-floating mb-3">
+      <add-address
+         :context="addAddress.context"
+         :options="addAddress.options"
+         :addressChangedCallback="submitNewAddress"
+         ref="addAddress">
+      </add-address>
+   </div>
+
+
    <div class="alert alert-warning" v-if="errors.length">
       <ul>
          <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
@@ -150,24 +160,41 @@
 <script>
 import { getCivilities, getPerson, getPersonAltNames } from '../../_api/OnTheFly';
 import PersonRenderBox from '../Entity/PersonRenderBox.vue';
+import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 
 export default {
    name: "OnTheFlyPerson",
    props: ['id', 'type', 'action', 'query'],
    //emits: ['createAction'],
    components: {
-      PersonRenderBox
+      PersonRenderBox,
+      AddAddress
    },
    data() {
       return {
          person: {
             type: 'person',
-            altNames: []
+            altNames: [],
+            addressId: null
          },
          config: {
             altNames: [],
             civilities: []
          },
+         addAddress: {
+            options: {
+               button: {
+                  text:  { create: 'person.address.create_address' },
+                  size: 'btn-sm'
+               },
+               title: { create: 'person.address.create_address' },
+            },
+            context: {
+               target: {}, // boilerplate for getting the address id
+               edit: false,
+               addressId: null
+            }
+         },
          errors: []
       }
    },
@@ -299,6 +326,9 @@ export default {
                this.person.firstName = queryItem;
                break;
          }
+      },
+      submitNewAddress(payload) {
+         this.person.addressId = payload.addressId;
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 894a506c6..ff8d7e07e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -42,6 +42,9 @@ const personMessages = {
          civility: {
             title: "Civilité",
             placeholder: "Choisissez la civilité",
+         },
+         address: {
+            create_address: "Ajouter une adresse"
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From bea019e9bc0d09331bb0cc2c1b19e99bc9e29514 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 12:23:16 +0200
Subject: [PATCH 07/19] household: API endpoint for posting a household

---
 .../ChillPersonExtension.php                  |  1 +
 .../ChillPersonBundle/chill.api.specs.yaml    | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 6d2bf6d18..230ee5475 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -555,6 +555,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
+                                Request::METHOD_POST => true,
                             ],
                         ],
                         'suggestHouseholdByAccompanyingPeriodParticipation' => [
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index e6fefa5df..6e015107b 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -1137,7 +1137,7 @@ paths:
         200:
           description: "OK"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/accompanying-course/{id}/confidential.json:
     post:
@@ -1327,6 +1327,28 @@ paths:
       responses:
         200:
           description: "ok"
+    post:
+      tags:
+        - household
+      requestBody:
+        description: "A household"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Household"
+      summary: Post a new household
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Unprocessable entity (validation errors)"
+        400:
+          description: "transition cannot be applied"
 
   /1.0/person/household/{id}.json:
     get:
@@ -1507,7 +1529,7 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/household/{id}/address.json:
     post:
@@ -1543,7 +1565,7 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/social/social-action.json:
     get:

From 57ed90a6969cdcd27f645cb34122895023daeed0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 13:41:47 +0200
Subject: [PATCH 08/19] person: post an address when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  7 --
 .../public/vuejs/_components/AddPersons.vue   | 79 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index b080cc52d..5949a1e56 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -240,13 +240,6 @@ export default {
                      if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
-                     if (null !== data.addressId) {
-                        console.log(data)
-                        //TODO make a good address object
-                        // attach the addressId
-                        // test if this condition is safe
-
-                     }
                      // console.log('onthefly data', data);
                   }
                } else {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 66fe64579..5e57ae93d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -278,12 +278,82 @@ export default {
       },
       saveFormOnTheFly({ type, data }) {
          console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
-         //TODO: create a household if address in data.
          if (type === 'person') {
+
             makeFetch('POST', '/api/1.0/person/person.json', data)
-               .then(response => {
-                  this.newPriorSuggestion(response);
+               .then(responsePerson => {
+
+                  this.newPriorSuggestion(responsePerson);
                   this.$refs.onTheFly.closeModal();
+
+                  if (null !== data.addressId) {
+                     const household = {
+                        'type': 'household'
+                     };
+                     const address = {
+                        'type': 'address',
+                        'id': data.addressId
+                     };
+                     makeFetch('POST', '/api/1.0/person/household.json', household)
+                        .then(responseHousehold => {
+                           console.log(responseHousehold);
+
+                           const member = {
+                              'concerned': [
+                                 {
+                                    'person': {
+                                       'type': 'person',
+                                       'id': responsePerson.id
+                                    },
+                                    "position": {
+                                       "type": "household_position",
+                                       "id": 4 //TODO, which position?
+                                    },
+                                 }
+                              ],
+                              'destination': {
+                                 'type': 'household',
+                                 'id': responseHousehold.id
+                              }
+                           };
+                           console.log(member);
+                           makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
+                              .then(response => {
+                                 console.log(response);
+                                 makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
+                                    .then(response => {
+                                       console.log(response);
+                                    })
+                                    .catch((error) => {
+                                       if (error.name === 'ValidationException') {
+                                          for (let v of error.violations) {
+                                             this.$toast.open({message: v });
+                                          }
+                                       } else {
+                                          this.$toast.open({message: 'An error occurred'});
+                                       }
+                                    });
+                              })
+                              .catch((error) => {
+                                 if (error.name === 'ValidationException') {
+                                    for (let v of error.violations) {
+                                       this.$toast.open({message: v });
+                                    }
+                                 } else {
+                                    this.$toast.open({message: 'An error occurred'});
+                                 }
+                              });
+                        })
+                        .catch((error) => {
+                           if (error.name === 'ValidationException') {
+                              for (let v of error.violations) {
+                                 this.$toast.open({message: v });
+                              }
+                           } else {
+                              this.$toast.open({message: 'An error occurred'});
+                           }
+                        });
+                  }
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -293,7 +363,8 @@ export default {
                   } else {
                      this.$toast.open({message: 'An error occurred'});
                   }
-               })
+               });
+
          }
          else if (type === 'thirdparty') {
             makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)

From 355c5cf8fd52ec96ebc472c08538c5ba2093463e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 09:54:42 +0200
Subject: [PATCH 09/19] person: add address when creating person in AddPerson:
 fix POSTing household

---
 .../public/vuejs/_components/AddPersons.vue   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 5e57ae93d..3c1cd52b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -291,13 +291,10 @@ export default {
                         'type': 'household'
                      };
                      const address = {
-                        'type': 'address',
                         'id': data.addressId
                      };
                      makeFetch('POST', '/api/1.0/person/household.json', household)
                         .then(responseHousehold => {
-                           console.log(responseHousehold);
-
                            const member = {
                               'concerned': [
                                  {
@@ -305,25 +302,27 @@ export default {
                                        'type': 'person',
                                        'id': responsePerson.id
                                     },
-                                    "position": {
+                                    'position': {
                                        "type": "household_position",
                                        "id": 4 //TODO, which position?
                                     },
+                                    'start_date': {
+                                       'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
+                                    },
+                                    'holder': false, //TODO true or false?
+                                    'comment': null
                                  }
                               ],
                               'destination': {
                                  'type': 'household',
                                  'id': responseHousehold.id
-                              }
+                              },
+                              'composition': null
                            };
-                           console.log(member);
                            makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
-                              .then(response => {
-                                 console.log(response);
+                              .then(_response => {
                                  makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
-                                    .then(response => {
-                                       console.log(response);
-                                    })
+                                    .then(_response => {})
                                     .catch((error) => {
                                        if (error.name === 'ValidationException') {
                                           for (let v of error.violations) {

From 584111b5f77dc1bb94f4d80f12199fd820375cc8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 11:39:08 +0200
Subject: [PATCH 10/19] person: Add checkobox for adding address in AddPerson

---
 .../vuejs/_components/OnTheFly/Person.vue     | 19 ++++++++++++++++++-
 .../Resources/public/vuejs/_js/i18n.js        |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index d7ab79c0a..bb74e9361 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -138,7 +138,14 @@
          aria-describedby="email" />
    </div>
 
-   <div v-if="action === 'create'" class="form-floating mb-3">
+   <div class="input-group mb-3 form-check">
+      <input class="form-check-input"
+         type='checkbox'
+         v-model="showAddressForm"
+         name='showAddressForm'/>
+      <label class="form-check-label">{{ $t('person.address.show_address_form') }}</label>
+   </div>
+   <div v-if="action === 'create' && showAddressFormValue" class="form-floating mb-3">
       <add-address
          :context="addAddress.context"
          :options="addAddress.options"
@@ -181,6 +188,7 @@ export default {
             altNames: [],
             civilities: []
          },
+         showAddressFormValue: false,
          addAddress: {
             options: {
                button: {
@@ -241,6 +249,10 @@ export default {
          set(value) { this.person.email = value; },
          get() { return this.person.email; }
       },
+      showAddressForm: {
+         set(value) { this.showAddressFormValue = value; },
+         get() { return this.showAddressFormValue; }
+      },
       genderClass() {
          switch (this.person.gender) {
             case 'woman':
@@ -349,4 +361,9 @@ dl {
       margin-left: 1em;
    }
 }
+div.form-check {
+   label {
+      margin-left: 1rem;
+   }
+}
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index ff8d7e07e..787196860 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -44,7 +44,8 @@ const personMessages = {
             placeholder: "Choisissez la civilité",
          },
          address: {
-            create_address: "Ajouter une adresse"
+            create_address: "Ajouter une adresse",
+            show_address_form: "Créer un ménage et ajouter une adresse"
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From 84038c0ff20058ab5fa184b039cb3449ca4ac5f5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 13:17:40 +0200
Subject: [PATCH 11/19] person: Add checkobox for adding address in AddPerson -
 css

---
 .../Resources/public/vuejs/_components/OnTheFly/Person.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index bb74e9361..3f8fd1043 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -363,7 +363,7 @@ dl {
 }
 div.form-check {
    label {
-      margin-left: 1rem;
+      margin-left: 0.5em!important;
    }
 }
 </style>

From 4bc8da965587b6862cfa2d7b63446ca4849a84cd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 14:56:41 +0200
Subject: [PATCH 12/19] person: create a person with address (php form)

---
 .../Controller/PersonController.php           | 21 +++++++++++++++++++
 .../Form/CreationPersonType.php               | 12 +++++++++++
 .../public/page/person/create-person.js       | 18 ++++++++++++++++
 .../Resources/views/Person/create.html.twig   | 13 ++++++++++++
 .../ChillPersonBundle/chill.webpack.config.js |  1 +
 .../translations/messages.fr.yml              |  1 +
 6 files changed, 66 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 22d3d9388..8cf0c3118 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Form\PersonType;
@@ -260,6 +262,25 @@ final class PersonController extends AbstractController
                     ]);
                 }
 
+                $address = $form->get('address')->getData();
+                $addressForm = $form->get('addressForm')->getData();
+
+                if(null !== $address and $addressForm){
+
+                    $household = new Household();
+
+                    $member = new HouseholdMember();
+                    $member->setPerson($person);
+                    $member->setStartDate(new \DateTimeImmutable());
+
+                    $household->addMember($member);
+                    $household->setForceAddress($address);
+
+                    $this->em->persist($member);
+                    $this->em->persist($household);
+                    $this->em->flush();
+                }
+
                 return $this->redirectToRoute(
                     'chill_person_general_edit',
                     ['person_id' => $person->getId()]
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 22fd0a12d..ef255628e 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Form;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
+use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Form\Type\PickCenterType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
@@ -25,7 +26,9 @@ use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -77,6 +80,15 @@ final class CreationPersonType extends AbstractType
             ])
             ->add('email', EmailType::class, [
                 'required' => false,
+            ])
+            ->add('addressForm', CheckboxType::class, [
+                'label' => 'Create a household and add an address',
+                'required' => false,
+                'mapped' => false
+            ])
+            ->add('address', PickAddressType::class, [
+                'required' => false,
+                'mapped' => false
             ]);
 
         if ($this->askCenters) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
new file mode 100644
index 000000000..7e29c4530
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
@@ -0,0 +1,18 @@
+import { ShowHide } from 'ShowHide';
+
+const addressForm = document.getElementById("addressForm");
+const address = document.getElementById("address");
+
+new ShowHide({
+    froms: [addressForm],
+    container: [address],
+    test: function(froms) {
+        for (let f of froms.values()) {
+            for (let input of f.querySelectorAll('input').values()) {
+                return input.checked;
+            }
+        }
+        return false;
+    },
+    event_name: 'change'
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a5c99379f..a43001ab3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -107,6 +107,13 @@
         {{ form_row(form.center) }}
     {% endif %}
 
+    <div id=addressForm>
+        {{ form_row(form.addressForm) }}
+    </div>
+    <div id=address>
+        {{ form_row(form.address) }}
+    </div>
+
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
             <a class="btn btn-create dropdown-toggle"
@@ -134,4 +141,10 @@
 
 {% block js %}
     {{ encore_entry_script_tags('page_suggest_names') }}
+    {{ encore_entry_script_tags('page_create_person') }}
+    {{ encore_entry_script_tags('mod_input_address') }}
 {% endblock js %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 57f2bae94..85ee83c93 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -22,4 +22,5 @@ module.exports = function(encore, entries)
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
     encore.addEntry('page_person_resource_showhide_input', __dirname + '/Resources/public/page/person_resource/showhide-input.js');
     encore.addEntry('page_suggest_names', __dirname + '/Resources/public/page/person/suggest-names.js');
+    encore.addEntry('page_create_person', __dirname + '/Resources/public/page/person/create-person.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index c6baf9513..2059b11dd 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -86,6 +86,7 @@ Civility: Civilité
 choose civility: --
 All genders: tous les genres
 Any person selected: Aucune personne sélectionnée
+Create a household and add an address: Créer un ménage et ajouter une adresse
 
 # dédoublonnage
 Old person: Doublon

From c214c2f4a4331c25310f151eae836d7ec8b67ad5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 17:09:10 +0200
Subject: [PATCH 13/19] household: safe display of household members without
 positions

---
 .../ChillPersonBundle/Form/HouseholdMemberType.php  | 13 ++++++++-----
 .../views/Person/household_history.html.twig        |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 99c698c91..192142043 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -26,12 +26,15 @@ class HouseholdMemberType extends AbstractType
                 'input' => 'datetime_immutable',
             ]);
 
-        if (!$options['data']->getPosition()->getShareHousehold()) {
-            $builder->add('endDate', ChillDateType::class, [
-                'label' => 'household.End date',
-                'input' => 'datetime_immutable',
-            ]);
+        if (null !== $options['data']->getPosition()) {
+            if (!$options['data']->getPosition()->getShareHousehold()) {
+                $builder->add('endDate', ChillDateType::class, [
+                    'label' => 'household.End date',
+                    'input' => 'datetime_immutable',
+                ]);
+            }
         }
+
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index 1ff91de15..6f7ce0a06 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -48,7 +48,9 @@
                 </div>
                 <div class="wl-col list">
                     <p class="item">
-                        {{ p.position.label|localize_translatable_string }}
+                        {% if p.position %}
+                            {{ p.position.label|localize_translatable_string }}
+                        {% endif %}
                         {% if p.holder %}
                             <span class="fa-stack fa-holder" title="{{ 'houshold.holder'|trans|e('html_attr') }}">
                                 <i class="fa fa-circle fa-stack-1x text-success"></i>

From bad5506b986fa96792862f0687a698c7bddc18f4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 18:01:25 +0200
Subject: [PATCH 14/19] person: create a person with address (and household
 without position (remove required position for household member)

---
 .../Entity/Household/HouseholdMember.php      |   9 +-
 .../Household/MembersEditor.php               | 111 +++++++++---------
 .../public/vuejs/_components/AddPersons.vue   |   6 +-
 .../vuejs/_components/OnTheFly/Person.vue     |   1 +
 .../Resources/public/vuejs/_js/i18n.js        |   3 +-
 .../Resources/views/Person/create.html.twig   |   1 +
 .../Normalizer/MembersEditorNormalizer.php    |  18 ++-
 .../translations/messages.fr.yml              |   1 +
 8 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 22c33f85f..4b71ad560 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -82,14 +82,13 @@ class HouseholdMember
     /**
      * @ORM\ManyToOne(targetEntity=Position::class)
      * @Serializer\Groups({"read", "docgen:read"})
-     * @Assert\NotNull(groups={"household_memberships_created"})
      */
     private ?Position $position = null;
 
     /**
      * @ORM\Column(type="boolean", name="sharedhousehold")
      */
-    private bool $shareHousehold = false;
+    private bool $shareHousehold = true;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
@@ -201,7 +200,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setPosition(Position $position): self
+    public function setPosition(?Position $position): self
     {
         if ($this->position instanceof Position) {
             throw new LogicException('The position is already set. You cannot change ' .
@@ -209,7 +208,9 @@ class HouseholdMember
         }
 
         $this->position = $position;
-        $this->shareHousehold = $position->getShareHousehold();
+        if (null !== $position){
+            $this->shareHousehold = $position->getShareHousehold();
+        }
 
         return $this;
     }
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 1c7cbb538..01d6d7e9c 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -55,7 +55,7 @@ class MembersEditor
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function addMovement(DateTimeImmutable $date, Person $person, Position $position, ?bool $holder = false, ?string $comment = null): self
+    public function addMovement(DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, ?string $comment = null): self
     {
         if (null === $this->household) {
             throw new LogicException('You must define a household first');
@@ -69,72 +69,75 @@ class MembersEditor
             ->setComment($comment);
         $this->household->addMember($membership);
 
-        if ($position->getShareHousehold()) {
-            // launch event only if moving to a "share household" position,
-            // and if the destination household is different than the previous one
-            $event = new PersonAddressMoveEvent($person);
-            $event->setNextMembership($membership);
+        if (null !== $position) {
+            if ($position->getShareHousehold()) {
+                // launch event only if moving to a "share household" position,
+                // and if the destination household is different than the previous one
+                $event = new PersonAddressMoveEvent($person);
+                $event->setNextMembership($membership);
 
-            $counter = 0;
+                $counter = 0;
 
-            foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
-                if ($participation === $membership) {
-                    continue;
+                foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
+                    if ($participation === $membership) {
+                        continue;
+                    }
+
+                    if ($participation->getStartDate() > $membership->getStartDate()) {
+                        continue;
+                    }
+
+                    ++$counter;
+
+                    if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
+                        $participation->setEndDate($date);
+                        $this->membershipsAffected[] = $participation;
+                        $this->oldMembershipsHashes[] = spl_object_hash($participation);
+
+                        if ($participation->getHousehold() !== $this->household) {
+                            $event->setPreviousMembership($participation);
+                            $this->events[] = $event;
+                        }
+                    }
                 }
 
-                if ($participation->getStartDate() > $membership->getStartDate()) {
-                    continue;
+                // send also the event if there was no participation before
+                if (0 === $counter) {
+                    $this->events[] = $event;
                 }
 
-                ++$counter;
+                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+                    if ($participation->getHousehold() === $this->household
+                        && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
+                        && $participation->getStartDate() <= $membership->getStartDate()
+                    ) {
+                        $participation->setEndDate($membership->getStartDate());
+                    }
+                }
+            } else {
+                // if a members is moved to the same household than the one he belongs to,
+                // we should make it leave the household
+                if ($person->getCurrentHousehold($date) === $this->household) {
+                    $this->leaveMovement($date, $person);
+                }
 
-                if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
-                    $participation->setEndDate($date);
-                    $this->membershipsAffected[] = $participation;
-                    $this->oldMembershipsHashes[] = spl_object_hash($participation);
+                // if there are multiple belongings not sharing household, close the others
+                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+                    if ($participation === $membership) {
+                        continue;
+                    }
 
-                    if ($participation->getHousehold() !== $this->household) {
-                        $event->setPreviousMembership($participation);
-                        $this->events[] = $event;
+                    if ($participation->getHousehold() === $this->household
+                        && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
+                        && $participation->getStartDate() <= $membership->getStartDate()
+                    ) {
+                        $participation->setEndDate($membership->getStartDate());
                     }
                 }
             }
-
-            // send also the event if there was no participation before
-            if (0 === $counter) {
-                $this->events[] = $event;
-            }
-
-            foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                if ($participation->getHousehold() === $this->household
-                    && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
-                    && $participation->getStartDate() <= $membership->getStartDate()
-                ) {
-                    $participation->setEndDate($membership->getStartDate());
-                }
-            }
-        } else {
-            // if a members is moved to the same household than the one he belongs to,
-            // we should make it leave the household
-            if ($person->getCurrentHousehold($date) === $this->household) {
-                $this->leaveMovement($date, $person);
-            }
-
-            // if there are multiple belongings not sharing household, close the others
-            foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                if ($participation === $membership) {
-                    continue;
-                }
-
-                if ($participation->getHousehold() === $this->household
-                    && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
-                    && $participation->getStartDate() <= $membership->getStartDate()
-                ) {
-                    $participation->setEndDate($membership->getStartDate());
-                }
-            }
         }
 
+
         $this->membershipsAffected[] = $membership;
         $this->persistables[] = $membership;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 3c1cd52b1..0d50b368c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -302,14 +302,10 @@ export default {
                                        'type': 'person',
                                        'id': responsePerson.id
                                     },
-                                    'position': {
-                                       "type": "household_position",
-                                       "id": 4 //TODO, which position?
-                                    },
                                     'start_date': {
                                        'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
                                     },
-                                    'holder': false, //TODO true or false?
+                                    'holder': false,
                                     'comment': null
                                  }
                               ],
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 3f8fd1043..27657ff46 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -146,6 +146,7 @@
       <label class="form-check-label">{{ $t('person.address.show_address_form') }}</label>
    </div>
    <div v-if="action === 'create' && showAddressFormValue" class="form-floating mb-3">
+      <p>{{ $t('person.address.warning') }}</p>
       <add-address
          :context="addAddress.context"
          :options="addAddress.options"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 787196860..df8d05a9c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -45,7 +45,8 @@ const personMessages = {
          },
          address: {
             create_address: "Ajouter une adresse",
-            show_address_form: "Créer un ménage et ajouter une adresse"
+            show_address_form: "Créer un ménage et ajouter une adresse",
+            warning: "Un nouveau ménage va être créé. L'usager sera membre de ce ménage."
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a43001ab3..e3631f119 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -111,6 +111,7 @@
         {{ form_row(form.addressForm) }}
     </div>
     <div id=address>
+        <p>{{ 'A new household will be created. The person will be member of this household.'|trans }}</p>
         {{ form_row(form.address) }}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 757a0bfcb..6e1f9da6c 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -116,12 +116,18 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $format,
                 $context
             );
-            $position = $this->denormalizer->denormalize(
-                $concerned['position'] ?? null,
-                Position::class,
-                $format,
-                $context
-            );
+
+            if (\array_key_exists('position', $concerned)) {
+                $position = $this->denormalizer->denormalize(
+                    $concerned['position'] ?? null,
+                    Position::class,
+                    $format,
+                    $context
+                );
+            } else {
+                $position = null;
+            }
+
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
                 DateTimeImmutable::class,
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2059b11dd..b24a5e064 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -87,6 +87,7 @@ choose civility: --
 All genders: tous les genres
 Any person selected: Aucune personne sélectionnée
 Create a household and add an address: Créer un ménage et ajouter une adresse
+A new household will be created. The person will be member of this household.: Un nouveau ménage va être créé. L'usager sera membre de ce ménage.
 
 # dédoublonnage
 Old person: Doublon

From 7a6aa6edcbee27365d8f825b344176580d296472 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 20 Apr 2022 08:51:00 +0200
Subject: [PATCH 15/19] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce3ac06b6..612a50503 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 * [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
 
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)

From f2c60cfd2007ed4b70ba9e0704699b5b10186acb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 20 Apr 2022 08:52:15 +0200
Subject: [PATCH 16/19] php code style fix

---
 .../ChillPersonBundle/Controller/PersonController.php     | 8 ++++----
 .../Entity/Household/HouseholdMember.php                  | 3 ++-
 src/Bundle/ChillPersonBundle/Form/CreationPersonType.php  | 5 ++---
 src/Bundle/ChillPersonBundle/Household/MembersEditor.php  | 1 -
 .../Serializer/Normalizer/MembersEditorNormalizer.php     | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 8cf0c3118..e62368efe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -20,6 +20,7 @@ use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -33,8 +34,8 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function count;
 use function hash;
 use function implode;
@@ -265,13 +266,12 @@ final class PersonController extends AbstractController
                 $address = $form->get('address')->getData();
                 $addressForm = $form->get('addressForm')->getData();
 
-                if(null !== $address and $addressForm){
-
+                if (null !== $address && $addressForm) {
                     $household = new Household();
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
-                    $member->setStartDate(new \DateTimeImmutable());
+                    $member->setStartDate(new DateTimeImmutable());
 
                     $household->addMember($member);
                     $household->setForceAddress($address);
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 4b71ad560..e738528c9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -208,7 +208,8 @@ class HouseholdMember
         }
 
         $this->position = $position;
-        if (null !== $position){
+
+        if (null !== $position) {
             $this->shareHousehold = $position->getShareHousehold();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index ef255628e..0d854b681 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -28,7 +28,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -84,11 +83,11 @@ final class CreationPersonType extends AbstractType
             ->add('addressForm', CheckboxType::class, [
                 'label' => 'Create a household and add an address',
                 'required' => false,
-                'mapped' => false
+                'mapped' => false,
             ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
-                'mapped' => false
+                'mapped' => false,
             ]);
 
         if ($this->askCenters) {
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 01d6d7e9c..8ae41a98b 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -137,7 +137,6 @@ class MembersEditor
             }
         }
 
-
         $this->membershipsAffected[] = $membership;
         $this->persistables[] = $membership;
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 6e1f9da6c..f77a8c669 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -117,7 +117,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $context
             );
 
-            if (\array_key_exists('position', $concerned)) {
+            if (array_key_exists('position', $concerned)) {
                 $position = $this->denormalizer->denormalize(
                     $concerned['position'] ?? null,
                     Position::class,

From 3ed562e5d9f6a50325a54010b5c0829a8844167b Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 21 Apr 2022 18:23:47 +0200
Subject: [PATCH 17/19] person: create a person with address and attribute the
 household to the create ousehold button

---
 .../Controller/PersonController.php           | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index e62368efe..13e22cf90 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -251,18 +251,6 @@ final class PersonController extends AbstractController
                 $this->em->flush();
                 $this->lastPostDataReset();
 
-                if ($form->get('createPeriod')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
-                        'person_id' => [$person->getId()],
-                    ]);
-                }
-
-                if ($form->get('createHousehold')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_household_members_editor', [
-                        'persons' => [$person->getId()],
-                    ]);
-                }
-
                 $address = $form->get('address')->getData();
                 $addressForm = $form->get('addressForm')->getData();
 
@@ -279,6 +267,25 @@ final class PersonController extends AbstractController
                     $this->em->persist($member);
                     $this->em->persist($household);
                     $this->em->flush();
+
+                    if ($form->get('createHousehold')->isClicked()) {
+                        return $this->redirectToRoute('chill_person_household_members_editor', [
+                            'persons' => [$person->getId()],
+                            'household' => $household->getId()
+                        ]);
+                    }
+                }
+
+                if ($form->get('createPeriod')->isClicked()) {
+                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
+                        'person_id' => [$person->getId()],
+                    ]);
+                }
+
+                if ($form->get('createHousehold')->isClicked()) {
+                    return $this->redirectToRoute('chill_person_household_members_editor', [
+                        'persons' => [$person->getId()],
+                    ]);
                 }
 
                 return $this->redirectToRoute(

From 6abbf9bf216f479483ca5d7230c77d621c05e168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 11:43:05 +0200
Subject: [PATCH 18/19] improves create a person with address

* validation: must have an address when 'create a form' is checked;
* minor improvements
---
 .../Resources/views/layout.html.twig          | 48 ++++++++++---------
 .../Controller/PersonController.php           |  4 +-
 .../Entity/Household/HouseholdMember.php      |  4 +-
 .../Form/CreationPersonType.php               | 22 +++++++++
 .../Resources/views/Person/create.html.twig   |  3 +-
 .../translations/validators.fr.yml            |  5 +-
 6 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index c11422a1b..f59e0aaff 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -36,33 +36,35 @@
 
                 {# Flash messages ! #}
                 {% if app.session.flashbag.keys()|length > 0 %}
-                <div class="col-8 mb-5 flash_message">
+                    <div class="row justify-content-center">
+                        <div class="col-10 mb-5 flash_message">
+
+                            {% for flashMessage in app.session.flashbag.get('success') %}
+                                <div class="alert alert-success flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
+
+                            {% for flashMessage in app.session.flashbag.get('error') %}
+                                <div class="alert alert-danger flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
+
+                            {% for flashMessage in app.session.flashbag.get('notice') %}
+                                <div class="alert alert-warning flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
 
-                    {% for flashMessage in app.session.flashbag.get('success') %}
-                        <div class="alert alert-success flash_message">
-                            <span>{{ flashMessage|raw }}</span>
                         </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('error') %}
-                        <div class="alert alert-danger flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('notice') %}
-                        <div class="alert alert-warning flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                </div>
+                    </div>
                 {% endif %}
 
                 {% block content %}
                     <div class="col-8 main_search">
                         <h2>{{ 'Search'|trans }}</h2>
-    
+
                         <form action="{{ path('chill_main_search') }}" method="get">
                             <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
                             <center>
@@ -75,11 +77,11 @@
                             </center>
                         </form>
                     </div>
-    
+
                     {#  DISABLED {{  chill_widget('homepage', {} ) }} #}
-                    
+
                     {% include '@ChillMain/Homepage/index.html.twig' %}
-                    
+
                 {% endblock %}
 
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index ca5de4ef0..a4a29216c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -252,7 +252,7 @@ final class PersonController extends AbstractController
                 $this->lastPostDataReset();
 
                 $address = $form->get('address')->getData();
-                $addressForm = $form->get('addressForm')->getData();
+                $addressForm = (bool) $form->get('addressForm')->getData();
 
                 if (null !== $address && $addressForm) {
                     $household = new Household();
@@ -271,7 +271,7 @@ final class PersonController extends AbstractController
                     if ($form->get('createHousehold')->isClicked()) {
                         return $this->redirectToRoute('chill_person_household_members_editor', [
                             'persons' => [$person->getId()],
-                            'household' => $household->getId()
+                            'household' => $household->getId(),
                         ]);
                     }
                 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index e738528c9..2de526ee6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -35,7 +35,7 @@ class HouseholdMember
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read", "docgen:read"})
-     * @Assert\GreaterThan(
+     * @Assert\GreaterThanOrEqual(
      *     propertyPath="startDate",
      *     message="household_membership.The end date must be after start date",
      *     groups={"household_memberships"}
@@ -202,7 +202,7 @@ class HouseholdMember
 
     public function setPosition(?Position $position): self
     {
-        if ($this->position instanceof Position) {
+        if ($this->position instanceof Position && $this->position !== $position) {
             throw new LogicException('The position is already set. You cannot change ' .
                 'a position of a membership');
         }
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 0d854b681..124db26eb 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
@@ -30,6 +31,8 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class CreationPersonType extends AbstractType
 {
@@ -84,10 +87,12 @@ final class CreationPersonType extends AbstractType
                 'label' => 'Create a household and add an address',
                 'required' => false,
                 'mapped' => false,
+                'help' => 'A new household will be created. The person will be member of this household.',
             ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
                 'mapped' => false,
+                'label' => false,
             ]);
 
         if ($this->askCenters) {
@@ -114,6 +119,9 @@ final class CreationPersonType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => Person::class,
+            'constraints' => [
+                new Callback([$this, 'validateCheckedAddress']),
+            ],
         ]);
     }
 
@@ -124,4 +132,18 @@ final class CreationPersonType extends AbstractType
     {
         return self::NAME;
     }
+
+    public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
+    {
+        /** @var bool $addressFrom */
+        $addressFrom = $context->getObject()->get('addressForm')->getData();
+        /** @var ?Address $address */
+        $address = $context->getObject()->get('address')->getData();
+
+        if ($addressFrom && null === $address) {
+            $context->buildViolation('person_creation.If you want to create an household, an address is required')
+                ->atPath('addressForm')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index e3631f119..03bece4d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -111,7 +111,6 @@
         {{ form_row(form.addressForm) }}
     </div>
     <div id=address>
-        <p>{{ 'A new household will be created. The person will be member of this household.'|trans }}</p>
         {{ form_row(form.address) }}
     </div>
 
@@ -148,4 +147,4 @@
 
 {% block css %}
     {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index b2bc549d7..c9c8d8648 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -65,4 +65,7 @@ The person where the course is located must be associated to the course. Change
 
 #relationship
 relationship:
-    duplicate: Une relation de filiation existe déjà entre ces 2 personnes
\ No newline at end of file
+    duplicate: Une relation de filiation existe déjà entre ces 2 personnes
+
+person_creation:
+    If you want to create an household, an address is required: Pour la création d'un ménage, une adresse est requise

From 6c246a0d38aba73dc363f39134fb4e3dfb35028f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 12:54:01 +0200
Subject: [PATCH 19/19] allow to edit civility in onTheFly

---
 .../public/vuejs/OnTheFly/components/OnTheFly.vue        | 1 +
 .../components/PersonsAssociated/ParticipationItem.vue   | 1 +
 .../components/Resources/ResourceItem.vue                | 1 +
 .../Resources/public/vuejs/_components/AddPersons.vue    | 3 ++-
 .../public/vuejs/_components/OnTheFly/Person.vue         | 6 +++---
 .../Serializer/Normalizer/PersonJsonNormalizer.php       | 9 ++-------
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 5949a1e56..e3991fe2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -213,6 +213,7 @@ export default {
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
+               console.log('person data are', data);
                break;
 
             case 'thirdparty':
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 1a1a7e26e..ff8aef961 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -123,6 +123,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
+            body.civility = payload.data.civility;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index df2bd0c35..605ab6443 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -150,6 +150,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
+            body.civility = payload.data.civility;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 0d50b368c..f84fc2e1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -303,6 +303,7 @@ export default {
                                        'id': responsePerson.id
                                     },
                                     'start_date': {
+                                       // TODO: use date.js methods (low priority)
                                        'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
                                     },
                                     'holder': false,
@@ -315,7 +316,7 @@ export default {
                               },
                               'composition': null
                            };
-                           makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
+                           return makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
                               .then(_response => {
                                  makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
                                     .then(_response => {})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 27657ff46..5a8708cc3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,7 +87,7 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
-   <div v-if="action === 'create'" class="form-floating mb-3">
+   <div class="form-floating mb-3">
       <select
          class="form-select form-select-lg"
          id="civility"
@@ -223,8 +223,8 @@ export default {
          get() { return this.person.gender; }
       },
       civility: {
-         set(value) { this.person.civility = {id: value}; },
-         get() { return this.person.civility ? this.person.civility.id : undefined; }
+         set(value) { this.person.civility = {id: value, type: 'chill_main_civility'}; },
+         get() { return this.person.civility ? this.person.civility.id : null; }
       },
       birthDate: {
          set(value) {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index f4f463118..6149eff9e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
-use Chill\MainBundle\Repository\CivilityRepository;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
@@ -50,8 +49,6 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private CenterResolverManagerInterface $centerResolverManager;
 
-    private CivilityRepository $civilityRepository;
-
     private PhoneNumberHelperInterface $phoneNumberHelper;
 
     private ChillEntityRenderExtension $render;
@@ -65,14 +62,12 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
         ResidentialAddressRepository $residentialAddressRepository,
-        CivilityRepository $civilityRepository,
         PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
     ) {
         $this->render = $render;
         $this->repository = $repository;
         $this->centerResolverManager = $centerResolverManager;
         $this->residentialAddressRepository = $residentialAddressRepository;
-        $this->civilityRepository = $civilityRepository;
         $this->phoneNumberHelper = $phoneNumberHelper;
     }
 
@@ -186,8 +181,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                     break;
 
                 case 'civility':
-                    //$civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, $context); // this seems the right way to do it, but this does not render a Civility object.
-                    $civility = $this->civilityRepository->findOneBy(['id' => $data[$item]['id']]);
+                    $civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, []);
 
                     $person->setCivility($civility);
 
@@ -227,6 +221,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber(), $format, $context),
             'email' => $person->getEmail(),
             'gender' => $person->getGender(),
+            'civility' => $this->normalizer->normalize($person->getCivility(), $format, $context),
         ];
 
         if (in_array('minimal', $groups, true) && 1 === count($groups)) {