Merge branch 'issue422_and_others_on_AddPersons' into 'master'

addPersons improvements

See merge request Chill-Projet/chill-bundles!340

CHANGELOG.md

@@ -9,11 +9,16 @@ and this project adheres to
 * date versioning for test releases
 
 ## Unreleased
+
+<!-- write down unreleased development here -->
+* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
+* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
 * [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
 [activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
 [activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
-
-<!-- write down unreleased development here -->
 * [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
 
 ## Test releases

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -139,12 +139,10 @@ class Address
     private $point;
 
     /**
-     * @var PostalCode
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
      * @Groups({"write"})
      */
-    private $postcode;
+    private ?PostalCode $postcode;
 
     /**
      * @var string|null

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

@@ -260,8 +260,7 @@ export default {
             editPane: false,
             datePane: false,
             loading: false,
-            success: false,
+            success: false
-            dirty: false
          },
          errors: [],
          defaultz: {
@@ -537,17 +536,19 @@ export default {
 
       checkErrors() {
          this.errors = [];
-         if (this.flag.dirty) {
+         if (this.entity.selected.country === null) {
-            if (this.entity.selected.country === null) {
+            this.errors.push("Un pays doit être sélectionné.");
-               this.errors.push("Un pays doit être sélectionné.");
+         }
-            }
+         if (this.entity.selected.city === null) {
+            this.errors.push("Une ville doit être sélectionnée.");
+         } else {
             if (Object.keys(this.entity.selected.city).length === 0) {
                this.errors.push("Une ville doit être sélectionnée.");
             }
-            if (!this.entity.selected.isNoAddress) {
+         }
-               if (this.entity.selected.address.street === null || this.entity.selected.address.streetNumber === null) {
+         if (!this.entity.selected.isNoAddress) {
-                  this.errors.push("Une adresse doit être sélectionnée.");
+            if (this.entity.selected.address.street === null || this.entity.selected.address.street === '' || this.entity.selected.address.streetNumber === null || this.entity.selected.address.streetNumber === '') {
-               }
+               this.errors.push("Une adresse doit être sélectionnée.");
             }
          }
       },
@@ -567,7 +568,7 @@ export default {
 
          this.entity.selected.country = this.context.edit ? this.entity.address.country : {};
          this.entity.selected.postcode = this.context.edit ? this.entity.address.postcode : {};
-         this.entity.selected.city = {};
+         this.entity.selected.city = this.context.edit ? this.entity.address.postcode : {};
 
          this.entity.selected.address = {};
          this.entity.selected.address.street = this.context.edit ? this.entity.address.street: null;
@@ -583,6 +584,8 @@ export default {
          this.entity.selected.writeNew.address = this.context.edit && this.entity.address.addressReference === null && this.entity.address.street.length > 0
          this.entity.selected.writeNew.postcode = false // NB: this used to be this.context.edit, but think it was erroneous;
          console.log('!! just set writeNew.postcode to', this.entity.selected.writeNew.postcode);
+
+         this.checkErrors();
       },
 
       /*

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

@@ -111,11 +111,9 @@ export default {
          this.entity.selected.address.streetNumber = value.streetNumber;
          this.entity.selected.writeNew.address = false;
          this.updateMapCenter(value.point);
-         this.flag.dirty = true;
          this.checkErrors();
       },
       remove() {
-         this.flag.dirty = true;
          this.entity.selected.address = {};
          this.checkErrors();
       },
@@ -158,7 +156,6 @@ export default {
             this.entity.selected.address.street = addr.street;
             this.entity.selected.address.streetNumber = addr.number;
             this.entity.selected.writeNew.address = true;
-            this.flag.dirty = true;
             this.checkErrors();
          }
       },

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

@@ -125,11 +125,9 @@ export default {
          if (value.center) {
             this.updateMapCenter(value.center);
          }
-         this.flag.dirty = true;
          this.checkErrors();
       },
       remove() {
-         this.flag.dirty = true;
          this.entity.selected.city = {};
          this.checkErrors();
       },

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

@@ -51,7 +51,6 @@ export default {
       init() {
          if (this.value !== undefined) {
             this.selectCountry(this.value);
-            this.flag.dirty = false;
          }
       },
       selectCountryByCode(countryCode) {
@@ -67,7 +66,6 @@ export default {
          this.checkErrors();
       },
       remove() {
-         this.flag.dirty = true;
          this.entity.selected.country = null;
          this.checkErrors();
       },

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

@@ -157,6 +157,7 @@ export default {
          set(value) {
             console.log('isNoAddress value', value);
             this.entity.selected.isNoAddress = value;
+            this.checkErrors();
          },
          get() {
             return this.entity.selected.isNoAddress;

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

@@ -1,6 +1,6 @@
 <template>
    <ul class="nav nav-tabs">
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('person')" class="nav-item">
          <a class="nav-link" :class="{ active: isActive('person') }">
             <label for="person">
                <input type="radio" name="person" id="person" v-model="radioType" value="person">
@@ -8,7 +8,7 @@
             </label>
          </a>
       </li>
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
          <a class="nav-link" :class="{ active: isActive('thirdparty') }">
             <label for="thirdparty">
                <input type="radio" name="thirdparty" id="thirdparty" v-model="radioType" value="thirdparty">
@@ -21,14 +21,16 @@
    <div class="my-4">
       <on-the-fly-person
          v-if="type === 'person'"
-         v-bind:action="action"
+         :action="action"
+         :query="query"
          ref="castPerson"
       >
       </on-the-fly-person>
 
       <on-the-fly-thirdparty
          v-if="type === 'thirdparty'"
-         v-bind:action="action"
+         :action="action"
+         :query="query"
          ref="castThirdparty"
       >
       </on-the-fly-thirdparty>
@@ -38,18 +40,17 @@
 <script>
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
-import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 
 export default {
    name: "OnTheFlyCreate",
-   props: ['action'],
+   props: ['action', 'allowedTypes', 'query'],
    components: {
       OnTheFlyPerson,
       OnTheFlyThirdparty
    },
    data() {
       return {
-         type: 'person' //by default
+         type: null
       }
    },
    computed: {
@@ -61,7 +62,10 @@ export default {
          get() {
             return this.type;
          }
-      }
+      },
+   },
+   mounted() {
+      this.type = (this.allowedTypes.length === 1 && this.allowedTypes.includes('thirdparty')) ? 'thirdparty' : 'person'
    },
    methods: {
       isActive(tab) {
@@ -74,7 +78,7 @@ export default {
             case 'thirdparty':
                let data = this.$refs.castThirdparty.$data.thirdparty;
                data.name = data.text;
-               if (data.address !== undefined) {
+               if (data.address !== null) {
                    data.address = { id: data.address.address_id }
                } else {
                    data.address = null;

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

@@ -54,6 +54,8 @@
          <template v-slot:body v-else>
             <on-the-fly-create
                :action="action"
+               :allowedTypes="allowedTypes"
+               :query="query"
                ref="castNew">
             </on-the-fly-create>
          </template>
@@ -90,7 +92,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes', 'query'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -129,6 +131,13 @@ export default {
                return 'action.create';
          }
       },
+      titleCreate() {
+         return this.allowedTypes.every(t => t === 'person')
+            ? 'onthefly.create.title.person'
+            : this.allowedTypes.every(t => t === 'thirdparty')
+               ? 'onthefly.create.title.thirdparty'
+               : 'onthefly.create.title.default'
+      },
       titleModal() {
          switch (this.action) {
             case 'show':
@@ -136,7 +145,7 @@ export default {
             case 'edit':
                return 'onthefly.edit.' + this.type;
             case 'create':
-               return 'onthefly.create.title';
+               return this.titleCreate;
          }
       },
       titleMessage() {

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

@@ -9,11 +9,15 @@ const ontheflyMessages = {
             },
             edit: {
                 person: "Modifier un usager",
-                thirdparty: "Modifier un tiers"
+                thirdparty: "Modifier un tiers",
             },
             create: {
                 button: "Créer \"{q}\"",
-                title: "Création d'un nouvel usager ou d'un tiers professionnel",
+                title: {
+                    default: "Création d'un nouvel usager ou d'un tiers professionnel",
+                    person: "Création d'un nouvel usager",
+                    thirdparty: "Création d'un nouveau tiers professionnel",
+                },
                 person: "un nouvel usager",
                 thirdparty: "un nouveau tiers professionnel"
             },

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -165,13 +165,6 @@ paths:
                 200:
                     description: "OK"
     /1.0/main/address.json:
-        get:
-            tags:
-                - address
-            summary: Return a list of all Chill addresses
-            responses:
-                200:
-                    description: "ok"
         post:
             tags:
                 - address
@@ -222,10 +215,44 @@ paths:
                     description: "Unprocessable entity (validation errors)"
                 400:
                     description: "transition cannot be applyed"
+    /1.0/main/address/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return an address by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Address'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
         patch:
             tags:
                 - address
             summary: patch an address
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
             requestBody:
                 required: true
                 content:
@@ -277,31 +304,6 @@ paths:
                 400:
                     description: "transition cannot be applyed"
 
-    /1.0/main/address/{id}.json:
-        get:
-            tags:
-                - address
-            summary: Return an address by id
-            parameters:
-                -   name: id
-                    in: path
-                    required: true
-                    description: The address id
-                    schema:
-                        type: integer
-                        format: integer
-                        minimum: 1
-            responses:
-                200:
-                    description: "ok"
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/Address'
-                404:
-                    description: "not found"
-                401:
-                    description: "Unauthorized"
 
     /1.0/main/address/{id}/duplicate.json:
         post:

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue

@@ -20,7 +20,6 @@
             <div class="form-check" v-for="p in participationWithoutHousehold" :key="p.id">
                <input type="checkbox"
                   class="form-check-input"
-                  v-model="hasNoHousehold"
                   name="persons[]"
                   checked="checked"
                   :id="p.person.id"

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue

@@ -97,16 +97,10 @@ export default {
     ...mapGetters(['isJobValid', 'usersSuggestedFilteredByJob']),
     users: function () {
       let users = this.$store.getters.usersFilteredByJob;
-
-      console.log('users filtered by job', users);
-
       // ensure that the selected user is in the list. add it if necessary
       if (this.$store.state.accompanyingCourse.user !== null && users.find(u => this.$store.state.accompanyingCourse.user.id === u.id) === undefined) {
-        console.log('add user to users');
         users.push(this.$store.state.accompanyingCourse.user);
       }
-
-      console.log('users to return', users);
       return users;
     },
     valueJob: {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -6,7 +6,7 @@
    <div v-if="accompanyingCourse.requestor && isAnonymous" class="flex-table">
 
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
       <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
@@ -72,7 +72,7 @@
 
    <div v-else-if="accompanyingCourse.requestor && !isAnonymous" class="flex-table">
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
 
@@ -218,7 +218,7 @@ export default {
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
       },
-      isAnonymous: {
+      requestorIsAnonymous: {
          set(value) {
             this.$store.dispatch('requestorIsAnonymous', value);
          },
@@ -287,7 +287,9 @@ export default {
             body.name = payload.data.text;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
-            body.address = { id: payload.data.address.address_id };
+            if (payload.data.address) {
+                body.address = { id: payload.data.address.address_id };
+            }
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -428,42 +428,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                       throw error;
                    })
             },
-            /**
-             * On The Fly
-             */
-            patchOnTheFly({ commit }, payload) {
-               // TODO should be into the dedicated component, no ? JF
-               console.log('## action: patch OnTheFly', payload);
-               let body = { type: payload.type };
-               if (payload.type === 'person') {
-                  body.firstName = payload.data.firstName;
-                  body.lastName = payload.data.lastName;
-                  if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
-                  body.phonenumber = payload.data.phonenumber;
-                  body.mobilenumber = payload.data.mobilenumber;
-                  body.gender = payload.data.gender;
-                  console.log('id', payload.data.id, 'and body', body);
-                  patchPerson(payload.data.id, body)
-                      .then(person => new Promise((resolve, reject) => {
-                         console.log('patch person', person);
-                         commit('updatePerson', { target: payload.target, person: person });
-                         resolve();
-                      }));
-               }
-               else if (payload.type === 'thirdparty') {
-                  body.name = payload.data.text;
-                  body.email = payload.data.email;
-                  body.telephone = payload.data.phonenumber;
-                  body.address = { id: payload.data.address.address_id };
-                  console.log('id', payload.data.id, 'and body', body);
-                  patchThirdparty(payload.data.id, body)
-                      .then(thirdparty => new Promise((resolve, reject) => {
-                          console.log('patch thirdparty', thirdparty);
-                          commit('updateThirdparty', { target: payload.target, thirdparty: thirdparty });
-                          resolve();
-                  }));
-               }
-            },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -397,36 +397,6 @@ const store = createStore({
           commit('setErrors', error.violations);
         });
     },
-    patchOnTheFly({ commit }, payload) {
-      let body = { type: payload.type };
-      const id = payload.data.id;
-      let url = `/api/1.0/person/person/${id}.json`;
-      let mutation = "updatePerson";
-
-      if (payload.type === 'person') {
-          body.firstName = payload.data.firstName;
-          body.lastName = payload.data.lastName;
-          if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
-            body.phonenumber = payload.data.phonenumber;
-            body.mobilenumber = payload.data.mobilenumber;
-            body.gender = payload.data.gender;
-      } else if (payload.type === 'thirdparty') {
-          body.name = payload.data.text;
-          body.email = payload.data.email;
-          body.telephone = payload.data.phonenumber;
-          body.address = { id: payload.data.address.address_id };
-
-        url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-        mutation = 'updateThirdparty'
-      }
-      makeFetch('PATCH', url, body)
-        .then((response) => {
-            commit(mutation, {target: payload.target, thirdparty: response});
-        })
-        .catch((error) => {
-            throw error;
-        })
-  },
   }
 });
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue

