mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Squashed commit of the following:
commit 9e767fa3e0788d87437c235e51fcdc4f26f75d98 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Mon Jan 17 15:28:02 2022 +0100 traductions commit db6513474377b702cc2258be3e2ba720d007bc11 Author: nobohan <juminet@gmail.com> Date: Mon Jan 17 12:17:22 2022 +0100 add person: increase z-index of toast and wait for validation before closing modal commit 7af4c3434ef39b27eb51881611338b50a379acc8 Merge: a09c8ee8a 46c6d0e29 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Jan 16 22:51:45 2022 +0100 Merge remote-tracking branch 'origin/master' into issue357_front_end_validation commit a09c8ee8af962021b9d6a402863c8c5671c0e621 Author: nobohan <juminet@gmail.com> Date: Wed Jan 12 15:47:11 2022 +0100 upd CHANGELOG commit a312a9463d861659f70909bed7d8aa67fef444f2 Author: nobohan <juminet@gmail.com> Date: Wed Jan 12 15:29:32 2022 +0100 address: display error message if some fields are empty (street & streetnumber) commit 0035128138ddd3d877befae3e489329634555f79 Author: nobohan <juminet@gmail.com> Date: Wed Jan 12 14:47:43 2022 +0100 address: display error message if some fields are empty commit 49cb15467297bd24c5eb9a0dd7e366ccd7744679 Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 20:58:00 2022 +0100 address: add field validation (WIP) commit 1a7ec9e39631e00d59fcb3204a157e1583679cda Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 17:16:43 2022 +0100 Activity: fix vuejs warning commit fa0b9271c2b4963564fdc1e0eda09a12758caa4b Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 16:13:23 2022 +0100 location: treat 422 error when POSTing new location commit c7b9a1a3fe8891f80699faa2dd277064dce7b0b6 Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 16:00:29 2022 +0100 location: fix error when creating a new location: a new location could not be added to the availableLocations due to refactoring commit f1c61a2387df7507c79c55e7defe46fbb052df6c Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 15:20:33 2022 +0100 person: treat 422 error in AddPerson for thirdparty commit 8f6a70b240c286c18e1a102953f243e57b4af97a Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 11:30:05 2022 +0100 person: add validation for required fields in on-the-fly person commit 40e4bf953fa8e9a04a34e0330562bd25324c5589 Author: nobohan <juminet@gmail.com> Date: Tue Jan 11 09:34:15 2022 +0100 vuejs: better violations message in 422 error handling commit 378f3a16fc34228334cd44b9e7ca618bc7eb72aa Author: nobohan <juminet@gmail.com> Date: Mon Jan 10 18:11:02 2022 +0100 person: on-the-fly person: first implementation of makeFetch for posting person
This commit is contained in:
parent
5e3d421b56
commit
7e932e838f
@ -17,6 +17,8 @@ and this project adheres to
|
|||||||
* [main] Add mainLocation field to User entity and add it in user form type
|
* [main] Add mainLocation field to User entity and add it in user form type
|
||||||
* [course list in person context] show full username/label for ref
|
* [course list in person context] show full username/label for ref
|
||||||
* [accompanying period work] remove the possibility to generate document from an accompanying period work
|
* [accompanying period work] remove the possibility to generate document from an accompanying period work
|
||||||
|
* vuejs: add validation on required fields for AddPerson, Address and Location components
|
||||||
|
* vuejs: treat 422 validation errors in locations and AddPerson components
|
||||||
|
|
||||||
## Test releases
|
## Test releases
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ import Location from './components/Location.vue';
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "App",
|
name: "App",
|
||||||
props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
|
props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
|
||||||
components: {
|
components: {
|
||||||
ConcernedGroups,
|
ConcernedGroups,
|
||||||
SocialIssuesAcc,
|
SocialIssuesAcc,
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
v-model="location"
|
v-model="location"
|
||||||
>
|
>
|
||||||
</VueMultiselect>
|
</VueMultiselect>
|
||||||
<new-location v-bind:locations="locations"></new-location>
|
<new-location v-bind:availableLocations="availableLocations"></new-location>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</teleport>
|
</teleport>
|
||||||
|
@ -18,15 +18,6 @@
|
|||||||
</template>
|
</template>
|
||||||
<template v-slot:body>
|
<template v-slot:body>
|
||||||
<form>
|
<form>
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<p v-if="errors.length">
|
|
||||||
<b>{{ $t('activity.errors') }}</b>
|
|
||||||
<ul>
|
|
||||||
<li v-for="error in errors" :key="error">{{ error }}</li>
|
|
||||||
</ul>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-floating mb-3">
|
<div class="form-floating mb-3">
|
||||||
<select class="form-select form-select-lg" id="type" required v-model="selectType">
|
<select class="form-select form-select-lg" id="type" required v-model="selectType">
|
||||||
<option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
|
<option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
|
||||||
@ -62,6 +53,12 @@
|
|||||||
<input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
|
<input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
|
||||||
<label for="email">{{ $t('activity.location_fields.email') }}</label>
|
<label for="email">{{ $t('activity.location_fields.email') }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="alert alert-warning" v-if="errors.length">
|
||||||
|
<ul>
|
||||||
|
<li v-for="(e, i) in errors" :key="i">{{ e }}</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</template>
|
</template>
|
||||||
<template v-slot:footer>
|
<template v-slot:footer>
|
||||||
@ -81,7 +78,8 @@
|
|||||||
import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
|
import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
|
||||||
import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
|
import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
|
||||||
import { mapState } from "vuex";
|
import { mapState } from "vuex";
|
||||||
import { getLocationTypes, postLocation } from "../../api";
|
import { getLocationTypes } from "../../api";
|
||||||
|
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "NewLocation",
|
name: "NewLocation",
|
||||||
@ -89,7 +87,7 @@ export default {
|
|||||||
Modal,
|
Modal,
|
||||||
AddAddress,
|
AddAddress,
|
||||||
},
|
},
|
||||||
props: ['locations'],
|
props: ['availableLocations'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
errors: [],
|
errors: [],
|
||||||
@ -223,7 +221,6 @@ export default {
|
|||||||
},
|
},
|
||||||
saveNewLocation() {
|
saveNewLocation() {
|
||||||
if (this.checkForm()) {
|
if (this.checkForm()) {
|
||||||
console.log('saveNewLocation', this.selected);
|
|
||||||
let body = {
|
let body = {
|
||||||
type: 'location',
|
type: 'location',
|
||||||
name: this.selected.name,
|
name: this.selected.name,
|
||||||
@ -242,23 +239,28 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
postLocation(body)
|
|
||||||
.then(
|
makeFetch('POST', '/api/1.0/main/location.json', body)
|
||||||
location => new Promise(resolve => {
|
.then(response => {
|
||||||
this.locations.push(location);
|
this.$store.dispatch('addAvailableLocationGroup', {
|
||||||
this.$store.dispatch('updateLocation', location);
|
locationGroup: 'Localisations nouvellement créées',
|
||||||
resolve();
|
locations: [response]
|
||||||
this.modal.showModal = false;
|
});
|
||||||
})
|
this.$store.dispatch('updateLocation', response);
|
||||||
).catch(
|
this.modal.showModal = false;
|
||||||
err => {
|
})
|
||||||
this.errors.push(err.message);
|
.catch((error) => {
|
||||||
|
if (error.name === 'ValidationException') {
|
||||||
|
for (let v of error.violations) {
|
||||||
|
this.errors.push(v);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.errors.push('An error occurred');
|
||||||
}
|
}
|
||||||
);
|
})
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
submitNewAddress(payload) {
|
submitNewAddress(payload) {
|
||||||
console.log('submitNewAddress', payload);
|
|
||||||
this.selected.addressId = payload.addressId;
|
this.selected.addressId = payload.addressId;
|
||||||
this.addAddress.context.addressId = payload.addressId;
|
this.addAddress.context.addressId = payload.addressId;
|
||||||
this.addAddress.context.edit = true;
|
this.addAddress.context.edit = true;
|
||||||
|
@ -12,7 +12,11 @@ const hasLocation = document.querySelector('#location') !== null;
|
|||||||
const hasPerson = document.querySelector('#add-persons') !== null;
|
const hasPerson = document.querySelector('#add-persons') !== null;
|
||||||
|
|
||||||
const app = createApp({
|
const app = createApp({
|
||||||
template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
|
template: `<app
|
||||||
|
:hasSocialIssues="hasSocialIssues"
|
||||||
|
:hasLocation="hasLocation"
|
||||||
|
:hasPerson="hasPerson"
|
||||||
|
></app>`,
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
hasSocialIssues,
|
hasSocialIssues,
|
||||||
|
@ -240,6 +240,9 @@ const store = createStore({
|
|||||||
});
|
});
|
||||||
commit("updateActionsSelected", payload);
|
commit("updateActionsSelected", payload);
|
||||||
},
|
},
|
||||||
|
addAvailableLocationGroup({ commit }, payload) {
|
||||||
|
commit("addAvailableLocationGroup", payload);
|
||||||
|
},
|
||||||
addPersonsInvolved({ commit }, payload) {
|
addPersonsInvolved({ commit }, payload) {
|
||||||
//console.log('### action addPersonsInvolved', payload.result.type);
|
//console.log('### action addPersonsInvolved', payload.result.type);
|
||||||
switch (payload.result.type) {
|
switch (payload.result.type) {
|
||||||
|
@ -418,3 +418,8 @@ span.item-key {
|
|||||||
background-color: #0000000a;
|
background-color: #0000000a;
|
||||||
//text-decoration: dotted underline;
|
//text-decoration: dotted underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// increase toast message z-index (above all modals)
|
||||||
|
div.v-toast {
|
||||||
|
z-index: 10000!important;
|
||||||
|
}
|
@ -85,7 +85,9 @@ const fetchScopes = () => {
|
|||||||
const ValidationException = (response) => {
|
const ValidationException = (response) => {
|
||||||
const error = {};
|
const error = {};
|
||||||
error.name = 'ValidationException';
|
error.name = 'ValidationException';
|
||||||
error.violations = response.violations.map((violation) => `${violation.title}`);
|
error.violations = response.violations.map((violation) => `${violation.title}: ${violation.propertyPath}`);
|
||||||
|
error.titles = response.violations.map((violation) => violation.title);
|
||||||
|
error.propertyPaths = response.violations.map((violation) => violation.propertyPath);
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
@ -98,6 +98,8 @@
|
|||||||
v-bind:defaultz="this.defaultz"
|
v-bind:defaultz="this.defaultz"
|
||||||
v-bind:entity="this.entity"
|
v-bind:entity="this.entity"
|
||||||
v-bind:flag="this.flag"
|
v-bind:flag="this.flag"
|
||||||
|
v-bind:errors="this.errors"
|
||||||
|
v-bind:checkErrors="this.checkErrors"
|
||||||
@getCities="getCities"
|
@getCities="getCities"
|
||||||
@getReferenceAddresses="getReferenceAddresses">
|
@getReferenceAddresses="getReferenceAddresses">
|
||||||
</edit-pane>
|
</edit-pane>
|
||||||
@ -123,6 +125,8 @@
|
|||||||
v-bind:defaultz="this.defaultz"
|
v-bind:defaultz="this.defaultz"
|
||||||
v-bind:entity="this.entity"
|
v-bind:entity="this.entity"
|
||||||
v-bind:flag="this.flag"
|
v-bind:flag="this.flag"
|
||||||
|
v-bind:errors="this.errors"
|
||||||
|
v-bind:checkErrors="this.checkErrors"
|
||||||
v-bind:insideModal="false"
|
v-bind:insideModal="false"
|
||||||
@getCities="getCities"
|
@getCities="getCities"
|
||||||
@getReferenceAddresses="getReferenceAddresses">
|
@getReferenceAddresses="getReferenceAddresses">
|
||||||
@ -256,8 +260,10 @@ export default {
|
|||||||
editPane: false,
|
editPane: false,
|
||||||
datePane: false,
|
datePane: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
success: false
|
success: false,
|
||||||
|
dirty: false
|
||||||
},
|
},
|
||||||
|
errors: [],
|
||||||
defaultz: {
|
defaultz: {
|
||||||
button: {
|
button: {
|
||||||
text: { create: 'add_an_address_title', edit: 'edit_address' },
|
text: { create: 'add_an_address_title', edit: 'edit_address' },
|
||||||
@ -529,6 +535,23 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
checkErrors() {
|
||||||
|
this.errors = [];
|
||||||
|
if (this.flag.dirty) {
|
||||||
|
if (this.entity.selected.country === null) {
|
||||||
|
this.errors.push("Un pays doit être sélectionné.");
|
||||||
|
}
|
||||||
|
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) {
|
||||||
|
this.errors.push("Une adresse doit être sélectionnée.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make form ready for new changes
|
* Make form ready for new changes
|
||||||
*/
|
*/
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
@search-change="listenInputSearch"
|
@search-change="listenInputSearch"
|
||||||
ref="addressSelector"
|
ref="addressSelector"
|
||||||
@select="selectAddress"
|
@select="selectAddress"
|
||||||
|
@remove="remove"
|
||||||
name="field"
|
name="field"
|
||||||
track-by="id"
|
track-by="id"
|
||||||
label="value"
|
label="value"
|
||||||
@ -56,7 +57,7 @@ import { searchReferenceAddresses, fetchReferenceAddresses } from '../../api.js'
|
|||||||
export default {
|
export default {
|
||||||
name: 'AddressSelection',
|
name: 'AddressSelection',
|
||||||
components: { VueMultiselect },
|
components: { VueMultiselect },
|
||||||
props: ['entity', 'context', 'updateMapCenter'],
|
props: ['entity', 'context', 'updateMapCenter', 'flag', 'checkErrors'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
value: this.context.edit ? this.entity.address.addressReference : null,
|
value: this.context.edit ? this.entity.address.addressReference : null,
|
||||||
@ -109,6 +110,13 @@ export default {
|
|||||||
this.entity.selected.address.streetNumber = value.streetNumber;
|
this.entity.selected.address.streetNumber = value.streetNumber;
|
||||||
this.entity.selected.writeNew.address = false;
|
this.entity.selected.writeNew.address = false;
|
||||||
this.updateMapCenter(value.point);
|
this.updateMapCenter(value.point);
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.checkErrors();
|
||||||
|
},
|
||||||
|
remove() {
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.entity.selected.address = {};
|
||||||
|
this.checkErrors();
|
||||||
},
|
},
|
||||||
listenInputSearch(query) {
|
listenInputSearch(query) {
|
||||||
//console.log('listenInputSearch', query, this.isAddressSelectorOpen);
|
//console.log('listenInputSearch', query, this.isAddressSelectorOpen);
|
||||||
@ -149,6 +157,8 @@ export default {
|
|||||||
this.entity.selected.address.street = addr.street;
|
this.entity.selected.address.street = addr.street;
|
||||||
this.entity.selected.address.streetNumber = addr.number;
|
this.entity.selected.address.streetNumber = addr.number;
|
||||||
this.entity.selected.writeNew.address = true;
|
this.entity.selected.writeNew.address = true;
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.checkErrors();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
splitAddress(address) {
|
splitAddress(address) {
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
@search-change="listenInputSearch"
|
@search-change="listenInputSearch"
|
||||||
ref="citySelector"
|
ref="citySelector"
|
||||||
@select="selectCity"
|
@select="selectCity"
|
||||||
|
@remove="remove"
|
||||||
name="field"
|
name="field"
|
||||||
track-by="id"
|
track-by="id"
|
||||||
label="value"
|
label="value"
|
||||||
@ -55,12 +56,12 @@ import { searchCities, fetchCities } from '../../api.js';
|
|||||||
export default {
|
export default {
|
||||||
name: 'CitySelection',
|
name: 'CitySelection',
|
||||||
components: { VueMultiselect },
|
components: { VueMultiselect },
|
||||||
props: ['entity', 'context', 'focusOnAddress', 'updateMapCenter'],
|
props: ['entity', 'context', 'focusOnAddress', 'updateMapCenter', 'flag', 'checkErrors'],
|
||||||
emits: ['getReferenceAddresses'],
|
emits: ['getReferenceAddresses'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
value: this.context.edit ? this.entity.address.postcode : null,
|
value: this.context.edit ? this.entity.address.postcode : null,
|
||||||
isLoading: false
|
isLoading: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -123,6 +124,13 @@ export default {
|
|||||||
if (value.center) {
|
if (value.center) {
|
||||||
this.updateMapCenter(value.center);
|
this.updateMapCenter(value.center);
|
||||||
}
|
}
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.checkErrors();
|
||||||
|
},
|
||||||
|
remove() {
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.entity.selected.city = {};
|
||||||
|
this.checkErrors();
|
||||||
},
|
},
|
||||||
listenInputSearch(query) {
|
listenInputSearch(query) {
|
||||||
if (query.length > 2) {
|
if (query.length > 2) {
|
||||||
|
@ -12,7 +12,9 @@
|
|||||||
:select-label="$t('multiselect.select_label')"
|
:select-label="$t('multiselect.select_label')"
|
||||||
:deselect-label="$t('multiselect.deselect_label')"
|
:deselect-label="$t('multiselect.deselect_label')"
|
||||||
:selected-label="$t('multiselect.selected_label')"
|
:selected-label="$t('multiselect.selected_label')"
|
||||||
@select="selectCountry">
|
@select="selectCountry"
|
||||||
|
@remove="remove"
|
||||||
|
>
|
||||||
</VueMultiselect>
|
</VueMultiselect>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -23,7 +25,7 @@ import VueMultiselect from 'vue-multiselect';
|
|||||||
export default {
|
export default {
|
||||||
name: 'CountrySelection',
|
name: 'CountrySelection',
|
||||||
components: { VueMultiselect },
|
components: { VueMultiselect },
|
||||||
props: ['context', 'entity'],
|
props: ['context', 'entity', 'flag', 'checkErrors'],
|
||||||
emits: ['getCities'],
|
emits: ['getCities'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -34,14 +36,13 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
sortedCountries() {
|
sortedCountries() {
|
||||||
//console.log('sorted countries');
|
|
||||||
const countries = this.entity.loaded.countries;
|
const countries = this.entity.loaded.countries;
|
||||||
let sortedCountries = [];
|
let sortedCountries = [];
|
||||||
sortedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
|
sortedCountries.push(...countries.filter(c => c.countryCode === 'FR'))
|
||||||
sortedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
|
sortedCountries.push(...countries.filter(c => c.countryCode === 'BE'))
|
||||||
sortedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
|
sortedCountries.push(...countries.filter(c => c.countryCode !== 'FR').filter(c => c.countryCode !== 'BE'))
|
||||||
return sortedCountries;
|
return sortedCountries;
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.init();
|
this.init();
|
||||||
@ -50,6 +51,7 @@ export default {
|
|||||||
init() {
|
init() {
|
||||||
if (this.value !== undefined) {
|
if (this.value !== undefined) {
|
||||||
this.selectCountry(this.value);
|
this.selectCountry(this.value);
|
||||||
|
this.flag.dirty = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
selectCountryByCode(countryCode) {
|
selectCountryByCode(countryCode) {
|
||||||
@ -62,7 +64,13 @@ export default {
|
|||||||
//console.log('select country', value);
|
//console.log('select country', value);
|
||||||
this.entity.selected.country = value;
|
this.entity.selected.country = value;
|
||||||
this.$emit('getCities', value);
|
this.$emit('getCities', value);
|
||||||
}
|
this.checkErrors();
|
||||||
|
},
|
||||||
|
remove() {
|
||||||
|
this.flag.dirty = true;
|
||||||
|
this.entity.selected.country = null;
|
||||||
|
this.checkErrors();
|
||||||
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -7,6 +7,12 @@
|
|||||||
<span class="sr-only">Loading...</span>
|
<span class="sr-only">Loading...</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="errors.length" class="alert alert-warning" >
|
||||||
|
<ul>
|
||||||
|
<li v-for="(e, i) in errors" :key="i">{{ e }}</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h4 class="h3">{{ $t('select_an_address_title') }}</h4>
|
<h4 class="h3">{{ $t('select_an_address_title') }}</h4>
|
||||||
<div class="row my-3">
|
<div class="row my-3">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
@ -25,6 +31,8 @@
|
|||||||
<country-selection
|
<country-selection
|
||||||
v-bind:context="context"
|
v-bind:context="context"
|
||||||
v-bind:entity="entity"
|
v-bind:entity="entity"
|
||||||
|
v-bind:flag="flag"
|
||||||
|
v-bind:checkErrors="checkErrors"
|
||||||
@getCities="$emit('getCities', selected.country)">
|
@getCities="$emit('getCities', selected.country)">
|
||||||
</country-selection>
|
</country-selection>
|
||||||
|
|
||||||
@ -33,13 +41,17 @@
|
|||||||
v-bind:context="context"
|
v-bind:context="context"
|
||||||
v-bind:focusOnAddress="focusOnAddress"
|
v-bind:focusOnAddress="focusOnAddress"
|
||||||
v-bind:updateMapCenter="updateMapCenter"
|
v-bind:updateMapCenter="updateMapCenter"
|
||||||
|
v-bind:flag="flag"
|
||||||
|
v-bind:checkErrors="checkErrors"
|
||||||
@getReferenceAddresses="$emit('getReferenceAddresses', selected.city)">
|
@getReferenceAddresses="$emit('getReferenceAddresses', selected.city)">
|
||||||
</city-selection>
|
</city-selection>
|
||||||
|
|
||||||
<address-selection v-if="!isNoAddress"
|
<address-selection v-if="!isNoAddress"
|
||||||
v-bind:entity="entity"
|
v-bind:entity="entity"
|
||||||
v-bind:context="context"
|
v-bind:context="context"
|
||||||
v-bind:updateMapCenter="updateMapCenter">
|
v-bind:updateMapCenter="updateMapCenter"
|
||||||
|
v-bind:flag="flag"
|
||||||
|
v-bind:checkErrors="checkErrors">
|
||||||
</address-selection>
|
</address-selection>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -99,7 +111,9 @@ export default {
|
|||||||
'flag',
|
'flag',
|
||||||
'entity',
|
'entity',
|
||||||
'errorMsg',
|
'errorMsg',
|
||||||
'insideModal'
|
'insideModal',
|
||||||
|
'errors',
|
||||||
|
'checkErrors',
|
||||||
],
|
],
|
||||||
emits: ['getCities', 'getReferenceAddresses'],
|
emits: ['getCities', 'getReferenceAddresses'],
|
||||||
data() {
|
data() {
|
||||||
@ -128,7 +142,7 @@ export default {
|
|||||||
get() {
|
get() {
|
||||||
return this.entity.selected.isNoAddress;
|
return this.entity.selected.isNoAddress;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
focusOnAddress() {
|
focusOnAddress() {
|
||||||
|
@ -90,7 +90,7 @@ export default {
|
|||||||
OnTheFlyThirdparty,
|
OnTheFlyThirdparty,
|
||||||
OnTheFlyCreate
|
OnTheFlyCreate
|
||||||
},
|
},
|
||||||
props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'parent'],
|
props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'parent', 'canCloseModal'],
|
||||||
emits: ['saveFormOnTheFly'],
|
emits: ['saveFormOnTheFly'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -162,7 +162,20 @@ export default {
|
|||||||
return 'entity-' + this.type + ' badge-' + this.type;
|
return 'entity-' + this.type + ' badge-' + this.type;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
canCloseModal: {
|
||||||
|
handler: function(val, oldVal) {
|
||||||
|
if (val) {
|
||||||
|
this.closeModal();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
deep: true
|
||||||
|
}
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
closeModal() {
|
||||||
|
this.modal.showModal = false;
|
||||||
|
},
|
||||||
openModal() {
|
openModal() {
|
||||||
//console.log('## OPEN ON THE FLY MODAL');
|
//console.log('## OPEN ON THE FLY MODAL');
|
||||||
//console.log('## type:', this.type, ', action:', this.action);
|
//console.log('## type:', this.type, ', action:', this.action);
|
||||||
@ -200,8 +213,6 @@ export default {
|
|||||||
|
|
||||||
// pass datas to parent
|
// pass datas to parent
|
||||||
this.$emit('saveFormOnTheFly', { type: type, data: data });
|
this.$emit('saveFormOnTheFly', { type: type, data: data });
|
||||||
|
|
||||||
this.modal.showModal = false;
|
|
||||||
},
|
},
|
||||||
buildLocation(id, type) {
|
buildLocation(id, type) {
|
||||||
if (type === 'person') {
|
if (type === 'person') {
|
||||||
|
@ -151,7 +151,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
* @var DateTime
|
* @var DateTime
|
||||||
*
|
*
|
||||||
* @ORM\Column(type="date", nullable=true)
|
* @ORM\Column(type="date", nullable=true)
|
||||||
* @Assert\Date
|
|
||||||
* @Birthdate
|
* @Birthdate
|
||||||
*/
|
*/
|
||||||
private $birthdate;
|
private $birthdate;
|
||||||
@ -259,7 +258,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(type="string", length=255)
|
* @ORM\Column(type="string", length=255)
|
||||||
* @Assert\NotBlank
|
* @Assert\NotBlank(message="The firstname cannot be empty")
|
||||||
* @Assert\Length(
|
* @Assert\Length(
|
||||||
* max=255,
|
* max=255,
|
||||||
* )
|
* )
|
||||||
@ -282,7 +281,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(type="string", length=9, nullable=true)
|
* @ORM\Column(type="string", length=9, nullable=true)
|
||||||
* @Assert\NotNull
|
* @Assert\NotNull(message="The gender must be set")
|
||||||
*/
|
*/
|
||||||
private $gender;
|
private $gender;
|
||||||
|
|
||||||
@ -326,7 +325,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(type="string", length=255)
|
* @ORM\Column(type="string", length=255)
|
||||||
* @Assert\NotBlank
|
* @Assert\NotBlank(message="The lastname cannot be empty")
|
||||||
* @Assert\Length(
|
* @Assert\Length(
|
||||||
* max=255,
|
* max=255,
|
||||||
* )
|
* )
|
||||||
|
@ -66,9 +66,10 @@
|
|||||||
<div class="create-button">
|
<div class="create-button">
|
||||||
<on-the-fly
|
<on-the-fly
|
||||||
v-if="query.length >= 3"
|
v-if="query.length >= 3"
|
||||||
v-bind:buttonText="$t('onthefly.create.button', {q: query})"
|
:buttonText="$t('onthefly.create.button', {q: query})"
|
||||||
action="create"
|
action="create"
|
||||||
@saveFormOnTheFly="saveFormOnTheFly">
|
@saveFormOnTheFly="saveFormOnTheFly"
|
||||||
|
:canCloseModal="canCloseOnTheFlyModal">
|
||||||
</on-the-fly>
|
</on-the-fly>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -91,8 +92,7 @@ import Modal from 'ChillMainAssets/vuejs/_components/Modal';
|
|||||||
import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
|
import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
|
||||||
import PersonSuggestion from './AddPersons/PersonSuggestion';
|
import PersonSuggestion from './AddPersons/PersonSuggestion';
|
||||||
import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons';
|
import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons';
|
||||||
import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
|
import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
|
||||||
import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'AddPersons',
|
name: 'AddPersons',
|
||||||
@ -120,7 +120,8 @@ export default {
|
|||||||
suggested: [],
|
suggested: [],
|
||||||
selected: [],
|
selected: [],
|
||||||
priorSuggestion: {}
|
priorSuggestion: {}
|
||||||
}
|
},
|
||||||
|
canCloseOnTheFlyModal: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -267,22 +268,36 @@ export default {
|
|||||||
saveFormOnTheFly({ type, data }) {
|
saveFormOnTheFly({ type, data }) {
|
||||||
console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
|
console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
|
||||||
if (type === 'person') {
|
if (type === 'person') {
|
||||||
console.log('type person with', data);
|
makeFetch('POST', '/api/1.0/person/person.json', data)
|
||||||
postPerson(data)
|
.then(response => {
|
||||||
.then(person => new Promise((resolve, reject) => {
|
this.newPriorSuggestion(response);
|
||||||
console.log('onthefly create: post person', person);
|
this.canCloseOnTheFlyModal = true;
|
||||||
this.newPriorSuggestion(person);
|
})
|
||||||
resolve();
|
.catch((error) => {
|
||||||
}));
|
if (error.name === 'ValidationException') {
|
||||||
|
for (let v of error.violations) {
|
||||||
|
this.$toast.open({message: v });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.$toast.open({message: 'An error occurred'});
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
else if (type === 'thirdparty') {
|
else if (type === 'thirdparty') {
|
||||||
console.log('type thirdparty with', data);
|
makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)
|
||||||
postThirdparty(data)
|
.then(response => {
|
||||||
.then(thirdparty => new Promise((resolve, reject) => {
|
this.newPriorSuggestion(response);
|
||||||
console.log('onthefly create: post thirdparty', thirdparty);
|
this.canCloseOnTheFlyModal = true;
|
||||||
this.newPriorSuggestion(thirdparty);
|
})
|
||||||
resolve();
|
.catch((error) => {
|
||||||
}));
|
if (error.name === 'ValidationException') {
|
||||||
|
for (let v of error.violations) {
|
||||||
|
this.$toast.open({message: v });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.$toast.open({message: 'An error occurred'});
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -22,24 +22,45 @@
|
|||||||
<div v-else-if="action === 'edit' || action === 'create'">
|
<div v-else-if="action === 'edit' || action === 'create'">
|
||||||
|
|
||||||
<div class="form-floating mb-3">
|
<div class="form-floating mb-3">
|
||||||
<input class="form-control form-control-lg" id="lastname" v-model="lastName" v-bind:placeholder="$t('person.lastname')" />
|
<input
|
||||||
|
class="form-control form-control-lg"
|
||||||
|
id="lastname"
|
||||||
|
v-model="lastName"
|
||||||
|
:placeholder="$t('person.lastname')"
|
||||||
|
@change="checkErrors"
|
||||||
|
/>
|
||||||
<label for="lastname">{{ $t('person.lastname') }}</label>
|
<label for="lastname">{{ $t('person.lastname') }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-floating mb-3">
|
<div class="form-floating mb-3">
|
||||||
<input class="form-control form-control-lg" id="firstname" v-model="firstName" v-bind:placeholder="$t('person.firstname')" />
|
<input
|
||||||
|
class="form-control form-control-lg"
|
||||||
|
id="firstname"
|
||||||
|
v-model="firstName"
|
||||||
|
:placeholder="$t('person.firstname')"
|
||||||
|
@change="checkErrors"
|
||||||
|
/>
|
||||||
<label for="firstname">{{ $t('person.firstname') }}</label>
|
<label for="firstname">{{ $t('person.firstname') }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-for="(a) in config.altNames" :key="a.key" class="form-floating mb-3">
|
<div v-for="(a) in config.altNames" :key="a.key" class="form-floating mb-3">
|
||||||
<input class="form-control form-control-lg" :id="a.key" @input="onAltNameInput" />
|
<input
|
||||||
|
class="form-control form-control-lg"
|
||||||
|
:id="a.key"
|
||||||
|
@input="onAltNameInput"
|
||||||
|
/>
|
||||||
<label :for="a.key">{{ a.labels.fr }}</label>
|
<label :for="a.key">{{ a.labels.fr }}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- TODO fix placeholder if undefined
|
<!-- TODO fix placeholder if undefined
|
||||||
-->
|
-->
|
||||||
<div class="form-floating mb-3">
|
<div class="form-floating mb-3">
|
||||||
<select class="form-select form-select-lg" id="gender" v-model="gender">
|
<select
|
||||||
|
class="form-select form-select-lg"
|
||||||
|
id="gender"
|
||||||
|
v-model="gender"
|
||||||
|
@change="checkErrors"
|
||||||
|
>
|
||||||
<option selected disabled >{{ $t('person.gender.placeholder') }}</option>
|
<option selected disabled >{{ $t('person.gender.placeholder') }}</option>
|
||||||
<option value="woman">{{ $t('person.gender.woman') }}</option>
|
<option value="woman">{{ $t('person.gender.woman') }}</option>
|
||||||
<option value="man">{{ $t('person.gender.man') }}</option>
|
<option value="man">{{ $t('person.gender.man') }}</option>
|
||||||
@ -62,8 +83,8 @@
|
|||||||
<span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
|
<span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
|
||||||
<input class="form-control form-control-lg"
|
<input class="form-control form-control-lg"
|
||||||
v-model="phonenumber"
|
v-model="phonenumber"
|
||||||
v-bind:placeholder="$t('person.phonenumber')"
|
:placeholder="$t('person.phonenumber')"
|
||||||
v-bind:aria-label="$t('person.phonenumber')"
|
:aria-label="$t('person.phonenumber')"
|
||||||
aria-describedby="phonenumber" />
|
aria-describedby="phonenumber" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -71,8 +92,8 @@
|
|||||||
<span class="input-group-text" id="mobilenumber"><i class="fa fa-fw fa-mobile"></i></span>
|
<span class="input-group-text" id="mobilenumber"><i class="fa fa-fw fa-mobile"></i></span>
|
||||||
<input class="form-control form-control-lg"
|
<input class="form-control form-control-lg"
|
||||||
v-model="mobilenumber"
|
v-model="mobilenumber"
|
||||||
v-bind:placeholder="$t('person.mobilenumber')"
|
:placeholder="$t('person.mobilenumber')"
|
||||||
v-bind:aria-label="$t('person.mobilenumber')"
|
:aria-label="$t('person.mobilenumber')"
|
||||||
aria-describedby="mobilenumber" />
|
aria-describedby="mobilenumber" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -80,11 +101,17 @@
|
|||||||
<span class="input-group-text" id="email"><i class="fa fa-fw fa-at"></i></span>
|
<span class="input-group-text" id="email"><i class="fa fa-fw fa-at"></i></span>
|
||||||
<input class="form-control form-control-lg"
|
<input class="form-control form-control-lg"
|
||||||
v-model="email"
|
v-model="email"
|
||||||
v-bind:placeholder="$t('person.email')"
|
:placeholder="$t('person.email')"
|
||||||
v-bind:aria-label="$t('person.email')"
|
:aria-label="$t('person.email')"
|
||||||
aria-describedby="email" />
|
aria-describedby="email" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="alert alert-warning" v-if="errors.length">
|
||||||
|
<ul>
|
||||||
|
<li v-for="(e, i) in errors" :key="i">{{ e }}</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -108,6 +135,7 @@ export default {
|
|||||||
config: {
|
config: {
|
||||||
altNames: []
|
altNames: []
|
||||||
},
|
},
|
||||||
|
errors: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -183,6 +211,18 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
checkErrors(e) {
|
||||||
|
this.errors = [];
|
||||||
|
if (!this.person.lastName) {
|
||||||
|
this.errors.push("Le nom ne doit pas être vide.");
|
||||||
|
}
|
||||||
|
if (!this.person.firstName) {
|
||||||
|
this.errors.push("Le prénom ne doit pas être vide.");
|
||||||
|
}
|
||||||
|
if (!this.person.gender) {
|
||||||
|
this.errors.push("Le genre doit être renseigné");
|
||||||
|
}
|
||||||
|
},
|
||||||
loadData() {
|
loadData() {
|
||||||
getPerson(this.id)
|
getPerson(this.id)
|
||||||
.then(person => new Promise((resolve, reject) => {
|
.then(person => new Promise((resolve, reject) => {
|
||||||
|
@ -16,6 +16,9 @@ The birthdate must be before %date%: La date de naissance doit être avant le %d
|
|||||||
'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33623456789': 'Numéro de téléphone invalide: il doit commencer par le préfixe international précédé de "+", ne comporter que des chiffres et faire moins de 20 caractères. Ex: +33623456789'
|
'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33623456789': 'Numéro de téléphone invalide: il doit commencer par le préfixe international précédé de "+", ne comporter que des chiffres et faire moins de 20 caractères. Ex: +33623456789'
|
||||||
'The email is not valid': 'Le courriel n''est pas valide'
|
'The email is not valid': 'Le courriel n''est pas valide'
|
||||||
Two addresses has the same validFrom date: La date de validité est identique à celle d'une autre adresse
|
Two addresses has the same validFrom date: La date de validité est identique à celle d'une autre adresse
|
||||||
|
The firstname cannot be empty: Le prénom ne peut pas être vide
|
||||||
|
The lastname cannot be empty: Le nom de famille ne peut pas être vide
|
||||||
|
The gender must be set: Le genre doit être renseigné
|
||||||
|
|
||||||
#export list
|
#export list
|
||||||
You must select at least one element: Vous devez sélectionner au moins un élément
|
You must select at least one element: Vous devez sélectionner au moins un élément
|
||||||
|
Loading…
x
Reference in New Issue
Block a user