From 0afcf3d79e6cde2e3ff91cff528372e12a870cd4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 12 May 2021 11:52:05 +0200
Subject: [PATCH 01/37] address selection: move marker on the leaflet map on
 update map

---
 .../public/vuejs/_components/AddAddress/AddressMap.vue        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
index 5b616819d..2528f8e23 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
@@ -11,6 +11,7 @@ import markerIconPng from 'leaflet/dist/images/marker-icon.png'
 import 'leaflet/dist/leaflet.css';
 
 let map;
+let marker;
 
 export default {
    name: 'AddressMap',
@@ -32,11 +33,12 @@ export default {
             iconUrl: markerIconPng,
          });
 
-         L.marker([48.8589, 2.3469], {icon: markerIcon}).addTo(map);
+         marker = L.marker([48.8589, 2.3469], {icon: markerIcon}).addTo(map);
 
       },
       update() {
          console.log('update map with : ', this.address.addressMap.center)
+         marker.setLatLng(this.address.addressMap.center);
          map.setView(this.address.addressMap.center, 12);
       }
    },

From fee37b5af3b51e4f68a07a3973b74aee17cad943 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 12 May 2021 12:21:19 +0200
Subject: [PATCH 02/37] address selection: use API points for Country and
 PostalCode + remove obsolet Address Controller

---
 .../Controller/AddressController.php          | 63 ----------------
 .../Resources/public/vuejs/_api/AddAddress.js | 32 ++++----
 .../public/vuejs/_components/AddAddress.vue   | 74 +++++++++----------
 .../AddAddress/CountrySelection.vue           | 16 ++--
 4 files changed, 63 insertions(+), 122 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Controller/AddressController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressController.php b/src/Bundle/ChillMainBundle/Controller/AddressController.php
