diff --git a/resources/js/components/Organizations/Single/AddressBlock.vue b/resources/js/components/Organizations/Single/AddressBlock.vue index 1a3aaa712c59f67bee6d2884f7fd8022faea71c5..1123b2d1d8b856a1660a06f850c5c53bb02a8ea1 100644 --- a/resources/js/components/Organizations/Single/AddressBlock.vue +++ b/resources/js/components/Organizations/Single/AddressBlock.vue @@ -54,7 +54,7 @@ <div v-if="$v.address.codeInsee.$error" class="text-danger">Champ obligatoire</div> </div> <div class="form-group"> - <PositionBlock :address="address" @addressError="addressError($event)" /> + <PositionBlock :address="address" @addressError="addressError($event)" @updateAddressLoc="updateAddressLoc" /> <div v-if="$v.address.lat.$error || $v.address.lng.$error" class="text-danger">Localisation obligatoire</div> </div> </div> @@ -92,19 +92,15 @@ export default { methods: { checkValidation() { this.$v.$touch() - if (this.$v.$invalid) { - return false - } else { - return true - } + return !this.$v.$invalid }, addressError (message) { - console.log('test error') this.$parent.toaster(this, message, 'bg-red') }, - updateAddressLoc (address) { - this.address.lat = address.lat - this.address.lng = address.lng + updateAddressLoc (address, lat, lng) { + console.log('updateAddressLoc', lat, lng) + this.address.lat = lat + this.address.lng = lng }, } } diff --git a/resources/js/components/Organizations/Single/PositionBlock.vue b/resources/js/components/Organizations/Single/PositionBlock.vue index 9b257f25a58fa5174193511c5bd0ba8f9ee82f4a..5e128e5c47ffe85f158edf2d17c6c788125e2d43 100644 --- a/resources/js/components/Organizations/Single/PositionBlock.vue +++ b/resources/js/components/Organizations/Single/PositionBlock.vue @@ -39,17 +39,16 @@ export default { }, setMarker (lat, lng) { this.marker = L.circleMarker([lat, lng], {draggable: true, radius: 7,fillColor:'red',fillOpacity:0.5,color: 'red'}) - this.address.lat = lat - this.address.lng = lat + + this.$emit('updateAddressLoc', this.address, lat, lng) this.marker.on({ mousedown: () => this.map.on('mousemove', (e) => { this.marker.setLatLng(e.latlng); this.map.dragging.disable() - this.address.lat = e.latlng.lat - this.address.lng = e.latlng.lng - this.$emit('updateAddressLoc', this.address) + // this.address.lat = e.latlng.lat + this.$emit('updateAddressLoc', this.address, e.latlng.lat, e.latlng.lng) }), mouseup: () => { this.map.dragging.enable()