Mercurial > gemma
changeset 2068:5a898da60b87
dma added
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Wed, 30 Jan 2019 15:43:08 +0100 |
parents | 56deb027112a |
children | 5af57aa2b8fc c4db392130a4 |
files | client/src/components/importschedule/Importscheduledetail.vue client/src/components/importschedule/importtypes/Distancemarksashore.vue client/src/store/importschedule.js |
diffstat | 3 files changed, 109 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/importschedule/Importscheduledetail.vue Wed Jan 30 10:49:23 2019 +0100 +++ b/client/src/components/importschedule/Importscheduledetail.vue Wed Jan 30 15:43:08 2019 +0100 @@ -46,6 +46,9 @@ <option :value="$options.IMPORTTYPES.DISTANCEMARKSVIRTUAL" ><translate>Distance marks virtual</translate></option > + <option :value="$options.IMPORTTYPES.DISTANCEMARKSASHORE" + ><translate>Distance marks ashore</translate></option + > </select> </div> <div class="flex-column ml-4"> @@ -89,6 +92,15 @@ :username="username" :password="password" ></Distancemarksvirtual> + <Distancemarksashore + v-if="import_ == $options.IMPORTTYPES.DISTANCEMARKSASHORE" + @urlChanged="setUrl" + @featureTypeChanged="setFeatureType" + @sortByChanged="setSortBy" + :url="url" + :featureType="featureType" + :sortBy="sortBy" + ></Distancemarksashore> <Faiwaydimensions v-if="import_ == $options.IMPORTTYPES.FAIRWAYDIMENSION" @urlChanged="setUrl" @@ -396,6 +408,8 @@ import("@/components/importschedule/importtypes/Bottleneck"), Distancemarksvirtual: () => import("@/components/importschedule/importtypes/Distancemarksvirtual"), + Distancemarksashore: () => + import("@/components/importschedule/importtypes/Distancemarksashore"), Faiwaydimensions: () => import("@/components/importschedule/importtypes/Fairwaydimensions"), Gaugemeasurement: () => @@ -475,6 +489,7 @@ case this.$options.IMPORTTYPES.FAIRWAYDIMENSION: case this.$options.IMPORTTYPES.WATERWAYGAUGES: case this.$options.IMPORTTYPES.DISTANCEMARKSVIRTUAL: + case this.$options.IMPORTTYPES.DISTANCEMARKSASHORE: return true; default: return false; @@ -485,6 +500,7 @@ case this.$options.IMPORTTYPES.WATERWAYAXIS: case this.$options.IMPORTTYPES.WATERWAYAREA: case this.$options.IMPORTTYPES.FAIRWAYDIMENSION: + case this.$options.IMPORTTYPES.DISTANCEMARKSASHORE: return true; default: return false; @@ -495,6 +511,7 @@ case this.$options.IMPORTTYPES.WATERWAYAXIS: case this.$options.IMPORTTYPES.WATERWAYAREA: case this.$options.IMPORTTYPES.FAIRWAYDIMENSION: + case this.$options.IMPORTTYPES.DISTANCEMARKSASHORE: return true; default: return false;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Distancemarksashore.vue Wed Jan 30 15:43:08 2019 +0100 @@ -0,0 +1,86 @@ +<template> + <div> + <div class="d-flex flex-row"> + <div class="flex-column mt-3 mr-3 w-100"> + <div class="flex-row text-left"> + <small class="text-muted"> <translate>URL</translate> </small> + </div> + <div class="w-100"> + <input + @keyup="urlChanged" + class="form-control" + type="url" + :value="url" + /> + </div> + </div> + </div> + <div v-if="!url" class="d-flex flex-row"> + <small + ><translate class="text-danger">Please enter a URL</translate></small + > + </div> + <div class="d-flex flex-row"> + <div class="flex-column mt-3 mr-3 w-50"> + <div class="flex-row text-left"> + <small class="text-muted"> <translate>Featuretype</translate> </small> + </div> + <div class="w-100"> + <input + @keyup="featureTypeChanged" + class="form-control" + type="text" + :value="featureType" + /> + </div> + <div v-if="!featureType" class="d-flex flex-row"> + <small + ><translate class="text-danger" + >Please enter a Featuretype</translate + ></small + > + </div> + </div> + <div class="flex-column mt-3 w-50"> + <div class="flex-row text-left"> + <small class="text-muted"> <translate>SortBy</translate> </small> + </div> + <div class="w-100"> + <input + @keyup="sortByChanged" + class="form-control" + type="text" + :value="sortBy" + /> + </div> + <div v-if="!sortBy" class="d-flex flex-row"> + <small + ><translate class="text-danger" + >Please enter SortBy</translate + ></small + > + </div> + </div> + </div> + </div> +</template> + +<script> +export default { + name: "distancemarksashore", + props: ["url", "featureType", "sortBy"], + methods: { + urlChanged(e) { + this.$emit("urlChanged", e.target.value); + }, + featureTypeChanged(e) { + this.$emit("featureTypeChanged", e.target.value); + }, + sortByChanged(e) { + this.$emit("sortByChanged", e.target.value); + } + } +}; +</script> + +<style></style>
--- a/client/src/store/importschedule.js Wed Jan 30 10:49:23 2019 +0100 +++ b/client/src/store/importschedule.js Wed Jan 30 15:43:08 2019 +0100 @@ -26,7 +26,8 @@ WATERWAYAREA: "waterwayarea", FAIRWAYDIMENSION: "fairwaydimension", WATERWAYGAUGES: "waterwaygauges", - DISTANCEMARKSVIRTUAL: "distancemarksvirtual" + DISTANCEMARKSVIRTUAL: "distancemarksvirtual", + DISTANCEMARKSASHORE: "distancemarksashore" }; const KINDIMPORTTYPE = { @@ -37,7 +38,8 @@ wa: "waterwayarea", fd: "fairwaydimension", wg: "waterwaygauge", - dmv: "distancemarksvirtual" + dmv: "distancemarksvirtual", + dma: "distancemarksashore" }; const IMPORTTYPEKIND = { @@ -48,7 +50,8 @@ waterwayarea: "wa", fairwaydimension: "fd", waterwaygauges: "wg", - distancemarksvirtual: "dmv" + distancemarksvirtual: "dmv", + distancemarksashore: "dma" }; const initializeCurrentSchedule = () => {