+ composer updates

+ CreatingCorporation nur readonly
+  doctypes zusätzlich: 'mixedtype' => 'Mixed Type'
+ bei einer Fehlermeldung beim Submit: kein Reset mehr... nur mehr "retry: edit inputs"
+ Eingabe der Contributor gleich nach der Eingabe der Creator
+ Projekteingabe beim Submitten entfernt
+ Keyword wird nun mit einer default language angelegt
+ elevation und depth-Angaben in Meter (im Label)
+ 'server_date_modified' wird nun auch aktualisiert beim automatischen reject,
falls der Reviewer länger als 14 Tage den Datensatz nicht kontrolliert
+ GeoLocation hat nun eine Doppelbindung -> nicht mehr readonly
This commit is contained in:
Arno Kaimbacher 2019-06-21 16:00:51 +02:00
parent dabb905111
commit 0dc6ca034e
21 changed files with 1092 additions and 864 deletions

View file

@ -1,7 +1,66 @@
<template>
<div>
<div id="map">
<div style="position:relative">
<!-- <div id="inset">
xmin:
<input
type="text"
name="xmin"
id="xmin"
v-model="geolocation.xmin"
data-vv-scope="step-2"
v-validate="'decimal'"
>
<br>ymin:
<input
type="text"
name="ymin"
id="ymin"
v-model="geolocation.ymin"
data-vv-scope="step-2"
>
xmax:
<input
type="text"
name="xmax"
id="xmax"
v-model="geolocation.xmax"
data-vv-scope="step-2"
>
<br>ymax:
<input
type="text"
name="ymax"
id="ymax"
v-model="geolocation.ymax"
data-vv-scope="step-2"
>
<input type="button" v-on:click="zoomTo" value="zoomTo">
</div> -->
<div id="map"></div>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label for="xmin">xmin: </label>
<input name="xmin" type="text" class="pure-u-23-24" v-model="geolocation.xmin" data-vv-scope="step-2" id="xmin" v-validate="'decimal'">
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label for="ymin">ymin: </label>
<input name="ymin" type="text" class="pure-u-23-24" v-model="geolocation.ymin" data-vv-scope="step-2" id="ymin" v-validate="'decimal'">
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label for="xmax">xmax: </label>
<input name="xmax" type="text" class="pure-u-23-24" v-model="geolocation.xmax" data-vv-scope="step-2" id="xmax" v-validate="'decimal'">
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label for="ymax">ymax: </label>
<input name="ymax" type="text" class="pure-u-23-24" v-model="geolocation.ymax" data-vv-scope="step-2" id="ymax" v-validate="'decimal'">
</div>
<input type="button" v-on:click="zoomTo" value="validate coordinates">
</div>
</div>
</template>
@ -20,14 +79,50 @@ export default {
data() {
return {
map: [],
markers: null
drawnItems: null,
locationErrors: []
};
},
created() {
this.$validator.extend('boundingBox', {
getMessage: field => 'At least one ' + field + ' needs to be checked.',
validate: (value, [testProp]) => {
const options = this.dataset.checkedLicenses;
return value || options.some((option) => option[testProp]);
}
});
},
computed: {},
watch: {},
methods: {},
methods: {
zoomTo() {
var _this = this;
_this.locationErrors.length = 0;
this.drawnItems.clearLayers();
var xmin = document.getElementById("xmin").value;
var ymin = document.getElementById("ymin").value;
var xmax = document.getElementById("xmax").value;
var ymax = document.getElementById("ymax").value;
var bounds = [[ymin, xmin], [ymax, xmax]];
try {
var boundingBox = L.rectangle(bounds, { color: "#005F6A", weight: 1 });
// this.geolocation.xmin = xmin;
// this.geolocation.ymin = ymin;
// this.geolocation.xmax = xmax;
// this.geolocation.ymax = ymax;
_this.drawnItems.addLayer(boundingBox);
_this.map.fitBounds(bounds);
_this.$toast.success("valid bounding box");
} catch (e) {
// _this.errors.push(e);
_this.$toast.error(e);
}
}
},
mounted() {
const map = L.map("map");
this.map = map;
map.scrollWheelZoom.disable();
// Construct a bounding box for this map that the user cannot
var southWest = L.latLng(46.5, 9.9),
@ -57,7 +152,7 @@ export default {
// this.addPlaces(this.places)
// Initialise the FeatureGroup to store editable layers
var drawnItems = new L.FeatureGroup();
var drawnItems = (this.drawnItems = new L.FeatureGroup());
map.addLayer(drawnItems);
var drawPluginOptions = {
position: "topright",
@ -140,4 +235,14 @@ export default {
font-size: 13px;
text-shadow: 0 0 2px #fff;
}
#inset {
position: absolute;
bottom: 0;
left: 0;
border: none;
width: 120px;
z-index: 999;
// height: 120px;
}
</style>

View file

@ -32,10 +32,18 @@ import MyAutocomplete from './components/MyAutocomplete.vue';
import VeeValidate from 'vee-validate';
import dataset from './components/Dataset';
import LocationsMap from './components/LocationsMap.vue';
import modal from './components/ShowModal.vue'
import modal from './components/ShowModal.vue';
// import datetime from 'vuejs-datetimepicker';
// import { Validator } from 'vee-validate';
import VueToast from 'vue-toast-notification';
import 'vue-toast-notification/dist/index.css';
Vue.use(VueToast);
Vue.use(VeeValidate);
// Vue.use(VeeValidate);
Vue.use(VeeValidate, {
// validity: true
useConstraintAttrs: true
});
const STATUS_INITIAL = 0, STATUS_SAVING = 1, STATUS_SUCCESS = 2, STATUS_FAILED = 3;
const app = new Vue({
@ -370,7 +378,7 @@ const app = new Vue({
adds a new Keyword
*/
addKeyword() {
let newKeyword = { value: '', type: '' };
let newKeyword = { value: '', type: '', language: this.dataset.language };
//this.dataset.files.push(uploadedFiles[i]);
this.dataset.keywords.push(newKeyword);
},

View file

@ -0,0 +1,3 @@
import TinyDatePicker from 'tiny-date-picker';
TinyDatePicker(document.querySelector("input[name='time_absolut']"));