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] 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)) {