diff --git a/CHANGELOG.md b/CHANGELOG.md index 949ce823e..e45c3ad51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ and this project adheres to * AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419) * [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) + * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue index fcb51a462..d9f821600 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue @@ -21,14 +21,16 @@
@@ -41,7 +43,7 @@ import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly export default { name: "OnTheFlyCreate", - props: ['action', 'allowedTypes'], + props: ['action', 'allowedTypes', 'query'], components: { OnTheFlyPerson, OnTheFlyThirdparty diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue index 72c51c6e9..b03b98b23 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue @@ -55,6 +55,7 @@ @@ -91,7 +92,7 @@ export default { OnTheFlyThirdparty, OnTheFlyCreate }, - props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes'], + props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes', 'query'], emits: ['saveFormOnTheFly'], data() { return { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index d978933b6..6d679ff7a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -65,6 +65,7 @@ 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"> 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 0e511ce5e..cfce4d88c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue @@ -32,6 +32,14 @@
+
+ +
+
{{ $t('person.firstname') }}
+
+ +
+
a ? a.label : ''); + }, + queryItems() { + return this.query.split(' '); } }, 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; + } + } } } diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue index 49249b8a1..34d5b4f2d 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue @@ -61,6 +61,13 @@
+
+ +