deleted file mode 100644
index 1aeb39062..000000000
--- a/src/Bundle/ChillMainBundle/Controller/AddressController.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Controller;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
-use Symfony\Component\Routing\Annotation\Route;
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\AddressReference;
-
-/**
- * Class AddressController
- *
- * @package Chill\MainBundle\Controller
- */
-class AddressController extends AbstractController
-{
-
-
-    /**
-     * Get API Data for showing endpoint
-     *
-     * @Route(
-     *     "/{_locale}/main/api/1.0/address/{address_id}/show.{_format}",
-     *     name="chill_main_address_api_show"
-     * )
-     * @ParamConverter("address", options={"id": "address_id"})
-     */
-    public function showAddress(Address $address, $_format): Response
-    {
-        // TODO check ACL ?
-        switch ($_format) {
-            case 'json':
-                return $this->json($address);
-            default:
-                throw new BadRequestException('Unsupported format');
-        }
-    }
-
-
-    /**
-     * Get API Data for showing endpoint
-     *
-     * @Route(
-     *     "/{_locale}/main/api/1.0/address-reference/{address_reference_id}/show.{_format}",
-     *     name="chill_main_address_reference_api_show"
-     * )
-     * @ParamConverter("addressReference", options={"id": "address_reference_id"})
-     */
-    public function showAddressReference(AddressReference $addressReference, $_format): Response
-    {
-        // TODO check ACL ?
-        switch ($_format) {
-            case 'json':
-                return $this->json($addressReference);
-            default:
-                throw new BadRequestException('Unsupported format');
-        }
-
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 4de0fcc19..2e80572b7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -1,26 +1,32 @@
 /*
 * Endpoint countries GET
-* TODO
+* method GET, get Country Object
+* @returns {Promise} a promise containing all Country object
 */
 const fetchCountries = () => {
    console.log('<<< fetching countries');
-   return [
-      {id: 1, name: 'France', countryCode: 'FR'},
-      {id: 2, name: 'Belgium', countryCode: 'BE'}
-   ];
+
+   const url = `/api/1.0/main/country.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
 };
 
 /*
-* Endpoint cities GET 
+* Endpoint cities GET
 * TODO
 */
-const fetchCities = (country) => {   
+const fetchCities = (country) => {
    console.log('<<< fetching cities for', country);
-   return [
-      {id: 1, name: 'Bruxelles', code: '1000', country: 'BE'},
-      {id: 2, name: 'Aisne', code: '85045', country: 'FR'},
-      {id: 3, name: 'Saint-Gervais', code: '85230', country: 'FR'}
-   ];
+   //TODO use country
+   const url = `/api/1.0/main/postal-code.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
 };
 
 /*
@@ -30,7 +36,7 @@ const fetchCities = (country) => {
 */
 const fetchReferenceAddresses = (city) => {
     console.log('<<< fetching references addresses for', city); // city n'est pas utilisé pour le moment
-    
+
     const url = `/api/1.0/main/address-reference.json`;
     return fetch(url)
        .then(response => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 55cf2f098..f304f3c45 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -13,14 +13,14 @@
          </template>
 
          <template v-slot:body>
-            
+
             <h4>{{ $t('select_an_address') }}</h4>
-            
+
             <label for="isNoAddress">
-               <input type="checkbox" 
-                  name="isNoAddress" 
-                  v-bind:placeholder="$t('isNoAddress')" 
-                  v-model="isNoAddress" 
+               <input type="checkbox"
+                  name="isNoAddress"
+                  v-bind:placeholder="$t('isNoAddress')"
+                  v-model="isNoAddress"
                   v-bind:value="value"/>
                {{ $t('isNoAddress') }}
             </label>
@@ -29,12 +29,12 @@
                v-bind:address="address"
                v-bind:getCities="getCities">
             </country-selection>
-            
+
             <city-selection
                v-bind:address="address"
                v-bind:getReferenceAddresses="getReferenceAddresses">
             </city-selection>
-            
+
             <address-selection
                v-bind:address="address"
                v-bind:updateMapCenter="updateMapCenter">
@@ -44,12 +44,12 @@
                v-bind:address="address"
                ref="addressMap">
             </address-map>
-            
-            <address-more 
+
+            <address-more
                v-if="!isNoAddress"
                v-bind:address="address">
             </address-more>
-                        
+
             <!--
             <div class="address_form__fields__isNoAddress"></div>
             <div class="address_form__select">
@@ -62,10 +62,10 @@
                <div class="address_form__fields__left"></div>
                <div class="address_form__fields__right"></div>
             </div>
-         
-            à discuter, 
-            mais je pense qu'il est préférable de profiter de l'imbriquation des classes css 
-            
+
+            à discuter,
+            mais je pense qu'il est préférable de profiter de l'imbriquation des classes css
+
             div.address_form {
                div.select {
                   div.header {}
@@ -73,12 +73,12 @@
                   div.map {}
                }
             }
-         
+
             -->
          </template>
 
          <template v-slot:footer>
-            <button class="sc-button green" 
+            <button class="sc-button green"
                @click.prevent="$emit('addNewAddress', { address, modal })">
                <i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
             </button>
@@ -160,32 +160,30 @@ export default {
          this.modal.showModal = true;
          this.resetAll();
          this.getCountries();
-         
+
          //this.$nextTick(function() {
          //   this.$refs.search.focus(); // positionner le curseur à l'ouverture de la modale
          //})
       },
       getCountries() {
          console.log('getCountries');
-         this.address.loaded.countries = fetchCountries(); // à remplacer par
-         //  fetchCountries().then(countries => new Promise((resolve, reject) => {
-         //     this.address.loaded.countries = countries;
-         //     resolve()
-         //  }))
-         //  .catch((error) => { 
-         //     this.errorMsg.push(error.message); 
-         //  }); 
+         fetchCountries().then(countries => new Promise((resolve, reject) => {
+             this.address.loaded.countries = countries.results;
+             resolve()
+          }))
+          .catch((error) => {
+             this.errorMsg.push(error.message);
+          });
       },
       getCities(country) {
          console.log('getCities for', country.name);
-         this.address.loaded.cities = fetchCities(); // à remplacer par
-         //  fetchCities(country).then(cities => new Promise((resolve, reject) => {
-         //     this.address.loaded.cities = cities;
-         //     resolve()
-         //  }))
-         //  .catch((error) => { 
-         //     this.errorMsg.push(error.message); 
-         //  }); 
+         fetchCities(country).then(cities => new Promise((resolve, reject) => {
+            this.address.loaded.cities = cities.results;
+            resolve()
+         }))
+         .catch((error) => {
+            this.errorMsg.push(error.message);
+         });
       },
       getReferenceAddresses(city) {
          console.log('getReferenceAddresses for', city.name);
@@ -195,9 +193,9 @@ export default {
                this.address.loaded.addresses = addresses.results;
                resolve();
             }))
-            .catch((error) => { 
-               this.errorMsg.push(error.message); 
-            }); 
+            .catch((error) => {
+               this.errorMsg.push(error.message);
+            });
       },
       updateMapCenter(point) {
          console.log('point', point);
@@ -208,7 +206,7 @@ export default {
       resetAll() {
          console.log('reset all selected');
          this.address.loaded.addresses = [];
-         this.address.selected.address = {}; 
+         this.address.selected.address = {};
          this.address.loaded.cities = [];
          this.address.selected.city = {};
          this.address.selected.country = {};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 4eb591135..0ca2c0b87 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -1,14 +1,14 @@
 <template>
    <div class="container">
-      <select 
+      <select
          v-model="selected">
          <option :value="{}" disabled selected>{{ $t('select_country') }}</option>
-         <option 
-            v-for="item in this.countries" 
-            v-bind:item="item" 
-            v-bind:key="item.id" 
+         <option
+            v-for="item in this.countries"
+            v-bind:item="item"
+            v-bind:key="item.id"
             v-bind:value="item">
-            {{ item.name }}
+            {{ item.name.fr }}
          </option>
       </select>
    </div>
@@ -20,8 +20,8 @@ export default {
    name: 'CountrySelection',
    props: ['address', 'getCities'],
    computed: {
-      countries() { 
-         return this.address.loaded.countries; 
+      countries() {
+         return this.address.loaded.countries; // TODO place Belgium and France first
       },
       selected: {
          set(value) {

From b51575fc49e16edad5c6e6760e972c55c0a4de34 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 12 May 2021 15:03:15 +0200
Subject: [PATCH 03/37] address selection: order preferred countries

---
 .../Resources/public/vuejs/_api/AddAddress.js              | 3 ++-
 .../vuejs/_components/AddAddress/CountrySelection.vue      | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 2e80572b7..3b055da79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -6,7 +6,7 @@
 const fetchCountries = () => {
    console.log('<<< fetching countries');
 
-   const url = `/api/1.0/main/country.json`;
+   const url = `/api/1.0/main/country.json?item_per_page=1000`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
@@ -21,6 +21,7 @@ const fetchCountries = () => {
 const fetchCities = (country) => {
    console.log('<<< fetching cities for', country);
    //TODO use country
+   //TODO deal with huge number of postal code ... we should do suggestion...
    const url = `/api/1.0/main/postal-code.json`;
    return fetch(url)
       .then(response => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 0ca2c0b87..7d5e039e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -21,7 +21,12 @@ export default {
    props: ['address', 'getCities'],
    computed: {
       countries() {
-         return this.address.loaded.countries; // TODO place Belgium and France first
+         const countries = this.address.loaded.countries;
+         let orderedCountries = [];
+         orderedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
+         orderedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
+         orderedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
+         return orderedCountries;
       },
       selected: {
          set(value) {

From bbb9dc256123d8574fed66d620fc3b5d502ff1cc Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 17 May 2021 13:18:18 +0200
Subject: [PATCH 04/37] address reference: command for loading addresse
 reference (WIP)

---
 .../Command/LoadAddressReferenceCommand.php   | 126 ++++++++++++++++++
 .../config/services/command.yaml              |   8 +-
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
new file mode 100644
index 000000000..2f2f56800
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -0,0 +1,126 @@
+<?php
+namespace Chill\MainBundle\Command;
+
+use Doctrine\ORM\EntityManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Entity\AddressReference;
+
+/**
+ *
+ * @author Champs-Libres
+ *
+ */
+class LoadAddressReferenceCommand extends Command
+{
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * LoadAddressReferenceCommand constructor.
+     *
+     * @param EntityManager $entityManager
+     */
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager=$entityManager;
+        parent::__construct();
+    }
+
+    /*
+     * (non-PHPdoc)
+     * @see \Symfony\Component\Console\Command\Command::configure()
+     */
+    protected function configure(): void
+    {
+        $this
+            ->setName('chill:main:address-reference:populate')
+            ->setDescription('Load or update countries in db. This command does not delete or update existing address reference,'.
+                'but will add new address reference entities based on their timestamp');
+    }
+
+    /*
+     * (non-PHPdoc)
+     * @see \Symfony\Component\Console\Command\Command::execute()
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $addressReferenceArray = static::fetchVendeeBAL();
+        $em = $this->entityManager;
+
+        foreach($addressReferenceArray as $a) {
+            if (static::isAddressReferenceNew($a)) {
+                $em->persist($a);
+            }
+        }
+
+        $em->flush();
+
+        return 0;
+    }
+
+    public static function isAddressReferenceNew(AddressReference $a): bool
+    {
+        $cond = true;
+        // TODO: write this function
+
+        return $cond;
+    }
+
+
+    /*
+     * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
+     * @see \Symfony\Component\Console\Command\Command::execute()
+     */
+    public static function fetchVendeeBAL(): array
+    {
+
+        $dataSource = 'Vendée Base d\'adresses locale';
+
+        $addressReferenceArray = array();
+
+        $wfsUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature';
+
+        $wfsContent = file_get_contents($wfsUrl.'&version=2.0.0&TYPENAME=CHILL:Adresses&MAXFEATURES=3&OUTPUTFORMAT=geojson');
+        //TODO loop for pagination
+
+        $jsonContent = json_decode($wfsContent, true);
+
+        dump($jsonContent);
+        foreach ($jsonContent['features'] as $key => $value) {
+            dump($key);
+            dump($value);
+
+            $a = new AddressReference();
+
+            $x = $value['geometry']['coordinates'][0];
+            $y = $value['geometry']['coordinates'][1]; //TODO get the coordinates in EPSG:4326
+
+            $lon = -1.4 + 0.01 * rand(-5, 5);
+            $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp
+
+            $point = Point::fromLonLat($lon, $lat);
+
+            $a->setRefId($value['properties']['OBJECTID']);
+            $a->setStreet($value['properties']['NOM_AFNOR']);
+            $a->setStreetNumber($value['properties']['NUMERO']);
+            $a->setPoint($point);
+            //$a->setPostcode('1000'); //TODO find postal code from the postal code in $value['properties']['CODE_POST'] //TODO store postcode if not found???
+            $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
+            $a->setSource($dataSource);
+
+            $addressReferenceArray[] = $a;
+        }
+
+        dump($addressReferenceArray);
+
+        return $addressReferenceArray;
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index 223449bfa..fc35f1e06 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -7,7 +7,7 @@ services:
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags:
             - { name: console.command }
-            
+
     Chill\MainBundle\Command\ChillUserSendRenewPasswordCodeCommand:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -44,3 +44,9 @@ services:
             $entityManager: '@doctrine.orm.entity_manager'
         tags:
             - { name: console.command }
+
+    Chill\MainBundle\Command\LoadAddressReferenceCommand:
+        arguments:
+            $entityManager: '@doctrine.orm.entity_manager'
+        tags:
+            - { name: console.command }

From 5f8a506c84ff30f3ca541db48eb6329a74ced637 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 18 May 2021 07:58:48 +0200
Subject: [PATCH 05/37] addresses: add postcode in address reference load
 command

---
 .../Command/LoadAddressReferenceCommand.php   | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
index 2f2f56800..64ee10e5f 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -51,7 +51,7 @@ class LoadAddressReferenceCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $addressReferenceArray = static::fetchVendeeBAL();
+        $addressReferenceArray = $this->fetchWFS();
         $em = $this->entityManager;
 
         foreach($addressReferenceArray as $a) {
@@ -78,10 +78,11 @@ class LoadAddressReferenceCommand extends Command
      * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
-    public static function fetchVendeeBAL(): array
+    private function fetchWFS(): array
     {
 
-        $dataSource = 'Vendée Base d\'adresses locale';
+        $dataSource = 'BAL GeoVendee';
+        $countryCode = 'FR';
 
         $addressReferenceArray = array();
 
@@ -92,35 +93,43 @@ class LoadAddressReferenceCommand extends Command
 
         $jsonContent = json_decode($wfsContent, true);
 
-        dump($jsonContent);
+
         foreach ($jsonContent['features'] as $key => $value) {
-            dump($key);
-            dump($value);
 
             $a = new AddressReference();
 
             $x = $value['geometry']['coordinates'][0];
-            $y = $value['geometry']['coordinates'][1]; //TODO get the coordinates in EPSG:4326
+            $y = $value['geometry']['coordinates'][1];
 
-            $lon = -1.4 + 0.01 * rand(-5, 5);
-            $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp
+            $lon = -1.4 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
+            $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
 
             $point = Point::fromLonLat($lon, $lat);
 
+            $em = $this->entityManager;
+
+            $country = $em
+                ->getRepository('ChillMainBundle:Country')
+                ->findOneBy(array('countryCode' => $countryCode));
+
+            $postcode = $em
+                ->getRepository('ChillMainBundle:PostalCode')
+                ->findOneBy(array('code' => $value['properties']['CODE_POST'], 'country' => $country));
+
             $a->setRefId($value['properties']['OBJECTID']);
             $a->setStreet($value['properties']['NOM_AFNOR']);
             $a->setStreetNumber($value['properties']['NUMERO']);
             $a->setPoint($point);
-            //$a->setPostcode('1000'); //TODO find postal code from the postal code in $value['properties']['CODE_POST'] //TODO store postcode if not found???
+            $a->setPostcode($postcode);
             $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
             $a->setSource($dataSource);
 
             $addressReferenceArray[] = $a;
         }
 
-        dump($addressReferenceArray);
-
         return $addressReferenceArray;
     }
 
+
+
 }

From 3bc510d116507a6323a42d134a916a889b098733 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 18 May 2021 10:03:36 +0200
Subject: [PATCH 06/37] addresses: add pagination in WFS request (WIP)

---
 .../Command/LoadAddressReferenceCommand.php   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
index 64ee10e5f..91621a3dd 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -51,7 +51,9 @@ class LoadAddressReferenceCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $addressReferenceArray = $this->fetchWFS();
+
+
+        $addressReferenceArray = $this->fetchWFS(1, 10);
         $em = $this->entityManager;
 
         foreach($addressReferenceArray as $a) {
@@ -62,7 +64,11 @@ class LoadAddressReferenceCommand extends Command
 
         $em->flush();
 
+
+
         return 0;
+
+
     }
 
     public static function isAddressReferenceNew(AddressReference $a): bool
@@ -78,22 +84,21 @@ class LoadAddressReferenceCommand extends Command
      * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
-    private function fetchWFS(): array
+    private function fetchWFS(int $startIndex, int $count ): array
     {
 
         $dataSource = 'BAL GeoVendee';
         $countryCode = 'FR';
-
         $addressReferenceArray = array();
 
         $wfsUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature';
 
-        $wfsContent = file_get_contents($wfsUrl.'&version=2.0.0&TYPENAME=CHILL:Adresses&MAXFEATURES=3&OUTPUTFORMAT=geojson');
-        //TODO loop for pagination
+        $wfsContent = file_get_contents(
+            $wfsUrl . '&version=2.0.0&TYPENAME=CHILL:Adresses&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson'
+        );
 
         $jsonContent = json_decode($wfsContent, true);
 
-
         foreach ($jsonContent['features'] as $key => $value) {
 
             $a = new AddressReference();
@@ -130,6 +135,4 @@ class LoadAddressReferenceCommand extends Command
         return $addressReferenceArray;
     }
 
-
-
 }

From 830cda64e05be31e6bc2f5ae94fe59281924821a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 18 May 2021 10:24:03 +0200
Subject: [PATCH 07/37] addresses: add symfony http-client as a dependency

---
 composer.json                            | 1 +
 src/Bundle/ChillMainBundle/composer.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 95074c18f..184e2d28a 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.7",
         "symfony/asset": "4.*",
+        "symfony/http-client": "^4.4 || ^5",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "4.*",
         "symfony/translation": "4.*",
diff --git a/src/Bundle/ChillMainBundle/composer.json b/src/Bundle/ChillMainBundle/composer.json
index 0c95c432a..0c95ec238 100644
--- a/src/Bundle/ChillMainBundle/composer.json
+++ b/src/Bundle/ChillMainBundle/composer.json
@@ -26,7 +26,8 @@
     ],
     "require": {
         "league/csv": "^9.6",
-        "phpoffice/phpspreadsheet": "~1.2"
+        "phpoffice/phpspreadsheet": "~1.2",
+        "symfony/http-client": "^4.4 || ^5"
     },
     "require-dev": {
     },

From 73ee77b8b21b712e1b9888ee93f1166e3dee0a6f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 18 May 2021 13:57:39 +0200
Subject: [PATCH 08/37] addresses: import reference address from WFS using
 httpClientInterface

---
 .../Command/LoadAddressReferenceCommand.php   | 91 ++++++++++---------
 .../ChillMainBundle/config/services.yaml      | 11 ++-
 .../config/services/command.yaml              |  6 --
 3 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
index 91621a3dd..a488685bf 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -1,13 +1,13 @@
 <?php
 namespace Chill\MainBundle\Command;
 
-use Doctrine\ORM\EntityManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\AddressReference;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  *
@@ -18,18 +18,22 @@ class LoadAddressReferenceCommand extends Command
 {
 
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     private $entityManager;
 
     /**
-     * LoadAddressReferenceCommand constructor.
-     *
-     * @param EntityManager $entityManager
+     * @var HttpClientInterface
      */
-    public function __construct(EntityManager $entityManager)
+    private $client;
+
+    /**
+     * LoadAddressReferenceCommand constructor.
+     */
+    public function __construct(EntityManagerInterface $entityManager, HttpClientInterface $client)
     {
-        $this->entityManager=$entityManager;
+        $this->entityManager = $entityManager;
+        $this->client = $client;
         parent::__construct();
     }
 
@@ -52,8 +56,7 @@ class LoadAddressReferenceCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
 
-
-        $addressReferenceArray = $this->fetchWFS(1, 10);
+        $addressReferenceArray = $this->fetchWFS(1, 2, $output);
         $em = $this->entityManager;
 
         foreach($addressReferenceArray as $a) {
@@ -64,11 +67,7 @@ class LoadAddressReferenceCommand extends Command
 
         $em->flush();
 
-
-
         return 0;
-
-
     }
 
     public static function isAddressReferenceNew(AddressReference $a): bool
@@ -84,55 +83,63 @@ class LoadAddressReferenceCommand extends Command
      * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
-    private function fetchWFS(int $startIndex, int $count ): array
+    private function fetchWFS(int $startIndex, int $count, OutputInterface $output): array
     {
 
         $dataSource = 'BAL GeoVendee';
         $countryCode = 'FR';
+
         $addressReferenceArray = array();
 
-        $wfsUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature';
+        $wfsBaseUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature&version=2.0.0';
+        $wfsUrl = $wfsBaseUrl . '&TYPENAME=CHILL:Adresses&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson';
 
-        $wfsContent = file_get_contents(
-            $wfsUrl . '&version=2.0.0&TYPENAME=CHILL:Adresses&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson'
-        );
+        $response = $this->client->request('GET', $wfsUrl);
 
-        $jsonContent = json_decode($wfsContent, true);
+        if ($response->getStatusCode() === 200) {
 
-        foreach ($jsonContent['features'] as $key => $value) {
+            $content = $response->toArray();
 
-            $a = new AddressReference();
+            foreach ($content['features'] as $key => $value) {
 
-            $x = $value['geometry']['coordinates'][0];
-            $y = $value['geometry']['coordinates'][1];
+                $a = new AddressReference();
 
-            $lon = -1.4 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
-            $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
+                $x = $value['geometry']['coordinates'][0];
+                $y = $value['geometry']['coordinates'][1];
 
-            $point = Point::fromLonLat($lon, $lat);
+                $lon = -1.4 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
+                $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
 
-            $em = $this->entityManager;
+                $point = Point::fromLonLat($lon, $lat);
 
-            $country = $em
-                ->getRepository('ChillMainBundle:Country')
-                ->findOneBy(array('countryCode' => $countryCode));
+                $em = $this->entityManager;
 
-            $postcode = $em
-                ->getRepository('ChillMainBundle:PostalCode')
-                ->findOneBy(array('code' => $value['properties']['CODE_POST'], 'country' => $country));
+                $country = $em
+                    ->getRepository('ChillMainBundle:Country')
+                    ->findOneBy(array('countryCode' => $countryCode));
 
-            $a->setRefId($value['properties']['OBJECTID']);
-            $a->setStreet($value['properties']['NOM_AFNOR']);
-            $a->setStreetNumber($value['properties']['NUMERO']);
-            $a->setPoint($point);
-            $a->setPostcode($postcode);
-            $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
-            $a->setSource($dataSource);
+                $postcode = $em
+                    ->getRepository('ChillMainBundle:PostalCode')
+                    ->findOneBy(array('code' => $value['properties']['CODE_POST'], 'country' => $country));
 
-            $addressReferenceArray[] = $a;
+                $a->setRefId($value['properties']['OBJECTID']);
+                $a->setStreet($value['properties']['NOM_AFNOR']);
+                $a->setStreetNumber($value['properties']['NUMERO']);
+                $a->setPoint($point);
+                $a->setPostcode($postcode);
+                $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
+                $a->setSource($dataSource);
+
+                $addressReferenceArray[] = $a;
+            }
+
+        } else {
+            $output->writeln('<error>Error getting WFS at ' . $wfsUrl . '. Status code is ' . $response->getStatusCode() . '.</error>');
         }
 
         return $addressReferenceArray;
     }
 
 }
+
+
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index a6afa4336..eb07a16e2 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -31,14 +31,14 @@ services:
             - [ setContainer, ["@service_container"]]
         tags:
             - { name: twig.extension }
-            
+
     chill.main.twig.widget:
         class: Chill\MainBundle\Templating\Widget\WidgetRenderingTwig
         arguments:
             - "@event_dispatcher"
         tags:
             - { name: twig.extension }
-            
+
     chill.main.twig.csv_cell:
         class: Chill\MainBundle\Templating\CSVCellTwig
         tags:
@@ -65,3 +65,10 @@ services:
             - "@security.authorization_checker"
             - "@chill.main.security.authorization.helper"
             - "@security.token_storage"
+
+    Chill\MainBundle\Command\:
+        resource: '../Command/'
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: console.command }
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index fc35f1e06..5df80c2ad 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -44,9 +44,3 @@ services:
             $entityManager: '@doctrine.orm.entity_manager'
         tags:
             - { name: console.command }
-
-    Chill\MainBundle\Command\LoadAddressReferenceCommand:
-        arguments:
-            $entityManager: '@doctrine.orm.entity_manager'
-        tags:
-            - { name: console.command }

From 2f28cb16ef8afaf1dd2ab0cd785183a4f65c8d15 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 18 May 2021 18:02:59 +0200
Subject: [PATCH 09/37] addresses: import address reference: add pagination and
 error handling

---
 .../Command/LoadAddressReferenceCommand.php   | 67 +++++++++++++++----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
index a488685bf..650bc6c66 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -27,6 +27,9 @@ class LoadAddressReferenceCommand extends Command
      */
     private $client;
 
+
+    private $wfsBaseUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature&version=2.0.0&TYPENAME=CHILL:Adresses';
+
     /**
      * LoadAddressReferenceCommand constructor.
      */
@@ -56,16 +59,30 @@ class LoadAddressReferenceCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
 
-        $addressReferenceArray = $this->fetchWFS(1, 2, $output);
+        $maxCount = $this->countWFSFeatures($this->wfsBaseUrl, $output);
+        $totalCount = 0;
+        $batchSize = 100;
+
         $em = $this->entityManager;
 
-        foreach($addressReferenceArray as $a) {
-            if (static::isAddressReferenceNew($a)) {
-                $em->persist($a);
-            }
-        }
+        while($totalCount < $maxCount) {
 
-        $em->flush();
+            try {
+                $addressReferenceArray = $this->fetchWFS($totalCount, $batchSize, $output);
+            } catch (\Exception $ex) {
+                $output->writeln('<warning>Cannot fetch WFS. Error message is: '.$ex->getMessage().'</warning>');
+            }
+
+            foreach($addressReferenceArray as $a) {
+                if (static::isAddressReferenceNew($a)) {
+                    $em->persist($a);
+                }
+            }
+
+            $em->flush();
+
+            $totalCount = $totalCount + $batchSize;
+        }
 
         return 0;
     }
@@ -79,6 +96,24 @@ class LoadAddressReferenceCommand extends Command
     }
 
 
+    private function countWFSFeatures(string $wfsBaseUrl, OutputInterface $output): int
+    {
+        $maxCountWfsUrl = $wfsBaseUrl . '&resultType=hits';
+        try {
+            $response = $this->client->request('GET', $maxCountWfsUrl);
+        } catch (\Exception $ex) {
+            $output->writeln('<warning>Cannot get WFS request working with '.$maxCountWfsUrl.' : '.$ex->getMessage().'</warning>');
+        }
+        if ($response->getStatusCode() === 200) {
+            $content = $response->getContent();
+            $count = explode('"', explode('numberMatched="', $content)[1])[0];
+        } else {
+            $output->writeln('<error>Error getting WFS at ' . $maxCountWfsUrl . '. Status code is ' . $response->getStatusCode() . '.</error>');
+        }
+
+        return $count;
+    }
+
     /*
      * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
      * @see \Symfony\Component\Console\Command\Command::execute()
@@ -86,15 +121,18 @@ class LoadAddressReferenceCommand extends Command
     private function fetchWFS(int $startIndex, int $count, OutputInterface $output): array
     {
 
-        $dataSource = 'BAL GeoVendee';
         $countryCode = 'FR';
 
         $addressReferenceArray = array();
 
-        $wfsBaseUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature&version=2.0.0';
-        $wfsUrl = $wfsBaseUrl . '&TYPENAME=CHILL:Adresses&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson';
+        $wfsBaseUrl = $this->wfsBaseUrl;
+        $wfsUrl = $wfsBaseUrl . '&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson';
 
-        $response = $this->client->request('GET', $wfsUrl);
+        try {
+            $response = $this->client->request('GET', $wfsUrl);
+        } catch (\Exception $ex) {
+            $output->writeln('<warning>Cannot get WFS request working with '.$wfsUrl.' : '.$ex->getMessage().'</warning>');
+        }
 
         if ($response->getStatusCode() === 200) {
 
@@ -102,6 +140,11 @@ class LoadAddressReferenceCommand extends Command
 
             foreach ($content['features'] as $key => $value) {
 
+                if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
+                    $output->writeln('The address is ...');
+                    $output->write($value);
+                }
+
                 $a = new AddressReference();
 
                 $x = $value['geometry']['coordinates'][0];
@@ -128,7 +171,7 @@ class LoadAddressReferenceCommand extends Command
                 $a->setPoint($point);
                 $a->setPostcode($postcode);
                 $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
-                $a->setSource($dataSource);
+                $a->setSource($value['properties']['SOURCE']);
 
                 $addressReferenceArray[] = $a;
             }

From 4cc308c936c65394582b2b919aa8212e54dab6cd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 20 May 2021 11:46:18 +0200
Subject: [PATCH 10/37] address selection: filter cities based on country

---
 .../Controller/PostalCodeAPIController.php    | 27 +++++++++++++++++++
 .../ChillMainExtension.php                    |  1 +
 .../Resources/public/vuejs/_api/AddAddress.js |  9 +++----
 .../AddAddress/CountrySelection.vue           |  8 ++++--
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
new file mode 100644
index 000000000..397125bf8
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class PostalCodeController
+ *
+ * @package Chill\MainBundle\Controller
+ * @author Champs Libres
+ */
+class PostalCodeAPIController extends ApiController
+{
+
+    protected function customizeQuery(string $action, Request $request, $qb): void
+    {
+        if ($request->query->has('country')) {
+
+            $qb->where('e.country = :country')
+               ->setParameter('country', $request->get('country'));
+
+        }
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 277e916a8..e6d82877d 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -290,6 +290,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                     ]
                 ],
                 [
+                    'controller' => \Chill\MainBundle\Controller\PostalCodeAPIController::class,
                     'class' => \Chill\MainBundle\Entity\PostalCode::class,
                     'name' => 'postal_code',
                     'base_path' => '/api/1.0/main/postal-code',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 3b055da79..8b466a244 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -16,13 +16,12 @@ const fetchCountries = () => {
 
 /*
 * Endpoint cities GET
-* TODO
+* method GET, get Country Object
+* @returns {Promise} a promise containing all Postal Code objects filtered with country
 */
 const fetchCities = (country) => {
    console.log('<<< fetching cities for', country);
-   //TODO use country
-   //TODO deal with huge number of postal code ... we should do suggestion...
-   const url = `/api/1.0/main/postal-code.json`;
+   const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
@@ -37,7 +36,7 @@ const fetchCities = (country) => {
 */
 const fetchReferenceAddresses = (city) => {
     console.log('<<< fetching references addresses for', city); // city n'est pas utilisé pour le moment
-
+   //TODO deal with huge number of addresses... we should do suggestion...
     const url = `/api/1.0/main/address-reference.json`;
     return fetch(url)
        .then(response => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 7d5e039e2..6c8b38b34 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -2,12 +2,13 @@
    <div class="container">
       <select
          v-model="selected">
-         <option :value="{}" disabled selected>{{ $t('select_country') }}</option>
+         <option :value="{}" selected disabled>{{ $t('select_country') }}</option>
          <option
             v-for="item in this.countries"
             v-bind:item="item"
             v-bind:key="item.id"
-            v-bind:value="item">
+            v-bind:value="item"
+            v-bind:selected="item.countryCode === 'FR'">
             {{ item.name.fr }}
          </option>
       </select>
@@ -19,6 +20,9 @@
 export default {
    name: 'CountrySelection',
    props: ['address', 'getCities'],
+   // data: () => {
+   //    selected: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0]
+   // },
    computed: {
       countries() {
          const countries = this.address.loaded.countries;

From 65859f62f348c66d00af88ba7a226edc335ec502 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 20 May 2021 15:05:54 +0200
Subject: [PATCH 11/37] address selection: filter addresses based on cities

---
 .../AddressReferenceAPIController.php         | 27 +++++++++++++++++++
 .../Controller/PostalCodeAPIController.php    |  2 +-
 .../ChillMainExtension.php                    |  1 +
 .../Resources/public/vuejs/_api/AddAddress.js | 14 +++++-----
 .../public/vuejs/_components/AddAddress.vue   |  3 +--
 5 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
new file mode 100644
index 000000000..3e63c1b2a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class AddressReferenceAPIController
+ *
+ * @package Chill\MainBundle\Controller
+ * @author Champs Libres
+ */
+class AddressReferenceAPIController extends ApiController
+{
+
+    protected function customizeQuery(string $action, Request $request, $qb): void
+    {
+        if ($request->query->has('postal_code')) {
+
+            $qb->where('e.postcode = :postal_code')
+               ->setParameter('postal_code', $request->get('postal_code'));
+
+        }
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
index 397125bf8..a02765ff7 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -6,7 +6,7 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class PostalCodeController
+ * Class PostalCodeAPIController
  *
  * @package Chill\MainBundle\Controller
  * @author Champs Libres
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index e6d82877d..0024f59d7 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -270,6 +270,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                     ]
                 ],
                 [
+                    'controller' => \Chill\MainBundle\Controller\AddressReferenceAPIController::class,
                     'class' => \Chill\MainBundle\Entity\AddressReference::class,
                     'name' => 'address_reference',
                     'base_path' => '/api/1.0/main/address-reference',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 8b466a244..7116a9306 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -1,5 +1,5 @@
 /*
-* Endpoint countries GET
+* Endpoint chill_api_single_country_index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Country object
 */
@@ -15,7 +15,7 @@ const fetchCountries = () => {
 };
 
 /*
-* Endpoint cities GET
+* Endpoint chill_api_single_postal_code_index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Postal Code objects filtered with country
 */
@@ -30,14 +30,14 @@ const fetchCities = (country) => {
 };
 
 /*
-* Endpoint chill_main_address_reference_api_show
+* Endpoint chill_api_single_address_reference_index
 * method GET, get AddressReference Object
-* @returns {Promise} a promise containing all AddressReference object
+* @returns {Promise} a promise containing all AddressReference objects filtered with country
 */
-const fetchReferenceAddresses = (city) => {
-    console.log('<<< fetching references addresses for', city); // city n'est pas utilisé pour le moment
+const fetchReferenceAddresses = (postalCode) => {
+    console.log('<<< fetching references addresses for', postalCode);
    //TODO deal with huge number of addresses... we should do suggestion...
-    const url = `/api/1.0/main/address-reference.json`;
+    const url = `/api/1.0/main/address-reference.json?item_per_page=1000&postal_code=${postalCode.id}`;
     return fetch(url)
        .then(response => {
           if (response.ok) { return response.json(); }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index f304f3c45..13d7c2f2b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -187,8 +187,7 @@ export default {
       },
       getReferenceAddresses(city) {
          console.log('getReferenceAddresses for', city.name);
-         fetchReferenceAddresses(city)  // il me semble que le paramètre city va limiter le poids des adresses de références reçues
-            .then(addresses => new Promise((resolve, reject) => {
+         fetchReferenceAddresses(city).then(addresses => new Promise((resolve, reject) => {
                console.log('addresses', addresses);
                this.address.loaded.addresses = addresses.results;
                resolve();

From 1b1eb45d15489c6dd72164a7c749e113599c17a6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 20 May 2021 15:44:04 +0200
Subject: [PATCH 12/37] address: improve load addresse reference command"

---
 .../Command/LoadAddressReferenceCommand.php   | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
index 650bc6c66..e14851191 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
@@ -48,7 +48,7 @@ class LoadAddressReferenceCommand extends Command
     {
         $this
             ->setName('chill:main:address-reference:populate')
-            ->setDescription('Load or update countries in db. This command does not delete or update existing address reference,'.
+            ->setDescription('Load or update reference addresses in db. This command does not delete or update existing address reference,'.
                 'but will add new address reference entities based on their timestamp');
     }
 
@@ -60,30 +60,39 @@ class LoadAddressReferenceCommand extends Command
     {
 
         $maxCount = $this->countWFSFeatures($this->wfsBaseUrl, $output);
+        $output->writeln('Number of addresses to be fetched: ' . $maxCount);
         $totalCount = 0;
         $batchSize = 100;
 
+        $success = 0;
         $em = $this->entityManager;
 
         while($totalCount < $maxCount) {
 
             try {
                 $addressReferenceArray = $this->fetchWFS($totalCount, $batchSize, $output);
+                $success = $success + 1;
+
+                foreach($addressReferenceArray as $a) {
+                    if (static::isAddressReferenceNew($a)) {
+                        $em->persist($a);
+                    }
+                }
+
+                $em->flush();
+                $em->clear();
+
             } catch (\Exception $ex) {
                 $output->writeln('<warning>Cannot fetch WFS. Error message is: '.$ex->getMessage().'</warning>');
             }
 
-            foreach($addressReferenceArray as $a) {
-                if (static::isAddressReferenceNew($a)) {
-                    $em->persist($a);
-                }
-            }
-
-            $em->flush();
-
             $totalCount = $totalCount + $batchSize;
         }
 
+        $em->flush();
+
+        $output->writeln($success * $batchSize . '/'. $maxCount . 'reference address were loaded in the database.');
+
         return 0;
     }
 
@@ -127,6 +136,7 @@ class LoadAddressReferenceCommand extends Command
 
         $wfsBaseUrl = $this->wfsBaseUrl;
         $wfsUrl = $wfsBaseUrl . '&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson';
+        $output->writeln('Start fetching WFS data @: ' . $wfsUrl);
 
         try {
             $response = $this->client->request('GET', $wfsUrl);

From 57a35f88bea45ac40f6b6f661e9bd68aafdcdebd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 21 May 2021 10:08:17 +0200
Subject: [PATCH 13/37] addresses reference: remove the load Adressess
 references command (has moved to the Vendee app)

---
 composer.json                                 |   3 +-
 .../Command/LoadAddressReferenceCommand.php   | 198 ------------------
 src/Bundle/ChillMainBundle/composer.json      |   3 +-
 .../ChillMainBundle/config/services.yaml      |   6 -
 4 files changed, 2 insertions(+), 208 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php

diff --git a/composer.json b/composer.json
index 184e2d28a..748a7d862 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,6 @@
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.7",
         "symfony/asset": "4.*",
-        "symfony/http-client": "^4.4 || ^5",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "4.*",
         "symfony/translation": "4.*",
@@ -74,7 +73,7 @@
         "symfony/web-profiler-bundle": "^5.0",
         "symfony/var-dumper": "4.*",
         "symfony/debug-bundle": "^5.1",
-        "symfony/phpunit-bridge": "^5.2",    
+        "symfony/phpunit-bridge": "^5.2",
         "nelmio/alice": "^3.8"
     },
     "scripts": {
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
deleted file mode 100644
index e14851191..000000000
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressReferenceCommand.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-namespace Chill\MainBundle\Command;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Chill\MainBundle\Doctrine\Model\Point;
-use Chill\MainBundle\Entity\AddressReference;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- *
- * @author Champs-Libres
- *
- */
-class LoadAddressReferenceCommand extends Command
-{
-
-    /**
-     * @var EntityManagerInterface
-     */
-    private $entityManager;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $client;
-
-
-    private $wfsBaseUrl = 'https://carto.vendee.fr/arcgis/services/Applications/CHILL/MapServer/WFSServer?SERVICE=WFS&REQUEST=GetFeature&version=2.0.0&TYPENAME=CHILL:Adresses';
-
-    /**
-     * LoadAddressReferenceCommand constructor.
-     */
-    public function __construct(EntityManagerInterface $entityManager, HttpClientInterface $client)
-    {
-        $this->entityManager = $entityManager;
-        $this->client = $client;
-        parent::__construct();
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Symfony\Component\Console\Command\Command::configure()
-     */
-    protected function configure(): void
-    {
-        $this
-            ->setName('chill:main:address-reference:populate')
-            ->setDescription('Load or update reference addresses in db. This command does not delete or update existing address reference,'.
-                'but will add new address reference entities based on their timestamp');
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Symfony\Component\Console\Command\Command::execute()
-     */
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-
-        $maxCount = $this->countWFSFeatures($this->wfsBaseUrl, $output);
-        $output->writeln('Number of addresses to be fetched: ' . $maxCount);
-        $totalCount = 0;
-        $batchSize = 100;
-
-        $success = 0;
-        $em = $this->entityManager;
-
-        while($totalCount < $maxCount) {
-
-            try {
-                $addressReferenceArray = $this->fetchWFS($totalCount, $batchSize, $output);
-                $success = $success + 1;
-
-                foreach($addressReferenceArray as $a) {
-                    if (static::isAddressReferenceNew($a)) {
-                        $em->persist($a);
-                    }
-                }
-
-                $em->flush();
-                $em->clear();
-
-            } catch (\Exception $ex) {
-                $output->writeln('<warning>Cannot fetch WFS. Error message is: '.$ex->getMessage().'</warning>');
-            }
-
-            $totalCount = $totalCount + $batchSize;
-        }
-
-        $em->flush();
-
-        $output->writeln($success * $batchSize . '/'. $maxCount . 'reference address were loaded in the database.');
-
-        return 0;
-    }
-
-    public static function isAddressReferenceNew(AddressReference $a): bool
-    {
-        $cond = true;
-        // TODO: write this function
-
-        return $cond;
-    }
-
-
-    private function countWFSFeatures(string $wfsBaseUrl, OutputInterface $output): int
-    {
-        $maxCountWfsUrl = $wfsBaseUrl . '&resultType=hits';
-        try {
-            $response = $this->client->request('GET', $maxCountWfsUrl);
-        } catch (\Exception $ex) {
-            $output->writeln('<warning>Cannot get WFS request working with '.$maxCountWfsUrl.' : '.$ex->getMessage().'</warning>');
-        }
-        if ($response->getStatusCode() === 200) {
-            $content = $response->getContent();
-            $count = explode('"', explode('numberMatched="', $content)[1])[0];
-        } else {
-            $output->writeln('<error>Error getting WFS at ' . $maxCountWfsUrl . '. Status code is ' . $response->getStatusCode() . '.</error>');
-        }
-
-        return $count;
-    }
-
-    /*
-     * //TODO move this function in App and make the command generic by accepting a fetcher as an argument
-     * @see \Symfony\Component\Console\Command\Command::execute()
-     */
-    private function fetchWFS(int $startIndex, int $count, OutputInterface $output): array
-    {
-
-        $countryCode = 'FR';
-
-        $addressReferenceArray = array();
-
-        $wfsBaseUrl = $this->wfsBaseUrl;
-        $wfsUrl = $wfsBaseUrl . '&startIndex=' . $startIndex . '&count=' . $count . '&OUTPUTFORMAT=geojson';
-        $output->writeln('Start fetching WFS data @: ' . $wfsUrl);
-
-        try {
-            $response = $this->client->request('GET', $wfsUrl);
-        } catch (\Exception $ex) {
-            $output->writeln('<warning>Cannot get WFS request working with '.$wfsUrl.' : '.$ex->getMessage().'</warning>');
-        }
-
-        if ($response->getStatusCode() === 200) {
-
-            $content = $response->toArray();
-
-            foreach ($content['features'] as $key => $value) {
-
-                if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
-                    $output->writeln('The address is ...');
-                    $output->write($value);
-                }
-
-                $a = new AddressReference();
-
-                $x = $value['geometry']['coordinates'][0];
-                $y = $value['geometry']['coordinates'][1];
-
-                $lon = -1.4 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
-                $lat = 46.5 + 0.01 * rand(-5, 5); //TODO temp: get the coordinates in EPSG:4326
-
-                $point = Point::fromLonLat($lon, $lat);
-
-                $em = $this->entityManager;
-
-                $country = $em
-                    ->getRepository('ChillMainBundle:Country')
-                    ->findOneBy(array('countryCode' => $countryCode));
-
-                $postcode = $em
-                    ->getRepository('ChillMainBundle:PostalCode')
-                    ->findOneBy(array('code' => $value['properties']['CODE_POST'], 'country' => $country));
-
-                $a->setRefId($value['properties']['OBJECTID']);
-                $a->setStreet($value['properties']['NOM_AFNOR']);
-                $a->setStreetNumber($value['properties']['NUMERO']);
-                $a->setPoint($point);
-                $a->setPostcode($postcode);
-                $a->setMunicipalityCode($value['properties']['CODE_INSEE']);
-                $a->setSource($value['properties']['SOURCE']);
-
-                $addressReferenceArray[] = $a;
-            }
-
-        } else {
-            $output->writeln('<error>Error getting WFS at ' . $wfsUrl . '. Status code is ' . $response->getStatusCode() . '.</error>');
-        }
-
-        return $addressReferenceArray;
-    }
-
-}
-
-
diff --git a/src/Bundle/ChillMainBundle/composer.json b/src/Bundle/ChillMainBundle/composer.json
index 0c95ec238..0c95c432a 100644
--- a/src/Bundle/ChillMainBundle/composer.json
+++ b/src/Bundle/ChillMainBundle/composer.json
@@ -26,8 +26,7 @@
     ],
     "require": {
         "league/csv": "^9.6",
-        "phpoffice/phpspreadsheet": "~1.2",
-        "symfony/http-client": "^4.4 || ^5"
+        "phpoffice/phpspreadsheet": "~1.2"
     },
     "require-dev": {
     },
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index eb07a16e2..20716e33b 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -66,9 +66,3 @@ services:
             - "@chill.main.security.authorization.helper"
             - "@security.token_storage"
 
-    Chill\MainBundle\Command\:
-        resource: '../Command/'
-        autowire: true
-        autoconfigure: true
-        tags:
-            - { name: console.command }

From f7dea7f0411cbe408d0779fdd853b9c68d97c396 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 21 May 2021 16:19:40 +0200
Subject: [PATCH 14/37] address selection: fix leaflet icon anchor + css for
 the form

---
 .../Resources/public/scss/chillmain.scss      | 164 +++++++++++++++++-
 .../Resources/public/vuejs/Address/js/i18n.js |   2 +-
 .../public/vuejs/_components/AddAddress.vue   |  71 ++++----
 .../_components/AddAddress/AddressMap.vue     |   3 +-
 .../_components/AddAddress/CitySelection.vue  |  14 +-
 5 files changed, 210 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
index 6aa0e1c8d..2581e3aa7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
@@ -14,7 +14,7 @@ div#header-accompanying_course-name {
   background: none repeat scroll 0 0 #718596;
   color: #FFF;
   h1 {
-    margin: 0.4em 0;       
+    margin: 0.4em 0;
   }
   span {
     a {
@@ -49,15 +49,167 @@ div.subheader {
    }
 }
 
-//// à ranger
+//// VUEJS ////
+div.vue-component {
+  padding: 1.5em;
+  margin: 2em 0;
+  border: 2px dashed grey;
+  position: relative;
+  &:before {
+    content: "vuejs component";
+    position: absolute;
+    left: 1.5em;
+    top: -0.9em;
+    background-color: white;
+    color: grey;
+    padding: 0 0.3em;
+  }
+  dd { margin-left: 1em; }
+}
+
+//// MODAL ////
+.modal-mask {
+   position: fixed;
+   z-index: 9998;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   background-color: rgba(0, 0, 0, 0.75);
+   display: table;
+   transition: opacity 0.3s ease;
+}
+.modal-header .close { // bootstrap classes, override sc-button 0 radius
+   border-top-right-radius: 0.3rem;
+}
+
+/*
+* The following styles are auto-applied to elements with
+* transition="modal" when their visibility is toggled
+* by Vue.js.
+*
+* You can easily play with the modal transition by editing
+* these styles.
+*/
+.modal-enter {
+   opacity: 0;
+}
+.modal-leave-active {
+   opacity: 0;
+}
+.modal-enter .modal-container,
+.modal-leave-active .modal-container {
+   -webkit-transform: scale(1.1);
+   transform: scale(1.1);
+}
+
+//// AddPersons modal
+div.body-head {
+   overflow-y: unset;
+   div.modal-body:first-child {
+      margin: auto 4em;
+      div.search {
+         position: relative;
+         input {
+            padding: 1.2em 1.5em 1.2em 2.5em;
+            margin: 1em 0;
+         }
+         i {
+            position: absolute;
+            opacity: 0.5;
+            padding: 0.65em 0;
+            top: 50%;
+         }
+         i.fa-search {
+            left: 0.5em;
+         }
+         i.fa-times {
+            right: 1em;
+            padding: 0.75em 0;
+            cursor: pointer;
+         }
+      }
+   }
+   div.modal-body:last-child {
+      padding-bottom: 0;
+   }
+}
+div.count {
+   margin: -0.5em 0 0.7em;
+   display: flex;
+   justify-content: space-between;
+   a {
+      cursor: pointer;
+   }
+}
+div.results {
+   div.list-item {
+      padding: 0.4em 0.8em;
+      display: flex;
+      flex-direction: row;
+      &.checked {
+         background-color: #ececec;
+         border-bottom: 1px dotted #8b8b8b;
+      }
+      div.container {
+         & > input {
+            margin-right: 0.8em;
+         }
+         span:not(.name) {
+            margin-left: 0.5em;
+            opacity: 0.5;
+            font-size: 90%;
+            font-style: italic;
+         }
+      }
+      div.right_actions {
+         margin: 0 0 0 auto;
+         display: flex;
+         align-items: flex-end;
+         & > * {
+            margin-left: 0.5em;
+            align-self: baseline;
+         }
+         a.sc-button {
+            border: 1px solid lightgrey;
+            font-size: 70%;
+            padding: 4px;
+         }
+      }
+   }
+}
 .discret {
    color: grey;
    margin-right: 1em;
 }
 
-table {
-   ul.record_actions {
-      margin: 0;
-      padding: 0.5em;
+
+div.address_form {
+   display: flex;
+   flex-direction: column;
+   div.address_form__header {
+
+   }
+   div.address_form__select {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+
+      div.address_form__select__body {
+         display: flex;
+         flex-direction: column;
+         flex-grow: 1;
+      }
+
+      div.address_form__select__map {
+         margin: 0px 20px;
+         div#address_map {
+            height:400px;
+            width:400px;
+         }
+      }
+   }
+   div.address_form__more {
+
    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index 87ee9a5c0..9e88b8e90 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -6,7 +6,7 @@ const addressMessages = {
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
       select_address: 'Choisir une adresse',
-      isNoAddress: 'L\'adresse n\'est pas celle d\'un domicile fixe ?',
+      isNoAddress: 'Pas d\'adresse complète',
       floor: 'Étage',
       corridor: 'Couloir',
       steps: 'Escalier',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 13d7c2f2b..33cf6d8a5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -13,42 +13,55 @@
          </template>
 
          <template v-slot:body>
+            <div class="address_form">
 
-            <h4>{{ $t('select_an_address') }}</h4>
+               <div class="address_form__header">
+                  <h4>{{ $t('select_an_address') }}</h4>
+               </div>
 
-            <label for="isNoAddress">
-               <input type="checkbox"
-                  name="isNoAddress"
-                  v-bind:placeholder="$t('isNoAddress')"
-                  v-model="isNoAddress"
-                  v-bind:value="value"/>
-               {{ $t('isNoAddress') }}
-            </label>
+               <div class="address_form__select">
 
-            <country-selection
-               v-bind:address="address"
-               v-bind:getCities="getCities">
-            </country-selection>
+                  <div class="address_form__select__body">
+                     <label for="isNoAddress">
+                        <input type="checkbox"
+                           name="isNoAddress"
+                           v-bind:placeholder="$t('isNoAddress')"
+                           v-model="isNoAddress"
+                           v-bind:value="value"/>
+                        {{ $t('isNoAddress') }}
+                     </label>
 
-            <city-selection
-               v-bind:address="address"
-               v-bind:getReferenceAddresses="getReferenceAddresses">
-            </city-selection>
+                     <country-selection
+                        v-bind:address="address"
+                        v-bind:getCities="getCities">
+                     </country-selection>
 
-            <address-selection
-               v-bind:address="address"
-               v-bind:updateMapCenter="updateMapCenter">
-            </address-selection>
+                     <city-selection
+                        v-bind:address="address"
+                        v-bind:getReferenceAddresses="getReferenceAddresses">
+                     </city-selection>
 
-            <address-map
-               v-bind:address="address"
-               ref="addressMap">
-            </address-map>
+                     <address-selection
+                        v-bind:address="address"
+                        v-bind:updateMapCenter="updateMapCenter">
+                     </address-selection>
+                  </div>
 
-            <address-more
-               v-if="!isNoAddress"
-               v-bind:address="address">
-            </address-more>
+                  <div class="address_form__select__map">
+                     <address-map
+                        v-bind:address="address"
+                        ref="addressMap">
+                     </address-map>
+                  </div>
+               </div>
+
+               <div class="address_form__more">
+                  <address-more
+                     v-if="!isNoAddress"
+                     v-bind:address="address">
+                  </address-more>
+               </div>
+            </div>
 
             <!--
             <div class="address_form__fields__isNoAddress"></div>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
index 2528f8e23..d78dfa1ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="container">
-      <div id='address_map' style='height:400px; width:400px;'></div>
+      <div id='address_map'></div>
    </div>
 </template>
 
@@ -31,6 +31,7 @@ export default {
 
          const markerIcon = L.icon({
             iconUrl: markerIconPng,
+            iconAnchor: [12, 41],
          });
 
          marker = L.marker([48.8589, 2.3469], {icon: markerIcon}).addTo(map);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
index 99e46db08..b9170ea35 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
@@ -1,12 +1,12 @@
 <template>
    <div class="container">
-      <select 
+      <select
          v-model="selected">
          <option :value="{}" disabled selected>{{ $t('select_city') }}</option>
-         <option 
-            v-for="item in this.cities" 
-            v-bind:item="item" 
-            v-bind:key="item.id" 
+         <option
+            v-for="item in this.cities"
+            v-bind:item="item"
+            v-bind:key="item.id"
             v-bind:value="item">
             {{ item.code }}-{{ item.name }}
          </option>
@@ -20,8 +20,8 @@ export default {
    name: 'CitySelection',
    props: ['address', 'getReferenceAddresses'],
    computed: {
-      cities() { 
-         return this.address.loaded.cities; 
+      cities() {
+         return this.address.loaded.cities;
       },
       selected: {
          set(value) {

From e88e9b1a6f26a58984d0d5d73133ea7dc8568a8a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 25 May 2021 14:38:09 +0200
Subject: [PATCH 15/37] addresses: add groups annotation to Country, postal
 code & address reference

---
 .../Entity/AddressReference.php               |  9 +++++++++
 src/Bundle/ChillMainBundle/Entity/Country.php | 19 ++++++++++++-------
 .../ChillMainBundle/Entity/PostalCode.php     |  5 +++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index b1fca205d..d13de4de9 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -4,6 +4,7 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Doctrine\Model\Point;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity()
@@ -16,21 +17,25 @@ class AddressReference
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="string", length=255)
+     * @groups({"read"})
      */
     private $refId;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $street;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $streetNumber;
 
@@ -38,16 +43,19 @@ class AddressReference
      * @var PostalCode
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @groups({"read"})
      */
     private $postcode;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $municipalityCode;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $source;
 
@@ -57,6 +65,7 @@ class AddressReference
      * @var Point
      *
      * @ORM\Column(type="point")
+     * @groups({"read"})
      */
     private $point;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index f8f68c3f3..932944d03 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * Country
@@ -20,6 +21,7 @@ class Country
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"read"})
      */
     private $id;
 
@@ -27,13 +29,16 @@ class Country
      * @var string
      *
      * @ORM\Column(type="json_array")
+     * @groups({"read"})
+     *
      */
     private $name;
-    
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=3)
+     * @groups({"read"})
      */
     private $countryCode;
 
@@ -41,7 +46,7 @@ class Country
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -57,20 +62,20 @@ class Country
     public function setName($name)
     {
         $this->name = $name;
-    
+
         return $this;
     }
 
     /**
      * Get name
      *
-     * @return string 
+     * @return string
      */
     public function getName()
     {
         return $this->name;
     }
-    
+
     /**
      * @return string
      */
@@ -90,12 +95,12 @@ class Country
 
     /**
      *
-     * @param string $countryCode            
+     * @param string $countryCode
      */
     public function setCountryCode($countryCode)
     {
         $this->countryCode = $countryCode;
         return $this;
     }
- 
+
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 3cff0a6bf..a70a955b8 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * PostalCode
@@ -25,6 +26,7 @@ class PostalCode
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"read"})
      */
     private $id;
 
@@ -32,6 +34,7 @@ class PostalCode
      * @var string
      *
      * @ORM\Column(type="string", length=255, name="label")
+     * @groups({"read"})
      */
     private $name;
 
@@ -39,6 +42,7 @@ class PostalCode
      * @var string
      *
      * @ORM\Column(type="string", length=100)
+     * @groups({"read"})
      */
     private $code;
 
@@ -46,6 +50,7 @@ class PostalCode
      * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
+     * @groups({"read"})
      */
     private $country;
 

From 72795be0406b30bdfa7aa834ebe1c94384316f2c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 25 May 2021 17:54:21 +0200
Subject: [PATCH 16/37] post new address - WIP

---
 src/Bundle/ChillMainBundle/Entity/Address.php | 17 ++++++++++
 .../Resources/public/vuejs/Address/App.vue    | 20 +++++++++--
 .../public/vuejs/Address/store/index.js       | 34 ++++++++++---------
 .../Resources/public/vuejs/_api/AddAddress.js | 33 +++++++++++++++---
 4 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 36eda09c2..faa34ccbc 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -4,6 +4,7 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Serializer\Annotation\Groups;
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 
@@ -22,6 +23,7 @@ class Address
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"write"})
      */
     private $id;
 
@@ -29,6 +31,7 @@ class Address
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @groups({"write"})
      */
     private $street = '';
 
@@ -36,6 +39,7 @@ class Address
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @groups({"write"})
      */
     private $streetNumber = '';
 
@@ -43,6 +47,7 @@ class Address
      * @var PostalCode
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @groups({"write"})
      */
     private $postcode;
 
@@ -50,6 +55,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $floor;
 
@@ -57,6 +63,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $corridor;
 
@@ -64,6 +71,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $steps;
 
@@ -71,6 +79,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $buildingName;
 
@@ -78,6 +87,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $flat;
 
@@ -85,6 +95,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $distribution;
 
@@ -92,6 +103,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $extra;
 
@@ -102,6 +114,7 @@ class Address
      * @var \DateTime
      *
      * @ORM\Column(type="date")
+     * @groups({"write"})
      */
     private $validFrom;
 
@@ -112,11 +125,13 @@ class Address
      * @var \DateTime|null
      *
      * @ORM\Column(type="date", nullable=true)
+     * @groups({"write"})
      */
     private $validTo;
 
     /**
      * True if the address is a "no address", aka homeless person, ...
+     * @groups({"write"})
      *
      * @var bool
      */
@@ -128,6 +143,7 @@ class Address
      * @var Point|null
      *
      * @ORM\Column(type="point", nullable=true)
+     * @groups({"write"})
      */
     private $point;
 
@@ -138,6 +154,7 @@ class Address
      *
      * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
      * @ORM\JoinColumn(nullable=true)
+     * @groups({"write"})
      */
     private $linkedToThirdParty;
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 461b0038e..2d146ed3b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,5 +1,5 @@
 <template>
-   
+
    <div v-if="address.address">
       {{ address.address.street }}, {{ address.address.streetNumber }}
    </div>
@@ -9,7 +9,7 @@
    <div v-if="address.country">
       {{ address.country.name }}
    </div>
-   
+
    <add-address
       @addNewAddress="addNewAddress">
    </add-address>
@@ -33,7 +33,21 @@ export default {
    methods: {
       addNewAddress({ address, modal }) {
          console.log('@@@ CLICK button addNewAdress', address);
-         this.$store.dispatch('addAddress', address.selected);
+         const newAddress = {
+            'isNoAddress': address.isNoAddress,
+            'street': address.selected.address.street,
+            'streetNumber': address.selected.address.streetNumber,
+            'postcode': address.selected.address.postcode.id,
+            'floor': address.floor,
+            'corridor': address.corridor,
+            'steps': address.steps,
+            'flat': address.flat,
+            'buildingName': address.buildingName,
+            'distribution': address.distribution,
+            'extra': address.extra,
+            'point': address.selected.address.point.coordinates
+         };
+         this.$store.dispatch('addAddress', newAddress);
          modal.showModal = false;
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
index b9466b50c..59e573d19 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
@@ -1,8 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 
-// le fetch POST serait rangé dans la logique du composant qui appelle AddAddress
-//import { postAddress } from '... api' 
+import { postAddress } from '../../_api/AddAddress'
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -10,11 +9,14 @@ const store = createStore({
    strict: debug,
    state: {
       address: {},
-      errorMsg: {}
+      errorMsg: []
    },
    getters: {
    },
    mutations: {
+      catchError(state, error) {
+         state.errorMsg.push(error);
+      },
       addAddress(state, address) {
          console.log('@M addAddress address', address);
          state.address = address;
@@ -23,19 +25,19 @@ const store = createStore({
    actions: {
       addAddress({ commit }, payload) {
          console.log('@A addAddress payload', payload);
-         commit('addAddress', payload); // à remplacer par 
-         
-         // fetch POST qui envoie l'adresse, et récupère la confirmation que c'est ok. 
-         // La confirmation est l'adresse elle-même.
-         //
-         //   postAddress(payload) 
-         //   .fetch(address => new Promise((resolve, reject) => {
-         //      commit('addAddress', address);
-         //      resolve();
-         //   }))
-         //   .catch((error) => { 
-         //      state.errorMsg.push(error.message); 
-         //   }); 
+         //commit('addAddress', payload); // à remplacer par la suite
+
+         //fetch POST qui envoie l'adresse, et récupère la confirmation que c'est ok.
+         //La confirmation est l'adresse elle-même.
+
+         postAddress(payload)
+            .then(address => new Promise((resolve, reject) => {
+               commit('addAddress', address);
+               resolve();
+            }))
+            .catch((error) => {
+               commit('catchError', error);
+            });
       }
    }
 });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 7116a9306..db03da860 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -1,5 +1,5 @@
 /*
-* Endpoint chill_api_single_country_index
+* Endpoint chill_api_single_country__index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Country object
 */
@@ -15,7 +15,7 @@ const fetchCountries = () => {
 };
 
 /*
-* Endpoint chill_api_single_postal_code_index
+* Endpoint chill_api_single_postal_code__index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Postal Code objects filtered with country
 */
@@ -30,9 +30,9 @@ const fetchCities = (country) => {
 };
 
 /*
-* Endpoint chill_api_single_address_reference_index
+* Endpoint chill_api_single_address_reference__index
 * method GET, get AddressReference Object
-* @returns {Promise} a promise containing all AddressReference objects filtered with country
+* @returns {Promise} a promise containing all AddressReference objects filtered with postal code
 */
 const fetchReferenceAddresses = (postalCode) => {
     console.log('<<< fetching references addresses for', postalCode);
@@ -45,8 +45,31 @@ const fetchReferenceAddresses = (postalCode) => {
        });
 };
 
+/*
+* Endpoint chill_api_single_address__entity__create
+* method POST, post Address Object
+* @returns {Promise}
+*/
+const postAddress = (address) => {
+   console.log(address);
+   const url = `/api/1.0/main/address.json?`;
+   const body = address;
+
+   return fetch(url, {
+      method: 'POST',
+      headers: {
+         'Content-Type': 'application/json;charset=utf-8'
+         },
+      body: JSON.stringify(body)
+   }).then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
+};
+
 export {
    fetchCountries,
    fetchCities,
-   fetchReferenceAddresses
+   fetchReferenceAddresses,
+   postAddress
 };

From 64d28106c89eed97b3a538643225fae6de88dc2d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 27 May 2021 12:34:45 +0200
Subject: [PATCH 17/37] address: POST a new address: treat the postcode

---
 .../ChillMainBundle/Resources/public/vuejs/Address/App.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 2d146ed3b..8276f531f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -33,11 +33,13 @@ export default {
    methods: {
       addNewAddress({ address, modal }) {
          console.log('@@@ CLICK button addNewAdress', address);
+         const lon = address.selected.address.point.coordinates[0];
+         const lat = address.selected.address.point.coordinates[1];
          const newAddress = {
             'isNoAddress': address.isNoAddress,
             'street': address.selected.address.street,
             'streetNumber': address.selected.address.streetNumber,
-            'postcode': address.selected.address.postcode.id,
+            'postcode': {'id': address.selected.address.postcode.id},
             'floor': address.floor,
             'corridor': address.corridor,
             'steps': address.steps,
@@ -45,7 +47,8 @@ export default {
             'buildingName': address.buildingName,
             'distribution': address.distribution,
             'extra': address.extra,
-            'point': address.selected.address.point.coordinates
+            //'point': {'lon': lon, 'lat': lat} WIP
+            'point': `SRID=4326;POINT(${lon}, ${lat})`
          };
          this.$store.dispatch('addAddress', newAddress);
          modal.showModal = false;

From bcf2b9d8343ffef8f2286d066a95eceb8c184abc Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 27 May 2021 14:49:41 +0200
Subject: [PATCH 18/37] address: use multiselect for country selection

---
 .../AddAddress/CountrySelection.vue           | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 6c8b38b34..ecb4b7eb1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -1,29 +1,47 @@
 <template>
    <div class="container">
-      <select
-         v-model="selected">
-         <option :value="{}" selected disabled>{{ $t('select_country') }}</option>
-         <option
-            v-for="item in this.countries"
-            v-bind:item="item"
-            v-bind:key="item.id"
-            v-bind:value="item"
-            v-bind:selected="item.countryCode === 'FR'">
-            {{ item.name.fr }}
-         </option>
-      </select>
+      <VueMultiselect
+         v-model="value"
+         name="field"
+         track-by="id"
+         label="name"
+         :custom-label="transName"
+         :placeholder="$t('select_country')"
+         :options="countries"
+         @update:model-value="selectCountry"
+         :model-value="value">
+      </VueMultiselect>
    </div>
 </template>
 
 <script>
+import VueMultiselect from 'vue-multiselect';
 
 export default {
    name: 'CountrySelection',
+   components: { VueMultiselect },
    props: ['address', 'getCities'],
-   // data: () => {
-   //    selected: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0]
-   // },
+   data() {
+      return {
+         //value: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0],
+         value: null,
+         options: []
+      }
+   },
+   methods: {
+      transName ({ name }) {
+         return name.fr //TODO multilang
+      },
+      selectCountry(value) {
+         this.address.selected.country = value;
+         this.getCities(value);
+      },
+   },
    computed: {
+      // defaultCountry() {
+      //    const countries = this.address.loaded.countries;
+      //    return countries.filter(c => c.countryCode === 'FR')[0];
+      // },
       countries() {
          const countries = this.address.loaded.countries;
          let orderedCountries = [];
@@ -31,17 +49,9 @@ export default {
          orderedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
          orderedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
          return orderedCountries;
-      },
-      selected: {
-         set(value) {
-            console.log('selected value', value.name);
-            this.address.selected.country = value;
-            this.getCities(value);
-         },
-         get() {
-            return this.address.selected.country;
-         }
       }
    }
 };
 </script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>

From 063076d0cb1130ce84a90567725f9790c2be290f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 27 May 2021 15:15:20 +0200
Subject: [PATCH 19/37] address: use multiselect for city and address selection

---
 .../AddAddress/AddressSelection.vue           | 56 +++++++++++--------
 .../_components/AddAddress/CitySelection.vue  | 52 +++++++++--------
 .../AddAddress/CountrySelection.vue           |  3 +-
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
index 71738079c..36f89d4e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
@@ -1,38 +1,46 @@
 <template>
    <div class="container">
-      <select 
-         v-model="selected">
-         <option :value="{}" disabled selected>{{ $t('select_address') }}</option>
-         <option 
-            v-for="item in this.addresses" 
-            v-bind:item="item" 
-            v-bind:key="item.id" 
-            v-bind:value="item">
-            {{ item.street }}, {{ item.streetNumber }}
-         </option>
-      </select>
+      <VueMultiselect
+         v-model="value"
+         name="field"
+         track-by="id"
+         label="value"
+         :custom-label="transName"
+         :placeholder="$t('select_address')"
+         :options="addresses"
+         @update:model-value="selectAddress"
+         :model-value="value">
+      </VueMultiselect>
    </div>
 </template>
 
 <script>
+import VueMultiselect from 'vue-multiselect';
 
 export default {
    name: 'AddressSelection',
+   components: { VueMultiselect },
    props: ['address', 'updateMapCenter'],
+   data() {
+      return {
+         value: null
+      }
+   },
+   methods: {
+      transName(value) {
+         return `${value.street}, ${value.streetNumber}`
+      },
+      selectAddress(value) {
+         this.address.selected.address = value;
+         this.updateMapCenter(value.point);
+      },
+   },
    computed: {
-      addresses() { 
-         return this.address.loaded.addresses; 
-      },
-      selected: {
-         set(value) {
-            console.log('selected value', value);
-            this.address.selected.address = value;
-            this.updateMapCenter(value.point);
-         },
-         get() {
-            return this.address.selected.address;
-         }
-      },
+      addresses() {
+         return this.address.loaded.addresses;
+      }
    }
 };
 </script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
index b9170ea35..040c7804d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
@@ -1,38 +1,46 @@
 <template>
    <div class="container">
-      <select
-         v-model="selected">
-         <option :value="{}" disabled selected>{{ $t('select_city') }}</option>
-         <option
-            v-for="item in this.cities"
-            v-bind:item="item"
-            v-bind:key="item.id"
-            v-bind:value="item">
-            {{ item.code }}-{{ item.name }}
-         </option>
-      </select>
+      <VueMultiselect
+         v-model="value"
+         name="field"
+         track-by="id"
+         label="value"
+         :custom-label="transName"
+         :placeholder="$t('select_city')"
+         :options="cities"
+         @update:model-value="selectCity"
+         :model-value="value">
+      </VueMultiselect>
    </div>
 </template>
 
 <script>
+import VueMultiselect from 'vue-multiselect';
 
 export default {
    name: 'CitySelection',
+   components: { VueMultiselect },
    props: ['address', 'getReferenceAddresses'],
+   data() {
+      return {
+         value: null
+      }
+   },
+   methods: {
+      transName(value) {
+         return `${value.code}-${value.name}`
+      },
+      selectCity(value) {
+         this.address.selected.city = value;
+         this.getReferenceAddresses(value);
+      },
+   },
    computed: {
       cities() {
          return this.address.loaded.cities;
-      },
-      selected: {
-         set(value) {
-            console.log('selected value', value.name);
-            this.address.selected.city = value;
-            this.getReferenceAddresses(value);
-         },
-         get() {
-            return this.address.selected.city;
-         }
-      },
+      }
    }
 };
 </script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index ecb4b7eb1..253337ef6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -24,8 +24,7 @@ export default {
    data() {
       return {
          //value: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0],
-         value: null,
-         options: []
+         value: null
       }
    },
    methods: {

From 057db09847cf44ea2f450a3cfaf7602f2dba0033 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 28 May 2021 09:06:07 +0200
Subject: [PATCH 20/37] addresses: improve address multiselect

---
 .../public/vuejs/_components/AddAddress/AddressSelection.vue | 5 ++---
 .../public/vuejs/_components/AddAddress/CitySelection.vue    | 5 ++---
 .../public/vuejs/_components/AddAddress/CountrySelection.vue | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
index 36f89d4e2..e0b84d033 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
@@ -2,14 +2,13 @@
    <div class="container">
       <VueMultiselect
          v-model="value"
+         @select="selectAddress"
          name="field"
          track-by="id"
          label="value"
          :custom-label="transName"
          :placeholder="$t('select_address')"
-         :options="addresses"
-         @update:model-value="selectAddress"
-         :model-value="value">
+         :options="addresses">
       </VueMultiselect>
    </div>
 </template>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
index 040c7804d..933b415a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
@@ -2,14 +2,13 @@
    <div class="container">
       <VueMultiselect
          v-model="value"
+         @select="selectCity"
          name="field"
          track-by="id"
          label="value"
          :custom-label="transName"
          :placeholder="$t('select_city')"
-         :options="cities"
-         @update:model-value="selectCity"
-         :model-value="value">
+         :options="cities">
       </VueMultiselect>
    </div>
 </template>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 253337ef6..87bcf79a4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -8,8 +8,7 @@
          :custom-label="transName"
          :placeholder="$t('select_country')"
          :options="countries"
-         @update:model-value="selectCountry"
-         :model-value="value">
+         @select="selectCountry">
       </VueMultiselect>
    </div>
 </template>

From 165012b30205f906f722ef557270e09e96f14fbd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 28 May 2021 10:14:54 +0200
Subject: [PATCH 21/37] address: POST an address

---
 .../ChillMainBundle/Doctrine/Model/Point.php  |  6 ++--
 .../Resources/public/vuejs/Address/App.vue    |  5 +--
 .../Serializer/Normalizer/PointNormalizer.php | 34 +++++++++++++++++++
 .../config/services/serializer.yaml           |  9 +++--
 4 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php

diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index 43c21ae59..2e6f83a69 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -9,11 +9,11 @@ use \JsonSerializable;
  *
  */
 class Point implements JsonSerializable {
-    private float $lat;
-    private float $lon;
+    private ?float $lat = null;
+    private ?float $lon = null;
     public static string $SRID = '4326';
 
-    private function __construct(float $lon, float $lat)
+    private function __construct(?float $lon, ?float $lat)
     {
         $this->lat = $lat;
         $this->lon = $lon;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 8276f531f..eddc93fe7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -33,8 +33,6 @@ export default {
    methods: {
       addNewAddress({ address, modal }) {
          console.log('@@@ CLICK button addNewAdress', address);
-         const lon = address.selected.address.point.coordinates[0];
-         const lat = address.selected.address.point.coordinates[1];
          const newAddress = {
             'isNoAddress': address.isNoAddress,
             'street': address.selected.address.street,
@@ -47,8 +45,7 @@ export default {
             'buildingName': address.buildingName,
             'distribution': address.distribution,
             'extra': address.extra,
-            //'point': {'lon': lon, 'lat': lat} WIP
-            'point': `SRID=4326;POINT(${lon}, ${lat})`
+            'point': address.selected.address.point.coordinates
          };
          this.$store.dispatch('addAddress', newAddress);
          modal.showModal = false;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
new file mode 100644
index 000000000..210e85fb7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Chill\MainBundle\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+use Chill\MainBundle\Doctrine\Model\Point;
+
+
+class PointNormalizer implements DenormalizerInterface
+{
+
+    public function supportsDenormalization($data, string $type, string $format = null) : bool
+    {
+        return $type === Point::class;
+    }
+
+    public function denormalize($data, string $type, string $format = null, array $context = [])
+    {
+
+        if (!is_array($data)) {
+            throw new InvalidArgumentException('point data is not an array. It should be an array of 2 coordinates.');
+        } else {
+            if (count($data) !== 2) {
+                throw new InvalidArgumentException('point data is not an array of 2 elements. It should be an array of 2 coordinates.');
+            } else {
+                return Point::fromLonLat($data[0], $data[1]);
+            }
+        }
+
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index c7cc6ca63..583ba9091 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -1,7 +1,7 @@
 ---
 services:
-    
-    # note: the autowiring for serializers and normalizers is declared 
+
+    # note: the autowiring for serializers and normalizers is declared
     # into ../services.yaml
 
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
@@ -9,3 +9,8 @@ services:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
 
+    Chill\MainBundle\Serializer\Normalizer\PointNormalizer:
+        autowire: true
+        tags:
+            - { name: 'serializer.normalizer', priority: 8 }
+

From 935006eae3854575383778ef6452991a7f9ef1dd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 28 May 2021 12:31:08 +0200
Subject: [PATCH 22/37] addresses form: add default country value

---
 .../public/vuejs/_components/AddAddress.vue      |  5 +++--
 .../_components/AddAddress/CountrySelection.vue  | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 33cf6d8a5..ad6e32c5d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -168,12 +168,13 @@ export default {
          }
       }
    },
+   mounted() {
+       this.getCountries();
+   },
    methods: {
       openModal() {
          this.modal.showModal = true;
          this.resetAll();
-         this.getCountries();
-
          //this.$nextTick(function() {
          //   this.$refs.search.focus(); // positionner le curseur à l'ouverture de la modale
          //})
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
index 87bcf79a4..44009cdc4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
@@ -22,24 +22,28 @@ export default {
    props: ['address', 'getCities'],
    data() {
       return {
-         //value: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0],
-         value: null
+         value: this.address.loaded.countries.filter(c => c.countryCode === 'FR')[0]
       }
    },
    methods: {
+      init() {
+         if (this.value !== undefined) {
+            this.getCities(this.value);
+         }
+      },
       transName ({ name }) {
          return name.fr //TODO multilang
       },
       selectCountry(value) {
+         console.log(value);
          this.address.selected.country = value;
          this.getCities(value);
       },
    },
+   mounted(){
+      this.init()
+   },
    computed: {
-      // defaultCountry() {
-      //    const countries = this.address.loaded.countries;
-      //    return countries.filter(c => c.countryCode === 'FR')[0];
-      // },
       countries() {
          const countries = this.address.loaded.countries;
          let orderedCountries = [];

From 543f6b20dd4a45eb62df12cf447e58abbdf33c18 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 31 May 2021 11:39:15 +0200
Subject: [PATCH 23/37] firstname and lastname in same column

---
 .../AccompanyingCourse/components/PersonsAssociated.vue     | 3 +--
 .../components/PersonsAssociated/PersonItem.vue             | 6 ++++--
 .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js    | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 7c61b066c..3ab9598c9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -9,8 +9,7 @@
    <table class="rounded" v-if="participations.length > 0">
       <thead>
          <tr>
-            <th class="chill-orange">{{ $t('persons_associated.firstname') }}</th>
-            <th class="chill-orange">{{ $t('persons_associated.lastname') }}</th>
+            <th class="chill-orange">{{ $t('persons_associated.name') }}</th>
             <th class="chill-orange">{{ $t('persons_associated.startdate') }}</th>
             <th class="chill-orange">{{ $t('persons_associated.enddate') }}</th>
             <th class="chill-orange">{{ $t('action.actions') }}</th>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index 4fa2caf12..840edf595 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -1,7 +1,9 @@
 <template>
 <tr>
-   <td>{{ participation.person.firstName }}</td>
-   <td>{{ participation.person.lastName }}</td>
+   <td>
+      {{ participation.person.firstName }}
+      {{ participation.person.lastName }}
+   </td>
    <td><span v-if="participation.startDate">
        {{ $d(participation.startDate.datetime, 'short') }}</span>
    </td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 242d48b8f..79c325c88 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -31,6 +31,7 @@ const appMessages = {
          counter: "Il n'y a pas encore d'usager | 1 usager | {count} usagers",
          firstname: "Prénom",
          lastname: "Nom",
+         name: "Nom",
          startdate: "Date d'entrée",
          enddate: "Date de sortie",
          add_persons: "Ajouter des usagers",

From 68059a993871b77824ce416005e536500f097077 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 31 May 2021 12:58:28 +0200
Subject: [PATCH 24/37] add new OnTheFly vue sub-component

---
 .../public/vuejs/_components/OnTheFly.vue     | 85 +++++++++++++++++++
 .../PersonsAssociated/PersonItem.vue          | 23 +++--
 2 files changed, 100 insertions(+), 8 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
new file mode 100644
index 000000000..5295e25e4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -0,0 +1,85 @@
+<template>
+  
+   <a class="sc-button" target="_blank"
+      :class="classAction"
+      :title="$t(titleAction)"
+      @click="openModal">
+   </a>
+  
+   <teleport to="body">
+      <modal v-if="modal.showModal"
+         :modalDialogClass="modal.modalDialogClass"
+         @close="modal.showModal = false">
+   
+         <template v-slot:header>
+            <h3 class="modal-title">{{ $t(modalTitle) }}</h3>
+         </template>
+         <template v-slot:body>
+            
+         </template>
+         <template v-slot:footer>
+            <button class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
+               {{ $t('action.save')}}
+            </button>
+         </template>
+         
+      </modal>
+   </teleport>
+   
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+
+export default {
+   name: 'OnTheFly',
+   components: {
+      Modal
+   },
+   props: ['type', 'id', 'action'],
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-scrollable modal-xl"
+         }
+      }
+   },
+   computed: {
+      classAction() {
+         switch (this.action) {
+            case 'show':
+               return 'bt-show';
+            case 'create':
+               return 'bt-create';
+            case 'edit':
+               return 'bt-update';
+         }
+      },
+      titleAction() {
+         switch (this.action) {
+            case 'show':
+               return 'action.show';
+            case 'create':
+               return 'action.create';
+            case 'edit':
+               return 'action.edit';
+         }
+      },
+   },
+   methods: {
+      openModal() {
+         this.modal.showModal = true;
+         this.$nextTick(function() {
+            //this.$refs.search.focus();
+         })
+      }
+   }
+}
+</script>
+
+<style lang="css" scoped>
+a {
+   cursor: pointer;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index 840edf595..85ed43bce 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -13,16 +13,18 @@
    <td>
       <ul class="record_actions">
          <li>
-            <a class="sc-button bt-show" target="_blank"
-               :href="url.show"
-               :title="$t('action.show')">
-            </a>
+            <on-the-fly
+               :type="participation.person.type"
+               :id="participation.person.id"
+               action="show">
+            </on-the-fly>
          </li>
          <li>
-            <a class="sc-button bt-update" target="_blank"
-               :href="url.edit"
-               :title="$t('action.edit')">
-            </a>
+            <on-the-fly
+               :type="participation.person.type"
+               :id="participation.person.id"
+               action="edit">
+            </on-the-fly>
          </li>
          <!--li>
             <button class="sc-button bt-delete"
@@ -44,8 +46,13 @@
 </template>
 
 <script>
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+
 export default {
    name: 'PersonItem',
+   components: {
+      OnTheFly
+   },
    props: ['participation'],
    data() {
       return {

From 158b5728796dd42d51bddc6df5b988cb04e50aec Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 31 May 2021 15:49:55 +0200
Subject: [PATCH 25/37] replace all links and buttons involved by OnTheFly
 component

---
 .../public/vuejs/_components/OnTheFly.vue     | 29 +++++++++----
 .../Resources/public/vuejs/_js/i18n.js        | 14 +++++++
 .../PersonsAssociated/PersonItem.vue          | 20 +++------
 .../components/Requestor.vue                  | 24 +++++++----
 .../components/Resources/ResourceItem.vue     | 42 ++++++++-----------
 .../public/vuejs/_components/AddPersons.vue   | 17 ++++++--
 .../_components/AddPersons/TypePerson.vue     | 19 +++++----
 .../_components/AddPersons/TypeThirdParty.vue | 19 +++++----
 8 files changed, 107 insertions(+), 77 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 5295e25e4..3b7c67dc9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -4,18 +4,21 @@
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
+      {{ buttonText }}
    </a>
   
    <teleport to="body">
       <modal v-if="modal.showModal"
          :modalDialogClass="modal.modalDialogClass"
          @close="modal.showModal = false">
-   
+         
          <template v-slot:header>
-            <h3 class="modal-title">{{ $t(modalTitle) }}</h3>
+            <h3 class="modal-title">{{ $t(titleModal) }}</h3>
          </template>
          <template v-slot:body>
-            
+            {{ action }}
+            {{ type }}
+            {{ id }}
          </template>
          <template v-slot:footer>
             <button class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
@@ -36,7 +39,7 @@ export default {
    components: {
       Modal
    },
-   props: ['type', 'id', 'action'],
+   props: ['type', 'id', 'action', 'buttonText'],
    data() {
       return {
          modal: {
@@ -50,20 +53,30 @@ export default {
          switch (this.action) {
             case 'show':
                return 'bt-show';
-            case 'create':
-               return 'bt-create';
             case 'edit':
                return 'bt-update';
+            case 'create':
+               return 'bt-create';
          }
       },
       titleAction() {
          switch (this.action) {
             case 'show':
                return 'action.show';
-            case 'create':
-               return 'action.create';
             case 'edit':
                return 'action.edit';
+            case 'create':
+               return 'action.create';
+         }
+      },
+      titleModal() {
+         switch (this.action) {
+            case 'show':
+               return 'onthefly.show.' + this.type;
+            case 'edit':
+               return 'onthefly.edit.' + this.type;
+            case 'create':
+               return 'onthefly.create.title';
          }
       },
    },
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 319378d7e..be809b322 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -46,6 +46,20 @@ const messages = {
          previous: "Précédent",
          top: "Haut",
          bottom: "Bas",
+      },
+      onthefly: {
+         show: {
+            person: "Détails de l'usager",
+            thirdparty: "Détails du tiers"
+         },
+         edit: {
+            person: "Modifier un usager",
+            thirdparty: "Modifier un tiers"
+         },
+         create: {
+            button: "Créer \"{q}\"",
+            title: "Saisir une nouvelle personne à la volée",
+         },         
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index 85ed43bce..7e3abd1ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -14,15 +14,15 @@
       <ul class="record_actions">
          <li>
             <on-the-fly
-               :type="participation.person.type"
-               :id="participation.person.id"
+               v-bind:type="participation.person.type"
+               v-bind:id="participation.person.id"
                action="show">
             </on-the-fly>
          </li>
          <li>
             <on-the-fly
-               :type="participation.person.type"
-               :id="participation.person.id"
+               v-bind:type="participation.person.type"
+               v-bind:id="participation.person.id"
                action="edit">
             </on-the-fly>
          </li>
@@ -35,7 +35,7 @@
          <li>
             <button v-if="!participation.endDate"
                class="sc-button bt-remove"
-               :title="$t('action.remove')" 
+               v-bind:title="$t('action.remove')" 
                @click.prevent="$emit('close', participation)">
             </button>
             <button v-else class="sc-button bt-remove disabled"></button>
@@ -54,14 +54,6 @@ export default {
       OnTheFly
    },
    props: ['participation'],
-   data() {
-      return {
-         url: {
-            show: '/fr/person/' + this.participation.person.id + '/general',
-            edit: '/fr/person/' + this.participation.person.id + '/general/edit'
-         }
-      }
-   },
-   emits: ['remove', 'close']
+   emits: ['remove', 'close'],
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 32fbb86c2..67b12a14a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -41,7 +41,18 @@
 
          <ul class="record_actions">
             <li>
-               <a class="sc-button bt-show" :title="$t('action.show')" target="_blank" :href="url.show"></a>
+               <on-the-fly
+                  v-bind:type="accompanyingCourse.requestor.type"
+                  v-bind:id="accompanyingCourse.requestor.id"
+                  action="show">
+               </on-the-fly>
+            </li>
+            <li>
+               <on-the-fly
+                  v-bind:type="accompanyingCourse.requestor.type"
+                  v-bind:id="accompanyingCourse.requestor.id"
+                  action="edit">
+               </on-the-fly>
             </li>
          </ul>
       </div>
@@ -76,12 +87,14 @@
 </template>
 
 <script>
-import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
 
 export default {
    name: 'Requestor',
    components: {
       AddPersons,
+      OnTheFly
    },
    data() {
       return {
@@ -107,13 +120,6 @@ export default {
          get() {
             return this.$store.state.accompanyingCourse.requestorAnonymous;
          }
-      },
-      url() {
-         return (this.accompanyingCourse.requestor.type === 'person') ? {
-            show: `/fr/person/${this.accompanyingCourse.requestor.id}/general`,
-         } : {
-            show: `/fr/thirdparty/thirdparty/${this.accompanyingCourse.requestor.id}/show`,
-         }
       }
    },
    methods: {
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 ffec23ddf..9b9316fec 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
@@ -21,24 +21,25 @@
    <td>
       <ul class="record_actions">
          <li>
-            <a class="sc-button bt-show" target="_blank"
-               :href="url.show"
-               :title="$t('action.show')">
-            </a>
+            <on-the-fly
+               v-bind:type="resource.resource.type"
+               v-bind:id="resource.resource.id"
+               action="show">
+            </on-the-fly>
          </li>
          <li>
-            <a class="sc-button bt-update" target="_blank"
-               :href="url.edit"
-               :title="$t('action.edit')">
-            </a>
+            <on-the-fly
+               v-bind:type="resource.resource.type"
+               v-bind:id="resource.resource.id"
+               action="edit">
+            </on-the-fly>
          </li>
          <li>
             <button
                class="sc-button bt-remove"
-               :title="$t('action.remove')" 
+               v-bind:title="$t('action.remove')" 
                @click.prevent="$emit('remove', resource)">
             </button>
-            
          </li>
       </ul>
    </td>
@@ -46,23 +47,14 @@
 </template>
 
 <script>
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+
 export default {
    name: 'ResourceItem',
+   components: {
+      OnTheFly
+   },
    props: ['resource'],
-   emits: ['remove'],
-   computed: {
-      type() {
-         return this.resource.resource.type;
-      },
-      url() {
-         return (this.type === 'person') ? {
-            show: `/fr/person/${this.resource.resource.id}/general`,
-            edit: `/fr/person/${this.resource.resource.id}/general/edit`
-         } : {
-            show: `/fr/thirdparty/thirdparty/${this.resource.resource.id}/show`,
-            edit: `/fr/thirdparty/thirdparty/${this.resource.resource.id}/update`
-         }
-      }
-   }
+   emits: ['remove']
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index a37f93e7e..d50c1b1ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -65,9 +65,14 @@
                   @updateSelected="updateSelected">
                </person-suggestion>
 
-               <button v-if="query.length >= 3" class="sc-button bt-create ml-5 mt-2" name="createPerson">
-                  {{ $t('action.create') }} "{{ query }}"
-               </button>
+               <div class="create-button">
+                  <on-the-fly
+                     v-if="query.length >= 3" 
+                     v-bind:buttonText="$t('onthefly.create.button', {q: query})"
+                     action="create">
+                  </on-the-fly>
+               </div>
+               
             </div>
          </template>
 
@@ -84,6 +89,7 @@
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
 import PersonSuggestion from './AddPersons/PersonSuggestion';
 import { searchPersons, searchPersons_2 } from 'ChillPersonAssets/vuejs/_api/AddPersons';
 
@@ -92,6 +98,7 @@ export default {
    components: {
       Modal,
       PersonSuggestion,
+      OnTheFly
    },
    props: [
       'buttonTitle',
@@ -251,4 +258,8 @@ export default {
          }
       }
    }
+   .create-button > a {
+      margin-top: 0.5em;
+      margin-left: 2.6em;
+   }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index af5b13b16..eff860f91 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -14,22 +14,23 @@
       <span class="badge badge-pill badge-secondary" :title="item.key">
          {{ $t('item.type_person') }}
       </span>
-      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
+      <on-the-fly
+         type="person"
+         v-bind:id="item.result.id"
+         action="show">
+      </on-the-fly>
       
    </div>
 </template>
 
 <script>
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+
 export default {
    name: 'SuggestionPerson',
-   props: ['item'],
-   data() {
-      return {
-         url: {
-            show: '/fr/person/' + this.item.result.person_id + '/general',
-            edit: '/fr/person/' + this.item.result.person_id + '/general/edit'
-         },
-      }
+   components: {
+      OnTheFly
    },
+   props: ['item']
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 37cee7852..5a4aa9de6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -15,22 +15,23 @@
       <span class="badge badge-pill badge-secondary" :title="item.key">
          {{ $t('item.type_thirdparty') }}
       </span>
-      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
+      <on-the-fly
+         type="thirdparty"
+         v-bind:id="item.result.id"
+         action="show">
+      </on-the-fly>
       
    </div>
 </template>
 
 <script>
+import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
+
 export default {
    name: 'SuggestionThirdParty',
-   props: ['item'],
-   data() {
-      return {
-         url: {
-            show: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/show',
-            edit: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/edit'
-         },
-      }
+   components: {
+      OnTheFly
    },
+   props: ['item']
 }
 </script>

From 718d6c23757ae0e58a708d4fdf583b05149b91f3 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 31 May 2021 19:25:37 +0200
Subject: [PATCH 26/37] add basic on-the-fly sub-components, to
 show/edit/create person/thirdparty

---
 .../public/modules/bootstrap/bootstrap.scss   |  2 +-
 .../public/vuejs/_components/OnTheFly.vue     | 34 +++++++--
 .../vuejs/_components/OnTheFly/Create.vue     | 73 +++++++++++++++++++
 .../vuejs/_components/OnTheFly/Person.vue     | 22 ++++++
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 22 ++++++
 .../Resources/public/vuejs/_js/i18n.js        |  4 +-
 .../vuejs/AccompanyingCourse/js/i18n.js       |  2 +-
 7 files changed, 151 insertions(+), 8 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
index 8a77ac48f..cc9c090e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
@@ -23,7 +23,7 @@
 // @import "bootstrap/scss/button-group";
 // @import "bootstrap/scss/input-group";
 // @import "bootstrap/scss/custom-forms";
-// @import "bootstrap/scss/nav";
+@import "bootstrap/scss/nav";
 // @import "bootstrap/scss/navbar";
 // @import "bootstrap/scss/card";
 // @import "bootstrap/scss/breadcrumb";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 3b7c67dc9..238b97851 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -15,11 +15,29 @@
          <template v-slot:header>
             <h3 class="modal-title">{{ $t(titleModal) }}</h3>
          </template>
-         <template v-slot:body>
-            {{ action }}
-            {{ type }}
-            {{ id }}
+         
+         <template v-slot:body v-if="type === 'person'">
+            <on-the-fly-person
+               v-bind:id="id"
+               v-bind:type="type"
+               v-bind:action="action">
+            </on-the-fly-person>
          </template>
+         
+         <template v-slot:body v-else-if="type === 'thirdparty'">
+            <on-the-fly-thirdparty
+               v-bind:id="id"
+               v-bind:type="type"
+               v-bind:action="action">
+            </on-the-fly-thirdparty>
+         </template>
+         
+         <template v-slot:body v-else>
+            <on-the-fly-create
+               v-bind:action="action">
+            </on-the-fly-create>
+         </template>
+            
          <template v-slot:footer>
             <button class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
                {{ $t('action.save')}}
@@ -33,11 +51,17 @@
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import OnTheFlyPerson from './OnTheFly/Person.vue';
+import OnTheFlyThirdparty from './OnTheFly/ThirdParty.vue';
+import OnTheFlyCreate from './OnTheFly/Create.vue';
 
 export default {
    name: 'OnTheFly',
    components: {
-      Modal
+      Modal,
+      OnTheFlyPerson,
+      OnTheFlyThirdparty,
+      OnTheFlyCreate
    },
    props: ['type', 'id', 'action', 'buttonText'],
    data() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
new file mode 100644
index 000000000..eea25ad6d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
@@ -0,0 +1,73 @@
+<template>   
+   <ul class="nav nav-tabs">
+      <li class="nav-item">
+         <a class="nav-link" :class="{ active: isActive('person') }">
+            <label for="person">
+               <input type="radio" name="person" v-model="radioType" value="person">
+               {{ $t('onthefly.create.person') }}
+            </label>
+         </a>
+      </li>
+      <li class="nav-item">
+         <a class="nav-link" :class="{ active: isActive('thirdparty') }">
+            <label for="thirdparty">
+               <input type="radio" name="thirdparty" v-model="radioType" value="thirdparty">
+               {{ $t('onthefly.create.thirdparty') }}
+            </label>
+         </a>
+      </li>
+   </ul>
+   
+   <div class="my-4">
+      <on-the-fly-person
+         v-if="type === 'person'"
+         v-bind:action="action">
+      </on-the-fly-person>
+      
+      <on-the-fly-thirdparty
+         v-if="type === 'thirdparty'"
+         v-bind:action="action">
+      </on-the-fly-thirdparty>
+   </div>      
+</template>
+
+<script>
+import OnTheFlyPerson from './Person.vue';
+import OnTheFlyThirdparty from './ThirdParty.vue';
+
+export default {
+   name: "OnTheFlyCreate",
+   props: ['action'], 
+   components: {
+      OnTheFlyPerson,
+      OnTheFlyThirdparty
+   },
+   data() {
+      return {
+         type: 'person'
+      }
+   },
+   computed: {
+      radioType: {
+         set(type) {
+            this.type = type;
+         },
+         get() {
+            return this.type;
+         }
+      }
+   },
+   methods: {
+      isActive(tab) {
+         return (this.type === tab) ? true : false; 
+      }
+      
+   }
+}
+</script>
+
+<style lang="css" scoped>
+label {
+   cursor: pointer;
+}
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
new file mode 100644
index 000000000..78bf4fdf9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -0,0 +1,22 @@
+<template>
+   <div v-if="action === 'show'">
+      show
+      person
+      {{ id }}
+   </div>
+   <div v-else-if="action === 'edit' || action === 'create'">
+      {{ action }}
+      person 
+      {{ id }}
+   </div>
+</template>
+
+<script>
+export default {
+   name: "OnTheFlyPerson",
+   props: ['id', 'type', 'action']
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
new file mode 100644
index 000000000..768954778
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -0,0 +1,22 @@
+<template>
+   <div v-if="action === 'show'">
+      show
+      thirdparty
+      {{ id }}
+   </div>
+   <div v-else-if="action === 'edit' || action === 'create'">
+      {{ action }}
+      thirdparty 
+      {{ id }}
+   </div>
+</template>
+
+<script>
+export default {
+   name: "OnTheFlyThirdParty",
+   props: ['id', 'type', 'action']
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index be809b322..ed8d8154f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -58,7 +58,9 @@ const messages = {
          },
          create: {
             button: "Créer \"{q}\"",
-            title: "Saisir une nouvelle personne à la volée",
+            title: "Saisir à la volée…",
+            person: "un nouvel usager",
+            thirdparty: "un nouveau tiers"
          },         
       }
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 79c325c88..f5741b34a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -74,7 +74,7 @@ const appMessages = {
       comment: {
          title: "Observations",
          label: "Ajout d'une note",
-         content: "Rédigez une première note...",
+         content: "Rédigez une première note…",
          created_by: "créé par {0}, le {1}" 
       },
       confirm: {

From 4562ed46db814a382238da535e32531706bf957f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 1 Jun 2021 10:21:08 +0200
Subject: [PATCH 27/37] OnTheFly modal: adapt footer button for show/edit cases
 (bug minor)

[BUG] to reproduce:
* clic first on show item button
* in modal clic edit button
* close modal
* clic again on show item button
---
 .../public/vuejs/_components/OnTheFly.vue     | 19 ++++++++++++++++---
 .../Resources/public/vuejs/_js/i18n.js        |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 238b97851..4e41a4adb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -39,7 +39,12 @@
          </template>
             
          <template v-slot:footer>
-            <button class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
+            <button v-if="action === 'show'"
+               @click="changeActionTo('edit')"
+               class="sc-button bt-update"> <!-- @click.prevent="$emit('..', ..)" -->
+            </button>
+            <button v-else
+               class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
                {{ $t('action.save')}}
             </button>
          </template>
@@ -69,10 +74,14 @@ export default {
          modal: {
             showModal: false,
             modalDialogClass: "modal-dialog-scrollable modal-xl"
-         }
+         },
+         action: this.action
       }
    },
    computed: {
+      action() {
+         return this.$data.action;
+      },
       classAction() {
          switch (this.action) {
             case 'show':
@@ -102,7 +111,7 @@ export default {
             case 'create':
                return 'onthefly.create.title';
          }
-      },
+      }
    },
    methods: {
       openModal() {
@@ -110,6 +119,10 @@ export default {
          this.$nextTick(function() {
             //this.$refs.search.focus();
          })
+      },
+      changeActionTo(action) {
+         // [BUG] clic first on show item button; in modal clic edit button; close modal; clic again on show item button
+         this.$data.action = action; 
       }
    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index ed8d8154f..025aeeb44 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -58,7 +58,7 @@ const messages = {
          },
          create: {
             button: "Créer \"{q}\"",
-            title: "Saisir à la volée…",
+            title: "Créer à la volée…",
             person: "un nouvel usager",
             thirdparty: "un nouveau tiers"
          },         

From 8011293b284fc5449989b48269adceda6224adfb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Jun 2021 21:55:34 +0200
Subject: [PATCH 28/37] address form: add the possibility to create a new
 address

---
 .../Resources/public/vuejs/Address/App.vue    | 13 ++++++++----
 .../Resources/public/vuejs/Address/js/i18n.js |  1 +
 .../AddAddress/AddressSelection.vue           | 21 ++++++++++++++-----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index eddc93fe7..7c27db341 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -33,20 +33,25 @@ export default {
    methods: {
       addNewAddress({ address, modal }) {
          console.log('@@@ CLICK button addNewAdress', address);
-         const newAddress = {
+
+         let newAddress = {
             'isNoAddress': address.isNoAddress,
             'street': address.selected.address.street,
             'streetNumber': address.selected.address.streetNumber,
-            'postcode': {'id': address.selected.address.postcode.id},
+            'postcode': {'id': address.selected.city.id },
             'floor': address.floor,
             'corridor': address.corridor,
             'steps': address.steps,
             'flat': address.flat,
             'buildingName': address.buildingName,
             'distribution': address.distribution,
-            'extra': address.extra,
-            'point': address.selected.address.point.coordinates
+            'extra': address.extra
          };
+
+         if (address.selected.address.point !== undefined){
+            newAddress = Object.assign(newAddress, {'point': address.selected.address.point.coordinates});
+         }
+
          this.$store.dispatch('addAddress', newAddress);
          modal.showModal = false;
       }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index 9e88b8e90..6a264c4f4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -6,6 +6,7 @@ const addressMessages = {
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
       select_address: 'Choisir une adresse',
+      create_address: 'Appuyer sur "Enter" pour créer une nouvelle adresse',
       isNoAddress: 'Pas d\'adresse complète',
       floor: 'Étage',
       corridor: 'Couloir',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
index e0b84d033..f5da59143 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
@@ -7,7 +7,11 @@
          track-by="id"
          label="value"
          :custom-label="transName"
+         :taggable="true"
+         :multiple="false"
+         @tag="addAddress"
          :placeholder="$t('select_address')"
+         :tagPlaceholder="$t('create_address')"
          :options="addresses">
       </VueMultiselect>
    </div>
@@ -25,18 +29,25 @@ export default {
          value: null
       }
    },
+   computed: {
+      addresses() {
+         return this.address.loaded.addresses;
+      }
+   },
    methods: {
       transName(value) {
-         return `${value.street}, ${value.streetNumber}`
+         return value.streetNumber === undefined ? value.street : `${value.street}, ${value.streetNumber}`
       },
       selectAddress(value) {
          this.address.selected.address = value;
          this.updateMapCenter(value.point);
       },
-   },
-   computed: {
-      addresses() {
-         return this.address.loaded.addresses;
+      addAddress (newAddress) {
+         const address = {
+            street: newAddress
+         };
+         this.value = address;
+         this.address.selected.address = address;
       }
    }
 };

From 4d0cfbb3960930ec20d59aea08a94c0385b6eeb1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 2 Jun 2021 22:20:19 +0200
Subject: [PATCH 29/37] OnTheFly modal, Person Sub-component: create/edit form,
 show

---
 .../public/vuejs/_components/OnTheFly.vue     |  28 ++-
 .../vuejs/_components/OnTheFly/Create.vue     |  23 +-
 .../vuejs/_components/OnTheFly/Person.vue     |  22 --
 .../vuejs/_components/OnTheFly/ThirdParty.vue |   1 +
 .../Resources/public/vuejs/_api/OnTheFly.js   |  48 ++++
 .../public/vuejs/_components/AddPersons.vue   |   8 +-
 .../AddPersons/PersonSuggestion.vue           |   2 +-
 .../vuejs/_components/OnTheFly/Person.vue     | 210 ++++++++++++++++++
 .../Resources/public/vuejs/_js/i18n.js        |  16 +-
 .../views/AccompanyingCourse/index.html.twig  |   2 +-
 10 files changed, 319 insertions(+), 41 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 4e41a4adb..ac5362ce7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -20,7 +20,8 @@
             <on-the-fly-person
                v-bind:id="id"
                v-bind:type="type"
-               v-bind:action="action">
+               v-bind:action="action"
+               ref="castPerson">
             </on-the-fly-person>
          </template>
          
@@ -28,13 +29,15 @@
             <on-the-fly-thirdparty
                v-bind:id="id"
                v-bind:type="type"
-               v-bind:action="action">
+               v-bind:action="action"
+               ref="castThirdparty">
             </on-the-fly-thirdparty>
          </template>
          
          <template v-slot:body v-else>
             <on-the-fly-create
-               v-bind:action="action">
+               v-bind:action="action"
+               ref="castNew">
             </on-the-fly-create>
          </template>
             
@@ -44,7 +47,10 @@
                class="sc-button bt-update"> <!-- @click.prevent="$emit('..', ..)" -->
             </button>
             <button v-else
-               class="sc-button bt-save"> <!-- @click.prevent="$emit('..', ..)" -->
+               class="sc-button bt-save"
+               @click="saveAction"
+               > <!--  
+               -->
                {{ $t('action.save')}}
             </button>
          </template>
@@ -55,8 +61,8 @@
 </template>
 
 <script>
-import Modal from 'ChillMainAssets/vuejs/_components/Modal';
-import OnTheFlyPerson from './OnTheFly/Person.vue';
+import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
+import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from './OnTheFly/ThirdParty.vue';
 import OnTheFlyCreate from './OnTheFly/Create.vue';
 
@@ -123,6 +129,16 @@ export default {
       changeActionTo(action) {
          // [BUG] clic first on show item button; in modal clic edit button; close modal; clic again on show item button
          this.$data.action = action; 
+      },
+      saveAction() {
+         console.log('saveAction');
+         if (this.type === 'person') {
+            this.$refs.castPerson.postData();
+         } else if (this.type === 'thirdparty') {
+            this.$refs.castThirdparty.postData();
+         } else {
+            this.$refs.castNew.castByType();
+         }
       }
    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
index eea25ad6d..f374647ff 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
@@ -21,19 +21,21 @@
    <div class="my-4">
       <on-the-fly-person
          v-if="type === 'person'"
-         v-bind:action="action">
+         v-bind:action="action"
+         ref="castPerson">
       </on-the-fly-person>
       
       <on-the-fly-thirdparty
          v-if="type === 'thirdparty'"
-         v-bind:action="action">
+         v-bind:action="action"
+         ref="castThirdparty">
       </on-the-fly-thirdparty>
    </div>      
 </template>
 
 <script>
-import OnTheFlyPerson from './Person.vue';
-import OnTheFlyThirdparty from './ThirdParty.vue';
+import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
+import OnTheFlyThirdparty from './ThirdParty.vue'; // TODO move in ChillThirdpartyAssets
 
 export default {
    name: "OnTheFlyCreate",
@@ -44,7 +46,7 @@ export default {
    },
    data() {
       return {
-         type: 'person'
+         type: 'person' //by default
       }
    },
    computed: {
@@ -60,8 +62,17 @@ export default {
    methods: {
       isActive(tab) {
          return (this.type === tab) ? true : false; 
+      },
+      castByType() {
+         console.log('saveActionByType');
+         if (this.type === 'person') {
+            this.$refs.castPerson.postData();
+         } else if (this.type === 'thirdparty') {
+            this.$refs.castThirdparty.postData();
+         } else {
+            throw Error('Invalid type of entity');
+         }
       }
-      
    }
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
deleted file mode 100644
index 78bf4fdf9..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-   <div v-if="action === 'show'">
-      show
-      person
-      {{ id }}
-   </div>
-   <div v-else-if="action === 'edit' || action === 'create'">
-      {{ action }}
-      person 
-      {{ id }}
-   </div>
-</template>
-
-<script>
-export default {
-   name: "OnTheFlyPerson",
-   props: ['id', 'type', 'action']
-}
-</script>
-
-<style lang="css" scoped>
-</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 768954778..b8dced534 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -16,6 +16,7 @@ export default {
    name: "OnTheFlyThirdParty",
    props: ['id', 'type', 'action']
 }
+// TODO move in ChillThirdpartyAssets
 </script>
 
 <style lang="css" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
new file mode 100644
index 000000000..332f09e01
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -0,0 +1,48 @@
+/*
+* GET a person by id
+*/
+const getPerson = (id) => {
+   const url = `/api/1.0/person/person/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+* GET a thirdparty by id
+* TODO move in ChillThirdpartyAssets !!
+*/
+const getThirdparty = (id) => {
+   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+* POST a person
+*/
+const postPerson = (body) => {
+   const url = `/api/1.0/person/person.json`;
+   return fetch(url, {
+         method: 'POST',
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+   
+export { 
+   getPerson, 
+   getThirdparty,
+   postPerson 
+};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index d50c1b1ff..dc4ead36d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -69,7 +69,7 @@
                   <on-the-fly
                      v-if="query.length >= 3" 
                      v-bind:buttonText="$t('onthefly.create.button', {q: query})"
-                     action="create">
+                     action="create"><!-- TODO first close this modal -->
                   </on-the-fly>
                </div>
                
@@ -177,7 +177,7 @@ export default {
          if (query.length >= 3) {
             searchPersons_2({ query, options: this.options })
                .then(suggested => new Promise((resolve, reject) => {
-                  console.log('suggested', suggested);
+                  //console.log('suggested', suggested);
                   this.loadSuggestions(suggested.results);
                   resolve();
             }));
@@ -186,14 +186,14 @@ export default {
          }
       },
       loadSuggestions(suggested) { 
-         console.log('suggested', suggested);
+         //console.log('suggested', suggested);
          this.search.suggested = suggested;
          this.search.suggested.forEach(function(item) {
             item.key = this.itemKey(item);
          }, this);
       },
       updateSelected(value) {
-         console.log('value', value);
+         //console.log('value', value);
          this.search.selected = value;
       },
       resetSearch() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index 3846f7b39..c6494e461 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -42,7 +42,7 @@ export default {
    computed: {
       selected: {
          set(value) {
-            console.log('value', value);
+            //console.log('value', value);
             this.$emit('updateSelected', value);
          },
          get() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
new file mode 100644
index 000000000..62fd20a2a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -0,0 +1,210 @@
+<template>
+<div v-if="action === 'show'">
+   
+   <div class="flex-table">
+      <div class="item-bloc">
+         <div class="item-row">
+            <div class="item-col">
+               <h3 :title="person.id">{{ person.text }}</h3>
+               <p>
+                  <i class="fa fa-fw" 
+                     :class="genderClass">
+                     <!--
+                     :title="$t(genderTranslation)"
+                     -->
+                  </i>
+                  <span v-if="person.birthdate">
+                     {{ $t('person.born', { e: feminized }) }}
+                     {{ $d(person.birthdate.datetime, 'short') }}
+                  </span>
+               </p>
+            </div>
+            <div class="item-col">
+               <dl class="list-content"> 
+                  <dt>{{ $t('person.firstname') }}</dt>
+                  <dd>{{ person.firstName }}</dd>
+                  
+                  <dt>{{ $t('person.lastname') }}</dt>
+                  <dd>{{ person.lastName }}</dd>
+                  
+                  <dt>{{ $t('person.altnames') }}</dt>
+                  <dd>{{ person.altNames }}</dd>
+                  
+                  <span v-if="person.center">
+                     <dt>{{ $t('person.center_name') }}</dt>
+                     <dd :title="person.center.id">{{ person.center.name }}</dd>
+                  </span>
+                     
+                  <dt>{{ $t('person.phonenumber') }}</dt>
+                  <dd>{{ person.phonenumber }}</dd>
+                  
+                  <dt>{{ $t('person.mobilenumber') }}</dt>
+                  <dd>{{ person.mobilenumber }}</dd>
+                  
+                  <dt>{{ $t('person.gender.title') }}</dt>
+                  <!--
+                  <dd>{{ $t(genderTranslation) }}</dd>
+                  -->
+               </dl>
+            </div>
+         </div>
+      </div>
+   </div>   
+   
+</div>
+<div v-else-if="action === 'edit' || action === 'create'">
+   {{ action }}
+   
+   <input v-model="firstName" :placeholder="$t('person.firstname')" />
+   <input v-model="lastName" :placeholder="$t('person.lastname')" />
+   
+   <!--  TODO fix placeholder if undefined 
+         TODO dynamically get gender options
+   -->
+   <select v-model="gender">
+      <option disabled value="">{{ $t('person.gender.placeholder') }}</option> 
+      <option value="woman">{{ $t('person.gender.woman') }}</option>
+      <option value="man">{{ $t('person.gender.man') }}</option>
+      <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
+   </select>
+   
+   <!--
+   <input 
+      type="text"
+      id="chill_personbundle_person_birthdate" 
+      name="chill_personbundle_person[birthdate]" 
+      required="required"
+      class="input datepicker"
+      v-model="birthDate"
+      aria-label="Use the arrow keys to pick a date"
+      />
+   <datepicker v-model="birthDate" />
+   -->
+   
+   <i class="fa fa-phone">
+   </i><input v-model="phonenumber" :placeholder="$t('person.phonenumber')" />
+   <i class="fa fa-mobile">
+   </i><input v-model="mobilenumber" :placeholder="$t('person.mobilenumber')" />
+   
+</div>
+</template>
+
+<script>
+import { getPerson, postPerson } from '../../_api/OnTheFly';
+//import Datepicker from 'vue3-datepicker';
+//import { ref } from 'vue';
+//const picked = ref(new Date())
+
+export default {
+   name: "OnTheFlyPerson",
+   props: ['id', 'type', 'action'],
+   data() {
+      return {
+         person: {
+            type: 'person'
+         }
+      }
+   },
+   computed: {
+      firstName: {
+         set(value) { this.person.firstName = value; },
+         get() { return this.person.firstName; }
+      },
+      lastName: {
+         set(value) { this.person.lastName = value; },
+         get() { return this.person.lastName; }
+      },
+      gender: {
+         set(value) { this.person.gender = value; },
+         get() { return this.person.gender; } 
+      },
+//      birthDate: {
+//         set(value) { this.person.birthdate.datetime = value; },
+//         get() { 
+//            if (this.person.birthdate) {
+//               let datetime = this.person.birthdate.datetime;
+//               return datetime.getDate() + '-' +  (datetime.getMonth() + 1) + '-' + datetime.getFullYear();
+//            } else {
+//               return ref(new Date());
+//            }
+//         } 
+//      },
+      phonenumber: {
+         set(value) { this.person.phonenumber = value; },
+         get() { return this.person.phonenumber; }
+      },
+      mobilenumber: {
+         set(value) { this.person.mobilenumber = value; },
+         get() { return this.person.mobilenumber; }
+      },
+      genderClass() {
+         switch (this.person.gender) {
+            case 'woman':
+               return 'fa-venus';
+            case 'man':
+               return 'fa-mars';
+            case 'neuter':
+               return 'fa-neuter';
+         }
+      },
+      genderTranslation() {
+         switch (this.person.gender) {
+            case 'woman':
+               return 'person.gender.woman';
+            case 'man':
+               return 'person.gender.man';
+            case 'neuter':
+               return 'person.gender.neuter';
+         }
+      },
+      feminized() {
+         return (this.person.gender === 'woman')? 'e' : ''; 
+      }
+   },
+   mounted() {
+      if (this.action !== 'create') {
+         this.loadData();
+      }
+   },
+   methods: {
+      loadData() {
+         //console.log('loading data', this.id);
+         getPerson(this.id)
+            .then(person => new Promise((resolve, reject) => {
+               this.person = person;
+               //console.log('person', this.person);
+               resolve();
+         }));
+      },
+      postData() {
+         postPerson(this.person)
+            .then(person => new Promise((resolve, reject) => {
+               this.person = person;
+               console.log('person', person);
+               resolve();
+         }));
+      }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+ul {
+   li::marker {
+   }
+}
+div.flex-table {
+   div.item-bloc {
+      div.item-row {
+         div.item-col:last-child {
+            justify-content: flex-start;
+         }
+      }
+   }
+}
+dl {
+   dd {
+      margin-left: 1em;
+   }
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index e92a81e62..0f019c26b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -15,7 +15,21 @@ const personMessages = {
       person: {
          firstname: "Prénom",
          lastname: "Nom",
-         born: "né le ",
+         born: "né{e} le ",
+         center_id: "Identifiant du centre",
+         center_type: "Type de centre",
+         center_name: "Territoire", // vendée
+         phonenumber: "Téléphone",
+         mobilenumber: "Mobile",
+         altnames: "Autres noms",
+         gender: {
+            title: "Genre",
+            placeholder: "Choisissez le genre de l'usager",
+            woman: "Femme",
+            man: "Homme",
+            neuter: "Neutre",
+         }
+         
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 98f26987f..3fe5c56db 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -31,7 +31,7 @@
                             {% set gender = (p.person.gender == 'woman') ? 'fa-venus' : 
                                 (p.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
                             {% set genderTitle = (p.person.gender == 'woman') ? 'femme' : 
-                                (p.person.gender == 'homme') ? 'fa-mars' : 'neutre' %}
+                                (p.person.gender == 'man') ? 'homme' : 'neutre' %}
                             <i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ p.person.birthdate|format_date('short') }}
                         </p>
                     </div>

From 9333b6d2df93761416718a56fe117221972cfe82 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Jun 2021 10:22:20 +0200
Subject: [PATCH 30/37] address: correct customizeQuery

---
 .../Controller/AddressReferenceAPIController.php                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index 3e63c1b2a..cbe0ea0a5 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -19,7 +19,7 @@ class AddressReferenceAPIController extends ApiController
         if ($request->query->has('postal_code')) {
 
             $qb->where('e.postcode = :postal_code')
-               ->setParameter('postal_code', $request->get('postal_code'));
+               ->setParameter('postal_code', $request->query->get('postal_code'));
 
         }
     }

From a659263af654ea928d77322f1c8b84e7665e6ad7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Jun 2021 10:27:17 +0200
Subject: [PATCH 31/37] addresses: translations

---
 .../Resources/public/vuejs/Address/js/i18n.js               | 6 +++---
 .../Resources/public/vuejs/_components/AddAddress.vue       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index 6a264c4f4..ba79e88a7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -1,12 +1,12 @@
 const addressMessages = {
    fr: {
-      add_an_address: 'Ajouter une adresse',
-      select_an_address: 'Sélectionner une adresse',
+      add_an_address_title: 'Ajouter une adresse',
+      select_an_address_title: 'Sélectionner une adresse',
       fill_an_address: 'Compléter l\'adresse',
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
       select_address: 'Choisir une adresse',
-      create_address: 'Appuyer sur "Enter" pour créer une nouvelle adresse',
+      create_address: 'Appuyer sur "Entrée" pour créer une nouvelle adresse',
       isNoAddress: 'Pas d\'adresse complète',
       floor: 'Étage',
       corridor: 'Couloir',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index ad6e32c5d..0cfad7ac2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -1,6 +1,6 @@
 <template>
    <button class="sc-button bt-create centered mt-4" @click="openModal">
-      {{ $t('add_an_address') }}
+      {{ $t('add_an_address_title') }}
    </button>
 
    <teleport to="body">
@@ -9,14 +9,14 @@
          @close="modal.showModal = false">
 
          <template v-slot:header>
-            <h3 class="modal-title">{{ $t('add_an_address') }}</h3>
+            <h3 class="modal-title">{{ $t('add_an_address_title') }}</h3>
          </template>
 
          <template v-slot:body>
             <div class="address_form">
 
                <div class="address_form__header">
-                  <h4>{{ $t('select_an_address') }}</h4>
+                  <h4>{{ $t('select_an_address_title') }}</h4>
                </div>
 
                <div class="address_form__select">

From e1e3051d002d5f50d33858598950635d82611cba Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Jun 2021 10:33:09 +0200
Subject: [PATCH 32/37] address: correct customizeQuery

---
 .../ChillMainBundle/Controller/PostalCodeAPIController.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
index a02765ff7..026784208 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -19,7 +19,7 @@ class PostalCodeAPIController extends ApiController
         if ($request->query->has('country')) {
 
             $qb->where('e.country = :country')
-               ->setParameter('country', $request->get('country'));
+               ->setParameter('country', $request->query->get('country'));
 
         }
     }

From f26fafb2f274e60b7850fab78350e67b8d58fe5a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Jun 2021 10:35:27 +0200
Subject: [PATCH 33/37] address: remove comment

---
 .../public/vuejs/_components/AddAddress.vue   | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 0cfad7ac2..6072cf850 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -63,31 +63,6 @@
                </div>
             </div>
 
-            <!--
-            <div class="address_form__fields__isNoAddress"></div>
-            <div class="address_form__select">
-               <div class="address_form__select__header"></div>
-               <div class="address_form__select__left"></div>
-               <div class="address_form__map"></div>
-            </div>
-            <div class="address_form__fields">
-               <div class="address_form__fields__header"></div>
-               <div class="address_form__fields__left"></div>
-               <div class="address_form__fields__right"></div>
-            </div>
-
-            à discuter,
-            mais je pense qu'il est préférable de profiter de l'imbriquation des classes css
-
-            div.address_form {
-               div.select {
-                  div.header {}
-                  div.left {}
-                  div.map {}
-               }
-            }
-
-            -->
          </template>
 
          <template v-slot:footer>

From 43fb0202720ce5015e9eeb2b14df08c72f77970e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Jun 2021 13:01:24 +0200
Subject: [PATCH 34/37] address: remove serializer config (it is autowired)

---
 src/Bundle/ChillMainBundle/config/services/serializer.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index 583ba9091..efe98996e 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -9,8 +9,3 @@ services:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
 
-    Chill\MainBundle\Serializer\Normalizer\PointNormalizer:
-        autowire: true
-        tags:
-            - { name: 'serializer.normalizer', priority: 8 }
-

From 937be1af3ac781bf74e1eab49f122fd8da55316b Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 3 Jun 2021 14:34:52 +0200
Subject: [PATCH 35/37] fix html5 birthdate field on modal form OnTheFly

---
 .../public/vuejs/_components/OnTheFly.vue     |  2 +
 .../Resources/public/vuejs/_api/OnTheFly.js   | 16 +------
 .../vuejs/_components/OnTheFly/Person.vue     | 44 +++++++------------
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index ac5362ce7..8e1e2227a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -137,8 +137,10 @@ export default {
          } else if (this.type === 'thirdparty') {
             this.$refs.castThirdparty.postData();
          } else {
+            // saveAction() ==cast=to==> child.castByType() ==cast=to==> grand-child.postData()
             this.$refs.castNew.castByType();
          }
+         this.modal.showModal = false;
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
index 332f09e01..6adbc7028 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -11,20 +11,7 @@ const getPerson = (id) => {
 };
 
 /*
-* GET a thirdparty by id
-* TODO move in ChillThirdpartyAssets !!
-*/
-const getThirdparty = (id) => {
-   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-   return fetch(url)
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response');
-      });
-};
-
-/*
-* POST a person
+* POST a new person
 */
 const postPerson = (body) => {
    const url = `/api/1.0/person/person.json`;
@@ -43,6 +30,5 @@ const postPerson = (body) => {
    
 export { 
    getPerson, 
-   getThirdparty,
    postPerson 
 };
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 62fd20a2a..a3cf339e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -53,7 +53,6 @@
    
 </div>
 <div v-else-if="action === 'edit' || action === 'create'">
-   {{ action }}
    
    <input v-model="firstName" :placeholder="$t('person.firstname')" />
    <input v-model="lastName" :placeholder="$t('person.lastname')" />
@@ -68,18 +67,12 @@
       <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
    </select>
    
-   <!--
-   <input 
-      type="text"
+   <i class="fa fa-birthday-cake"></i>
+   <input type="date"
       id="chill_personbundle_person_birthdate" 
       name="chill_personbundle_person[birthdate]" 
-      required="required"
-      class="input datepicker"
       v-model="birthDate"
-      aria-label="Use the arrow keys to pick a date"
-      />
-   <datepicker v-model="birthDate" />
-   -->
+   />
    
    <i class="fa fa-phone">
    </i><input v-model="phonenumber" :placeholder="$t('person.phonenumber')" />
@@ -91,9 +84,6 @@
 
 <script>
 import { getPerson, postPerson } from '../../_api/OnTheFly';
-//import Datepicker from 'vue3-datepicker';
-//import { ref } from 'vue';
-//const picked = ref(new Date())
 
 export default {
    name: "OnTheFlyPerson",
@@ -118,17 +108,18 @@ export default {
          set(value) { this.person.gender = value; },
          get() { return this.person.gender; } 
       },
-//      birthDate: {
-//         set(value) { this.person.birthdate.datetime = value; },
-//         get() { 
-//            if (this.person.birthdate) {
-//               let datetime = this.person.birthdate.datetime;
-//               return datetime.getDate() + '-' +  (datetime.getMonth() + 1) + '-' + datetime.getFullYear();
-//            } else {
-//               return ref(new Date());
-//            }
-//         } 
-//      },
+      birthDate: {
+         set(value) { 
+            if (this.person.birthdate) {
+               this.person.birthdate.datetime = value + "T00:00:00+0100"; 
+            } else {
+               this.person.birthdate = { datetime: value + "T00:00:00+0100"};
+            }
+         },
+         get() { 
+            return (this.person.birthdate) ? this.person.birthdate.datetime.split('T')[0] : ''; 
+         } 
+      },
       phonenumber: {
          set(value) { this.person.phonenumber = value; },
          get() { return this.person.phonenumber; }
@@ -168,11 +159,10 @@ export default {
    },
    methods: {
       loadData() {
-         //console.log('loading data', this.id);
          getPerson(this.id)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               //console.log('person', this.person);
+               console.log('get person', this.person);
                resolve();
          }));
       },
@@ -180,7 +170,7 @@ export default {
          postPerson(this.person)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               console.log('person', person);
+               console.log('post person', person);
                resolve();
          }));
       }

From 0ce814cf52e04310d927f05d50c686f645daf6e6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Jun 2021 09:34:36 +0200
Subject: [PATCH 36/37] hotfix: delete duplicate key in ChillPersonBundle
 messages translation

---
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 1912cdaf2..e9befc441 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -179,7 +179,6 @@ See accompanying periods: Voir les périodes d'accompagnement
 See accompanying period: Voir cette période d'accompagnement
 Referrer: Référent
 
-Participants: Personnes impliquées
 # pickAPersonType
 Pick a person: Choisir une personne
 

From 55fa16ce5652c9c3c0d8cd85211361704683a6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jun 2021 14:54:14 +0200
Subject: [PATCH 37/37] fix missing postgresql extension: correct class name

---
 .gitlab-ci.yml                                                  | 2 +-
 src/Bundle/ChillMainBundle/migrations/Version20210528090000.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6973ff6d7..86e65c390 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ cache:
 
 before_script:
   # add extensions to postgres
-  - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm; CREATE EXTENSION IF NOT EXISTS btree_gist;"
+  - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
   - curl -sS https://getcomposer.org/installer | php
   - php -d memory_limit=2G composer.phar install
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
index de3c7336a..d2a33230f 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
@@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration;
 /**
  * Add extension btree_gist
  */
-final class Version20210528104651 extends AbstractMigration
+final class Version20210528090000 extends AbstractMigration
 {
     public function getDescription(): string
     {