@@ -62,8 +62,10 @@
 
                <div class="create-button">
                   <on-the-fly
-                     v-if="query.length >= 3"
+                     v-if="queryLength >= 3 && (options.type.includes('person') || options.type.includes('thirdparty'))"
                      :buttonText="$t('onthefly.create.button', {q: query})"
+                     :allowedTypes="options.type"
+                     :query="query"
                      action="create"
                      @saveFormOnTheFly="saveFormOnTheFly"
                      ref="onTheFly">

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -32,6 +32,14 @@
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
 
+   <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+         <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('lastName', qi)">
+            <span class="person-text">{{ qi }}</span>
+         </li>
+      </ul>
+   </div>
+
    <div class="form-floating mb-3">
       <input
           class="form-control form-control-lg"
@@ -43,6 +51,14 @@
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
 
+   <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+         <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('firstName', qi)">
+            <span class="person-text">{{ qi }}</span>
+         </li>
+      </ul>
+   </div>
+
    <div v-for="(a, i) in config.altNames" :key="a.key" class="form-floating mb-3">
       <input
           class="form-control form-control-lg"
@@ -122,7 +138,7 @@ import PersonRenderBox from '../Entity/PersonRenderBox.vue';
 
 export default {
    name: "OnTheFlyPerson",
-   props: ['id', 'type', 'action'],
+   props: ['id', 'type', 'action', 'query'],
    //emits: ['createAction'],
    components: {
       PersonRenderBox
@@ -203,6 +219,9 @@ export default {
       },
       personAltNamesLabels() {
          return this.person.altNames.map(a => a ? a.label : '');
+      },
+      queryItems() {
+         return this.query ? this.query.split(' ') : null;
       }
    },
    mounted() {
@@ -244,6 +263,16 @@ export default {
          )
          this.person.altNames = updateAltNames;
       },
+      addQueryItem(field, queryItem) {
+         switch (field) {
+            case 'lastName':
+               this.person.lastName = queryItem;
+               break;
+            case 'firstName':
+               this.person.firstName = queryItem;
+               break;
+         }
+      }
    }
 }
 </script>

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -179,6 +179,8 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
+     * @Assert\NotNull
+     * @Assert\NotBlank
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $name = '';

