From 1646740382e76dfb7e7372e38ef69f3a6fe9ebb4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 09:59:40 +0100
Subject: [PATCH 1/9] location: filter location endpoint by NULL names

---
 .../ChillMainBundle/Controller/LocationApiController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 5c0301959..c21eaaf26 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -22,12 +22,15 @@ class LocationApiController extends ApiController
             ),
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
-                $query->expr()->eq('e.active', "'TRUE'")
+                $query->expr()->eq('e.active', "'TRUE'"),
+                $query->expr()->isNotNull('e.name'),
+                $query->expr()->neq('e.name', ':emptyString'),
             )
         ))
         ->setParameters([
             'user' => $this->getUser(),
-            'dateBefore' => (new \DateTime())->sub(new \DateInterval('P6M'))
+            'dateBefore' => (new \DateTime())->sub(new \DateInterval('P6M')),
+            'emptyString' => '',
         ]);
     }
-}
+}
\ No newline at end of file

From 999658e79290b6c9f54daeb96d225632a4c83cf9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 10:27:58 +0100
Subject: [PATCH 2/9] location: filter location-type by active and
 availableForUsers

---
 .../Controller/LocationTypeApiController.php  | 25 +++++++++++++++++++
 .../ChillMainExtension.php                    |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
new file mode 100644
index 000000000..2a3a6cc59
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class LocationTypeApiController
+ *
+ * @package Chill\MainBundle\Controller
+ * @author Champs Libres
+ */
+class LocationTypeApiController extends ApiController
+{
+    public function customizeQuery(string $action, Request $request, $query): void
+    {
+        $query->andWhere(
+            $query->expr()->andX(
+                $query->expr()->eq('e.availableForUsers', "'TRUE'"),
+                $query->expr()->eq('e.active', "'TRUE'"),
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 972c046d9..71b642b43 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -520,6 +520,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\LocationType::class,
+                    'controller' => \Chill\MainBundle\Controller\LocationTypeApiController::class,
                     'name' => 'location_type',
                     'base_path' => '/api/1.0/main/location-type',
                     'base_role' => 'ROLE_USER',

From c8bc6ac4952febe89fe3be6f7484ffac0d9bb266 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 11:34:52 +0100
Subject: [PATCH 3/9] location: code refactoring: move saveNewLocation + order
 of fields

---
 .../vuejs/Activity/components/Location.vue    |  27 +--
 .../components/Location/NewLocation.vue       | 167 +++++++++++-------
 2 files changed, 110 insertions(+), 84 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 0dbf2652a..30a1c5bd9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -20,7 +20,7 @@
                     v-model="location">
                 </VueMultiselect>
 
-                <new-location @saveNewLocation="saveNewLocation"></new-location>
+                <new-location v-bind:locations="locations"></new-location>
             </div>
         </div>
     </teleport>
@@ -30,7 +30,7 @@
 import { mapState } from "vuex";
 import VueMultiselect from 'vue-multiselect';
 import NewLocation from './Location/NewLocation.vue';
-import { getLocations, postLocation } from '../api.js';
+import { getLocations } from '../api.js';
 
 export default {
     name: "Location",
@@ -67,29 +67,6 @@ export default {
         },
         customLabel(value) {
             return `${value.locationType.title.fr} ${value.name}`;
-        },
-        saveNewLocation(selected) {
-            console.log('saveNewLocation', selected);
-            let body = {
-                type: 'location',
-                name: selected.name,
-                address: {
-                    id: selected.addressId
-                },
-                locationType: {
-                    id: selected.type,
-                    type: 'location-type'
-                },
-                phonenumber1: selected.phonenumber1,
-                phonenumber2: selected.phonenumber2,
-                email: selected.email,
-            }
-            postLocation(body).then(location => new Promise(resolve => {
-                console.log('postLocation', location);
-                this.locations.push(location);
-                this.$store.dispatch('updateLocation', location);
-                resolve();
-            }));
         }
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 3ffb2a33f..2515e37fc 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -1,75 +1,86 @@
 <template>
+    <div>
+        <ul class="record_actions">
+            <li>
+                <a class="btn btn-sm btn-create" @click="openModal">
+                    {{ $t('activity.create_new_location') }}
+                </a>
+            </li>
+        </ul>
 
-    <ul class="record_actions">
-        <li>
-            <a class="btn btn-sm btn-create" @click="openModal">
-                {{ $t('activity.create_new_location') }}
-            </a>
-        </li>
-    </ul>
+        <teleport to="body">
+            <modal v-if="modal.showModal"
+                :modalDialogClass="modal.modalDialogClass"
+                @close="modal.showModal = false">
 
-    <teleport to="body">
-        <modal v-if="modal.showModal"
-               :modalDialogClass="modal.modalDialogClass"
-               @close="modal.showModal = false">
+                <template v-slot:header>
+                    <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
+                </template>
+                <template v-slot:body>
+                    <form>
+                        <div class="form-floating mb-3">
+                            <p v-if="errors.length">
+                                <b>{{ $t('activity.errors') }}</b>
+                                <ul>
+                                    <li v-for="error in errors">{{ error }}</li>
+                                </ul>
+                            </p>
+                        </div>
 
-            <template v-slot:header>
-                <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
-            </template>
-            <template v-slot:body>
+                        <div class="form-floating mb-3">
+                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
+                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
+                                <option v-for="t in locationTypes" :value="t.id">
+                                    {{ t.title.fr }}
+                                </option>
+                            </select>
+                            <label>{{ $t('activity.location_fields.type') }}</label>
+                        </div>
 
-                <add-address
-                    :context="addAddress.context"
-                    :options="addAddress.options"
-                    :addressChangedCallback="submitNewAddress"
-                    ref="addAddress">
-                </add-address>
+                        <div class="form-floating mb-3">
+                            <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
+                            <label for="name">{{ $t('activity.location_fields.name') }}</label>
+                        </div>
 
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
-                    <label for="name">{{ $t('activity.location_fields.name') }}</label>
-                </div>
+                        <add-address
+                            :context="addAddress.context"
+                            :options="addAddress.options"
+                            :addressChangedCallback="submitNewAddress"
+                            ref="addAddress">
+                        </add-address>
 
-                <div class="form-floating mb-3">
-                    <select class="form-select form-select-lg" id="type" v-model="selectType">
-                        <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
-                        <option v-for="t in locationTypes" :value="t.id">
-                            {{ t.title.fr }}
-                        </option>
-                    </select>
-                    <label>{{ $t('activity.location_fields.type') }}</label>
-                </div>
+                        <div class="form-floating mb-3">
+                            <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
+                            <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
+                            <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
+                            <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
+                        </div>
+                        <div class="form-floating mb-3">
+                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
+                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
+                        </div>
+                    </form>
+                </template>
+                <template v-slot:footer>
+                    <button class="btn btn-save"
+                        @click.prevent="saveNewLocation"
+                    >
+                        {{ $t('action.save') }}
+                    </button>
+                </template>
 
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
-                    <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
-                </div>
-                <div class="form-floating mb-3" v-if="hasPhonenumber1">
-                    <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
-                    <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
-                </div>
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
-                    <label for="email">{{ $t('activity.location_fields.email') }}</label>
-                </div>
-
-            </template>
-            <template v-slot:footer>
-                <button class="btn btn-save"
-                    @click.prevent="$emit('saveNewLocation', selected); modal.showModal = false;">
-                    {{ $t('action.save') }}
-                </button>
-            </template>
-
-        </modal>
-    </teleport>
+            </modal>
+        </teleport>
+    </div>
 </template>
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes } from "../../api";
+import { getLocationTypes, postLocation } from "../../api";
 
 export default {
     name: "NewLocation",
@@ -77,9 +88,10 @@ export default {
         Modal,
         AddAddress,
     },
-    emits: ['saveNewLocation'],
+    props: ['locations'],
     data() {
         return {
+            errors: [],
             selected: {
                 type: {},
                 name: null,
@@ -160,6 +172,18 @@ export default {
         this.getLocationTypesList();
     },
     methods: {
+        checkForm() {
+            console.log('check form')
+            if (this.selected.type) {
+                return true;
+            }
+
+            this.errors = [];
+
+            if (!this.selected.type) {
+                this.errors.push('Type of location required');
+            }
+        },
         getLocationTypesList() {
             getLocationTypes().then(response => new Promise(resolve => {
                 console.log('getLocationTypes', response);
@@ -170,6 +194,31 @@ export default {
         openModal() {
             this.modal.showModal = true;
         },
+        saveNewLocation() {
+            this.checkForm();
+            console.log('saveNewLocation', this.selected);
+            let body = {
+                type: 'location',
+                name: this.selected.name,
+                address: {
+                    id: this.selected.addressId
+                },
+                locationType: {
+                    id: this.selected.type,
+                    type: 'location-type'
+                },
+                phonenumber1: this.selected.phonenumber1,
+                phonenumber2: this.selected.phonenumber2,
+                email: this.selected.email,
+            }
+            postLocation(body).then(location => new Promise(resolve => {
+                console.log('postLocation', location);
+                this.locations.push(location);
+                this.$store.dispatch('updateLocation', location);
+                resolve();
+                this.modal.showModal = false;
+            }));
+        },
         submitNewAddress(payload) {
             console.log('submitNewAddress', payload);
             this.selected.addressId = payload.addressId;

From f4bd55262a52a50c23266bf63ce576b6a2cbe1a4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 11:59:06 +0100
Subject: [PATCH 4/9] location: client-side form validation

---
 .../components/Location/NewLocation.vue       | 75 ++++++++++---------
 .../Resources/public/vuejs/Activity/i18n.js   |  1 +
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 2515e37fc..2db928b3b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -22,7 +22,7 @@
                             <p v-if="errors.length">
                                 <b>{{ $t('activity.errors') }}</b>
                                 <ul>
-                                    <li v-for="error in errors">{{ error }}</li>
+                                    <li v-for="error in errors" :key="error">{{ error }}</li>
                                 </ul>
                             </p>
                         </div>
@@ -30,7 +30,7 @@
                         <div class="form-floating mb-3">
                             <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                 <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
-                                <option v-for="t in locationTypes" :value="t.id">
+                                <option v-for="t in locationTypes" :value="t.id" :key="t.id">
                                     {{ t.title.fr }}
                                 </option>
                             </select>
@@ -93,7 +93,7 @@ export default {
         return {
             errors: [],
             selected: {
-                type: {},
+                type: null,
                 name: null,
                 addressId: null,
                 phonenumber1: null,
@@ -129,7 +129,7 @@ export default {
                 return this.selected.type;
             },
             set(value) {
-                this.selected.type = value
+                this.selected.type = value;
             }
         },
         inputName: {
@@ -173,16 +173,20 @@ export default {
     },
     methods: {
         checkForm() {
-            console.log('check form')
-            if (this.selected.type) {
-                return true;
-            }
-
+            let cond = true;
+            console.log('check form');
             this.errors = [];
-
-            if (!this.selected.type) {
-                this.errors.push('Type of location required');
+            console.log(this.selected.type)
+            if (this.selected.type) {
+                //TODO conditional requirements for field
+                //if (this.selected.type.addressRequired = 'required') ...
+                cond = true;
+            } else {
+                this.errors.push('Type de localisation requis');
+                cond = false;
             }
+
+            return cond;
         },
         getLocationTypesList() {
             getLocationTypes().then(response => new Promise(resolve => {
@@ -195,29 +199,30 @@ export default {
             this.modal.showModal = true;
         },
         saveNewLocation() {
-            this.checkForm();
-            console.log('saveNewLocation', this.selected);
-            let body = {
-                type: 'location',
-                name: this.selected.name,
-                address: {
-                    id: this.selected.addressId
-                },
-                locationType: {
-                    id: this.selected.type,
-                    type: 'location-type'
-                },
-                phonenumber1: this.selected.phonenumber1,
-                phonenumber2: this.selected.phonenumber2,
-                email: this.selected.email,
-            }
-            postLocation(body).then(location => new Promise(resolve => {
-                console.log('postLocation', location);
-                this.locations.push(location);
-                this.$store.dispatch('updateLocation', location);
-                resolve();
-                this.modal.showModal = false;
-            }));
+            if (this.checkForm()) {
+                console.log('saveNewLocation', this.selected);
+                let body = {
+                    type: 'location',
+                    name: this.selected.name,
+                    address: {
+                        id: this.selected.addressId
+                    },
+                    locationType: {
+                        id: this.selected.type,
+                        type: 'location-type'
+                    },
+                    phonenumber1: this.selected.phonenumber1,
+                    phonenumber2: this.selected.phonenumber2,
+                    email: this.selected.email,
+                };
+                postLocation(body).then(location => new Promise(resolve => {
+                    console.log('postLocation', location);
+                    this.locations.push(location);
+                    this.$store.dispatch('updateLocation', location);
+                    resolve();
+                    this.modal.showModal = false;
+                }));
+            };
         },
         submitNewAddress(payload) {
             console.log('submitNewAddress', payload);
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
index c5ee23cec..37b9b356e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -4,6 +4,7 @@ const activityMessages = {
    fr: {
       activity: {
          //
+         errors: "Le formulaire contient des erreurs",
          social_issues: "Problématiques sociales",
          choose_other_social_issue: "Ajouter une autre problématique sociale...",
          social_actions: "Actions d'accompagnement",

From 819fc8af46867654521c8b4b940a1c6ad294305d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 13:42:35 +0100
Subject: [PATCH 5/9] location: allow null value for location in Activity

---
 src/Bundle/ChillActivityBundle/Form/ActivityType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 19d53c262..5ef08832d 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -313,7 +313,7 @@ class ActivityType extends AbstractType
                         }
                         return $location->getId();
                     },
-                    function (?string $id): Location {
+                    function (?string $id): ?Location {
                         return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                     }
                 ))

From addb36247888265238498708b6ad0bf9c098cd46 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 13:43:34 +0100
Subject: [PATCH 6/9] location: allow null value for location in Calendar

---
 src/Bundle/ChillCalendarBundle/Form/CalendarType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index f6e4d2baa..753eb3728 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -188,7 +188,7 @@ class CalendarType extends AbstractType
                     }
                     return $location->getId();
                 },
-                function (?string $id): Location {
+                function (?string $id): ?Location {
                     return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                 }
             ))

From 2aa588037adc98cd5585099ab56a3f4fba67ff8f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 13:51:15 +0100
Subject: [PATCH 7/9] location: client side validation

---
 .../vuejs/Activity/components/Location.vue    |  2 +-
 .../components/Location/NewLocation.vue       | 61 ++++++++++++++-----
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 30a1c5bd9..c8d1472bd 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -66,7 +66,7 @@ export default {
             }))
         },
         customLabel(value) {
-            return `${value.locationType.title.fr} ${value.name}`;
+            return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
         }
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 2db928b3b..1b563d2a2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -30,7 +30,7 @@
                         <div class="form-floating mb-3">
                             <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                 <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
-                                <option v-for="t in locationTypes" :value="t.id" :key="t.id">
+                                <option v-for="t in locationTypes" :value="t" :key="t.id">
                                     {{ t.title.fr }}
                                 </option>
                             </select>
@@ -46,10 +46,11 @@
                             :context="addAddress.context"
                             :options="addAddress.options"
                             :addressChangedCallback="submitNewAddress"
+                            v-if="showAddAddress"
                             ref="addAddress">
                         </add-address>
 
-                        <div class="form-floating mb-3">
+                        <div class="form-floating mb-3" v-if="showContactData">
                             <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
                             <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
                         </div>
@@ -57,7 +58,7 @@
                             <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
                             <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
                         </div>
-                        <div class="form-floating mb-3">
+                        <div class="form-floating mb-3" v-if="showContactData">
                             <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
                             <label for="email">{{ $t('activity.location_fields.email') }}</label>
                         </div>
@@ -166,7 +167,25 @@ export default {
         },
         hasPhonenumber1() {
             return this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== "";
-        }
+        },
+        showAddAddress() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.addressRequired !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
+        showContactData() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.contactData !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
     },
     mounted() {
         this.getLocationTypesList();
@@ -174,18 +193,24 @@ export default {
     methods: {
         checkForm() {
             let cond = true;
-            console.log('check form');
             this.errors = [];
-            console.log(this.selected.type)
-            if (this.selected.type) {
-                //TODO conditional requirements for field
-                //if (this.selected.type.addressRequired = 'required') ...
-                cond = true;
-            } else {
+            if (!this.selected.type) {
                 this.errors.push('Type de localisation requis');
                 cond = false;
+            } else {
+                if (this.selected.type.addressRequired === 'required' && !this.selected.addressId) {
+                    this.errors.push('Adresse requise');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.phonenumber1) {
+                    this.errors.push('Numéro de téléphone requis');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.email) {
+                    this.errors.push('Adresse email requise');
+                    cond = false;
+                }
             }
-
             return cond;
         },
         getLocationTypesList() {
@@ -204,17 +229,21 @@ export default {
                 let body = {
                     type: 'location',
                     name: this.selected.name,
-                    address: {
-                        id: this.selected.addressId
-                    },
                     locationType: {
-                        id: this.selected.type,
+                        id: this.selected.type.id,
                         type: 'location-type'
                     },
                     phonenumber1: this.selected.phonenumber1,
                     phonenumber2: this.selected.phonenumber2,
                     email: this.selected.email,
                 };
+                if (this.selected.addressId) {
+                    body = Object.assign(body, {
+                        address: {
+                            id: this.selected.addressId
+                        }
+                    });
+                }
                 postLocation(body).then(location => new Promise(resolve => {
                     console.log('postLocation', location);
                     this.locations.push(location);

From 0231433a6c8832f89c6df4bfbdfc8c256cec659f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 14:45:15 +0100
Subject: [PATCH 8/9] location: display the error message in case of wrong
 phone number or email

---
 .../components/Location/NewLocation.vue       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 1b563d2a2..2920e15b2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -244,13 +244,20 @@ export default {
                         }
                     });
                 }
-                postLocation(body).then(location => new Promise(resolve => {
-                    console.log('postLocation', location);
-                    this.locations.push(location);
-                    this.$store.dispatch('updateLocation', location);
-                    resolve();
-                    this.modal.showModal = false;
-                }));
+                postLocation(body)
+                    .then(
+                        location => new Promise(resolve => {
+                            console.log('postLocation', location);
+                            this.locations.push(location);
+                            this.$store.dispatch('updateLocation', location);
+                            resolve();
+                            this.modal.showModal = false;
+                        })
+                    ).catch(
+                        err => {
+                            this.errors.push(err.message);
+                        }
+                    );
             };
         },
         submitNewAddress(payload) {

From 93880f7010d8867ec93c33a2bb8e2352faccfdee Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 3 Nov 2021 14:55:33 +0100
Subject: [PATCH 9/9] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34047e541..56f225d1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 
-
+* [main]: filter location and locationType in backend: exclude NULL names, only active and availableToUsers
+* [activity]: perform client-side validation & show/hide fields in the "new location" modal
 
 ## Test releases