- Define section and stretches + Define stretches

- ID - - - - Please enter an id - - -

- Function - - - - Please enter a function - - -

+ + + + + + + + + + + + + + + + + + + +

Name	Datum	Source organization
+ {{ + stretch.properties.name + }} +	+ {{ formatSurveyDate(stretch.properties["date_info"]) }} +	{{ stretch.properties["source_organization"] }}	+ +	+ +

+ No results.

- Start rhm -

+ ID - - + + + Please enter an id + + +

+ + Countrycode + + + + + Please enter a countrycode + + +

+ Start rhm +

+ + + + +

+ + + Please enter a start point +

- - - Please enter a start point - - +

+ End rhm +

+ + + + +

+ + + Please enter an end point + + +

- End rhm -

+ + Object name + - - + + + Please enter an objectname + + +

+ + National Object name + + + + + Please enter an objectname +

- - - Please enter an end point - - +

+ Date info + + + + Please enter a date + + +

+ Source + + + + Please enter a source + + +

- Object name - - - - Please enter an objectname - - -

- - National Object name - - - - - Please enter an objectname - - -

- Date info - - - - Please enter a date - - -

- Source - - - - Please enter a source - - -

- Countrycode - - - - Please enter a countrycode - - -

+ +

@@ -209,12 +247,15 @@ * Thomas Junk */ import { mapState, mapGetters } from "vuex"; -import { displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors.js"; +import { formatSurveyDate } from "@/lib/date.js"; +import center from "@turf/center"; export default { name: "importstretches", data() { return { + edit: false, id: "", funktion: "", startrhm: "", @@ -237,7 +278,74 @@ countryCodeError: false }; }, + mounted() { + this.edit = false; + this.loadStretches(); + }, methods: { + editStretch(index) { + const { date_info, name, objnam, nobjnam } = this.stretches[ + index + ].properties; + this.date_info = date_info; + this.id = name; + this.nobjbn = nobjnam; + this.objbn = objnam; + this.source = this.stretches[index]; + this.edit = true; + }, + deleteStretch(index) { + displayInfo({ + title: this.$gettext("Not implemented"), + message: this.$gettext("Deleting " + this.stretches[index].id) + }); + }, + moveMapToStretch(index) { + const { coordinates } = center(this.stretches[index]).geometry; + this.$store.commit("map/moveMap", { + coordinates: coordinates, + zoom: 17, + preventZoomOut: true + }); + }, + formatSurveyDate(d) { + return formatSurveyDate(d); + }, + loadStretches() { + this.$store.dispatch("imports/loadStretches").catch(error => { + const { status, data } = error.response; + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }); + }, + clean() { + this.id = ""; + this.funktion = ""; + this.startrhm = ""; + this.endrhm = ""; + this.objbn = ""; + this.nobjbn = ""; + this.countryCode = ""; + this.date_info = new Date().toISOString().split("T")[0]; + this.source = ""; + this.pipetteStart = false; + this.pipetteEnd = false; + this.idError = false; + this.funktionError = false; + this.startrhmError = false; + this.endrhmError = false; + this.objbnError = false; + this.nobjbnError = false; + this.date_infoError = false; + this.sourceError = false; + this.countryCodeError = false; + }, + startEdit() { + this.clean(); + this.edit = true; + }, togglePipette(t) { if (t === "start") { this.pipetteStart = !this.pipetteStart; @@ -254,7 +362,6 @@ "startrhm", "endrhm", "objbn", - "nobjbn", "date_info", "source" ]; @@ -266,12 +373,37 @@ } }); }, - submit() { + save() { this.validate(); - displayInfo({ - title: this.$gettext("Sections"), - message: this.$gettext("Not implemented!") - }); + const data = { + name: this.id, + from: this.startrhm, + to: this.endrhm, + "source-organization": this.source, + "date-info": this.date_info, + objnam: this.objbn, + nobjnam: this.nobjbn, + countries: this.countryCode.split(",") + }; + this.$store + .dispatch("imports/saveStretch", data) + .then(() => { + displayInfo({ + title: this.$gettext("Import"), + message: this.$gettext("Starting import of stretch") + }); + this.clean(); + this.edit = false; + this.loadStretches(); + }) + .catch(error => { + console.log(error); + const { status, data } = error.response; + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }); } }, watch: { @@ -293,7 +425,8 @@ }, computed: { ...mapState("map", ["identifiedFeatures", "currentMeasurement"]), - ...mapGetters("user", ["isSysAdmin"]) + ...mapGetters("user", ["isSysAdmin"]), + ...mapState("imports", ["stretches"]) } }; diff -r 99196fbc3897 -r 8e6f6c376b75 client/src/components/Maplayer.vue --- a/client/src/components/Maplayer.vue Fri Jan 18 06:51:49 2019 +0000 +++ b/client/src/components/Maplayer.vue Tue Jan 22 11:22:17 2019 +0100 @@ -14,25 +14,6 @@ .mapfull { height: 100vh; } - -// the following css part is for browser-printing based pdf generation -@page { - size: A4 landscape !important; - margin: 4mm !important; - // according to https://www.w3.org/TR/css-page-3/#page-size-prop - // we shall now have 210 - 2*4 = 202 mm width and 297 - 2*4 = 289 mm height -} - -@media print { - .mapfull { - width: 2000px; - height: 2828px; - } - .mapsplit { - width: 2000px; - height: 2828px; - } -}