src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue

@@ -61,6 +61,13 @@
          <input class="form-control form-control-lg" id="name" v-model="thirdparty.text" v-bind:placeholder="$t('thirdparty.name')" />
          <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
+      <div v-if="query">
+         <ul class="list-suggest add-items inline">
+            <li @click="addQuery(query)">
+               <span class="person-text">{{ query }}</span>
+            </li>
+         </ul>
+      </div>
 
        <template
            v-if="thirdparty.kind !== 'child'">
@@ -85,7 +92,7 @@
       <div class="input-group mb-3">
          <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
          <input class="form-control form-control-lg"
-            v-model="thirdparty.phonenumber"
+            v-model="thirdparty.telephone"
             v-bind:placeholder="$t('thirdparty.phonenumber')"
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />
@@ -102,7 +109,7 @@ import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 export default {
    name: "OnTheFlyThirdParty",
-   props: ['id', 'type', 'action'],
+   props: ['id', 'type', 'action', 'query'],
    components: {
       ThirdPartyRenderBox,
       AddAddress,
@@ -113,6 +120,11 @@ export default {
          //context: {}, <--
          thirdparty: {
             type: 'thirdparty',
+            address: null,
+            kind: 'company',
+            name: '',
+            telephone: '',
+
          },
          addAddress: {
             options: {
@@ -186,6 +198,9 @@ export default {
               this.thirdparty.address = payload.address;  // <--
               console.log('switch address to edit mode', this.context);
           }
+      },
+      addQuery(query) {
+         this.thirdparty.text = query;
       }
    },
    mounted() {