# HG changeset patch # User Thomas Junk # Date 1548336279 -3600 # Node ID 352493221fa5526873b28b6bb5cacc2fe7b032f1 # Parent c420add2dec2eee86e2c4f631f81a509cd331638# Parent 59055c8301df0e382e89a86a0afd44bf2ee0e3f1 merge with default diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/Importscheduledetail.vue --- a/client/src/components/importschedule/Importscheduledetail.vue Thu Jan 24 12:56:31 2019 +0100 +++ b/client/src/components/importschedule/Importscheduledetail.vue Thu Jan 24 14:24:39 2019 +0100 @@ -69,252 +69,78 @@ -
-
-
-
- URL -
-
- -
-
-
-
- Insecure - -
-
- -
-
-
-
- Please enter a URL -
-
-
-
-
-
- - Username - -
-
- -
-
- Please enter a Username -
-
-
-
- - Password - -
-
- - - - -
-
- Please enter a Password -
-
-
-
-
-
-
-
- - Featuretype - -
-
- -
-
- Please enter a Featuretype -
-
-
-
- - SortBy - -
-
- -
-
- Please enter SortBy -
-
-
-
-
-
-
-
- LOS -
-
- -
-
- Please enter a level of service -
-
-
-
- - Depth - -
-
- -
cm
-
-
- Please enter a depth -
-
-
-
-
-
- - MinWidth - -
-
- -
 m
-
-
- Please enter a minimum width -
-
-
-
- - MaxWidth - -
-
- -
 m
-
-
- Please enter a maximum width -
-
-
-
-
-
- - Source orgranization - -
-
- -
-
- Please enter a source orgranization -
-
-
-
+ + + + + + + + + +
@@ -563,6 +389,24 @@ export default { name: "importscheduledetail", + components: { + Availablefairwaydepth: () => + import("@/components/importschedule/importtypes/Availablefairwaydepth"), + Bottleneck: () => + import("@/components/importschedule/importtypes/Bottleneck"), + Distancemarksvirtual: () => + import("@/components/importschedule/importtypes/Distancemarksvirtual"), + Faiwaydimensions: () => + import("@/components/importschedule/importtypes/Fairwaydimensions"), + Gaugemeasurement: () => + import("@/components/importschedule/importtypes/Gaugemeasurement"), + Waterwayarea: () => + import("@/components/importschedule/importtypes/Waterwayarea"), + Waterwaygauges: () => + import("@/components/importschedule/importtypes/Waterwaygauges"), + Waterwayaxis: () => + import("@/components/importschedule/importtypes/Waterwayaxis") + }, data() { return { passwordVisible: false, @@ -643,10 +487,6 @@ }, computed: { ...mapState("imports", ["importScheduleDetailVisible", "currentSchedule"]), - showPassword() { - if (this.passwordVisible) return "text"; - return "password"; - }, dialogLabel() { if (this.id) return this.$gettext("Import") + " " + this.id; return this.$gettext("New Import"); @@ -694,13 +534,39 @@ default: return false; } - }, - fixedSource() { - if (this.import_ === this.$options.IMPORTTYPES.BOTTLENECK) return true; - return false; } }, methods: { + setUrl(value) { + this.url = value; + }, + setFeatureType(value) { + this.featureType = value; + }, + setSortBy(value) { + this.sortBy = value; + }, + setUsername(value) { + this.username = value; + }, + setPassword(value) { + this.password = value; + }, + setLOS(value) { + this.LOS = value; + }, + setMinWidth(value) { + this.minWidth = value; + }, + setMaxWidth(value) { + this.maxWidth = value; + }, + setDepth(value) { + this.depth = value; + }, + setSourceOrganization(value) { + this.sourceOrganization = value; + }, calcCronString() { let getValue = value => { return this[value] ? this[value] : "*"; @@ -866,11 +732,11 @@ ) return; const values = { - los: this.LOS, - depth: this.depth + los: this.LOS * 1, + depth: this.depth * 1 }; - values["min-width"] = this.minWidth; - values["max-width"] = this.maxWidth; + values["min-width"] = this.minWidth * 1; + values["max-width"] = this.maxWidth * 1; values["source-organization"] = this.sourceOrganization; addAttribute(data, values); } diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Availablefairwaydepth.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Availablefairwaydepth.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,38 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Bottleneck.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Bottleneck.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,63 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Distancemarksvirtual.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Distancemarksvirtual.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,105 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Fairwaydimensions.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Fairwaydimensions.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,223 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Gaugemeasurement.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Gaugemeasurement.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,38 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Waterwayarea.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Waterwayarea.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,86 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Waterwayaxis.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Waterwayaxis.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,86 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/components/importschedule/importtypes/Waterwaygauges.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importschedule/importtypes/Waterwaygauges.vue Thu Jan 24 14:24:39 2019 +0100 @@ -0,0 +1,105 @@ + + + + + diff -r 59055c8301df -r 352493221fa5 client/src/store/imports.js --- a/client/src/store/imports.js Thu Jan 24 12:56:31 2019 +0100 +++ b/client/src/store/imports.js Thu Jan 24 14:24:39 2019 +0100 @@ -88,7 +88,7 @@ sortBy: null, username: "", password: "", - LOS: null, + LOS: 1, minWidth: null, maxWidth: null, depth: null,