Merge remote-tracking branch 'origin/master' into issue596_admin_user

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -51,9 +51,7 @@ function loadDynamicPicker(element) {
             },
             methods: {
                 addNewEntity(entity) {
-                    console.log('addNewEntity', entity);
                     if (this.multiple) {
-                        console.log('adding multiple');
                         if (!this.picked.some(el => {
                             return el.type === entity.type && el.id === entity.id;
                         })) {
@@ -71,7 +69,6 @@ function loadDynamicPicker(element) {
                     }
                 },
                 removeEntity(entity) {
-                    console.log('removeEntity', entity);
                     this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
                     input.value = JSON.stringify(this.picked);
                 },
@@ -86,7 +83,6 @@ function loadDynamicPicker(element) {
 
 
 document.addEventListener('show-hide-show', function(e) {
-    console.log('creation event caught')
     loadDynamicPicker(e.detail.container)
 })
 
@@ -94,17 +90,14 @@ document.addEventListener('show-hide-hide', function(e) {
     console.log('hiding event caught')
     e.detail.container.querySelectorAll('[data-module="pick-dynamic"]').forEach((el) => {
         let uniqId = el.dataset.uniqid;
-        console.log(uniqId);
         if (appsOnPage.has(uniqId)) {
             appsOnPage.get(uniqId).unmount();
-            console.log('App has been unmounted')
             appsOnPage.delete(uniqId);
         }
     })
 })
 
 document.addEventListener('DOMContentLoaded', function(e) {
-    console.log('loaded event', e)
     loadDynamicPicker(document)
 })
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue

@@ -1,7 +1,7 @@
 <template>
    <h4 class="h3">{{ $t('fill_an_address') }}</h4>
    <div class="row my-3">
-      <div class="col-lg-6">
+      <div class="col-lg-6" v-if="!isNoAddress">
          <div class="form-floating my-1">
             <input class="form-control"
             type="text"
@@ -35,8 +35,8 @@
             <label for="flat">{{ $t('flat') }}</label>
          </div>
       </div>
-      <div class="col-lg-6">
-         <div class="form-floating my-1">
+      <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="buildingName"
@@ -54,7 +54,7 @@
             v-model="extra"/>
             <label for="extra">{{ $t('extra') }}</label>
          </div>
-         <div class="form-floating my-1">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="distribution"
@@ -70,7 +70,7 @@
 <script>
 export default {
    name: "AddressMore",
-   props: ['entity'],
+   props: ['entity', 'isNoAddress'],
    computed: {
       floor: {
          set(value) {

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue

@@ -75,8 +75,9 @@
          </div>
       </div>
 
-      <address-more v-if="!isNoAddress"
-         v-bind:entity="entity">
+      <address-more
+         v-bind:entity="entity"
+         v-bind:isNoAddress="isNoAddress">
       </address-more>
 
       <action-buttons v-if="insideModal === false"

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -210,10 +210,10 @@ export default {
          let
             type = this.type,
             data = {} ;
-
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
+               console.log('person data are', data);
                break;
 
             case 'thirdparty':
@@ -238,7 +238,7 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.civility !== 'undefined' && null !== data.profession) {
+                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
                      // console.log('onthefly data', data);

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -66,9 +66,18 @@ export default {
         translatedListOfTypes() {
             let trans = [];
             this.types.forEach(t => {
-                trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+                if (this.$props.multiple) {
+                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+                } else {
+                    trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
+                }
             })
-            return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+
+            if (this.$props.multiple) {
+                return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+            } else {
+                return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
+            }
         }
     },
     methods: {
@@ -79,15 +88,10 @@ export default {
             );
             this.$refs.addPersons.resetSearch(); // to cast child method
             modal.showModal = false;
-            console.log(this.picked)
         },
         removeEntity(entity) {
-            console.log('remove entity', entity);
             this.$emit('removeEntity', entity);
         }
     },
-    mounted() {
-        console.log(this.picked);
-    }
 }
 </script>

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js

@@ -11,6 +11,10 @@ const appMessages = {
             user: 'Utilisateurs',
             person: 'Usagers',
             thirdparty: 'Tiers',
+            modal_title_one: 'Indiquer un ',
+            user_one: 'Utilisateur',
+            thirdparty_one: 'Tiers',
+            person_one: 'Usager',
         }
     }
 }