Mercurial > gemma
changeset 1880:2b4de58a9031 dev-pdf-generation
merging in from default
| author | Bernhard Reiter <bernhard@intevation.de> |
|---|---|
| date | Tue, 15 Jan 2019 17:44:20 +0100 |
| parents | 9a2fbeaabd52 (current diff) b16a6db0008f (diff) |
| children | f512cfb63e53 |
| files | client/package.json client/src/locale/bg_BG/LC_MESSAGES/app.po client/src/locale/de_AT/LC_MESSAGES/app.po client/src/locale/en_GB/LC_MESSAGES/app.po client/src/locale/hr_HR/LC_MESSAGES/app.po client/src/locale/hu_HU/LC_MESSAGES/app.po client/src/locale/ro_RO/LC_MESSAGES/app.po client/src/locale/sk_SK/LC_MESSAGES/app.po client/src/locale/translations.json client/yarn.lock |
| diffstat | 18 files changed, 783 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/client/package.json Tue Jan 15 10:07:10 2019 +0100 +++ b/client/package.json Tue Jan 15 17:44:20 2019 +0100 @@ -9,6 +9,7 @@ "private": true, "scripts": { "serve": "make translations && VUE_APP_HGREV=$(hg log -r . --template \"{data|shortdate}-{node|short}\") vue-cli-service serve", + "serve:notranslation": "VUE_APP_HGREV=$(hg log -r . --template \"{data|shortdate}-{node|short}\") vue-cli-service serve", "build": "make translations && VUE_APP_HGREV=$(hg log -r . --template \"{data|shortdate}-{node|short}\") vue-cli-service build", "analyze": "ANALYZE=true vue-cli-service serve", "lint": "vue-cli-service lint",
--- a/client/src/components/ImportApprovedGaugeMeasurement.vue Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/components/ImportApprovedGaugeMeasurement.vue Tue Jan 15 17:44:20 2019 +0100 @@ -9,24 +9,26 @@ icon="cloud-upload-alt" class="mr-2" ></font-awesome-icon> - <translate class="headline">Import approved gaugemeasurements</translate> + <translate class="headline" + >Import approved gaugemeasurements</translate + > </h6> <div class="card-body stretches-card"> <div class="w-95 ml-auto mr-auto mt-4 mb-4"> <div class="d-flex flex-row input-group mb-4"> <div class="flex-column w-100"> <div class="custom-file"> - <input - accept=".csv" - type="file" - @change="fileSelected" - class="custom-file-input" - id="uploadFile" - /> - <label class="custom-file-label" for="uploadFile"> - {{ uploadLabel }} - </label> - </div> + <input + accept=".csv" + type="file" + @change="fileSelected" + class="custom-file-input" + id="uploadFile" + /> + <label class="custom-file-label" for="uploadFile"> + {{ uploadLabel }} + </label> + </div> </div> </div> <div class="buttons text-right"> @@ -97,7 +99,9 @@ .then(() => { displayInfo({ title: this.$gettext("Import"), - message: this.$gettext("Starting import of Approved Gauge Measurements") + message: this.$gettext( + "Starting import of Approved Gauge Measurements" + ) }); this.initialState(); })
--- a/client/src/components/ImportStretches.vue Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/components/ImportStretches.vue Tue Jan 15 17:44:20 2019 +0100 @@ -1,9 +1,172 @@ <template> - <div> + <div class="d-flex flex-column mb-3"> <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> <font-awesome-icon icon="road" class="mr-2"></font-awesome-icon> <translate>Define section and stretches</translate> </h6> + <div class="ml-3 mr-3"> + <div class="d-flex flex-row justify-content-between"> + <div class="mt-1 w-50 mr-2 text-left"> + <small class="text-muted"> <translate>ID</translate> </small> + <input + id="id" + type="text" + class="form-control" + placeholder="AT_Section_12" + aria-label="id" + v-model="id" + /> + <span class="text-left text-danger"> + <small v-if="!id"> + <translate>Please enter an id</translate> + </small> + </span> + </div> + <div class="mt-1 w-50 ml-2 text-left"> + <small class="text-muted"><translate>Function</translate> </small> + <select v-model="funktion" class="custom-select"> + <option value="section"><translate>Section</translate></option> + <option value="stretch"><translate>Stretch</translate></option> + </select> + <span class="text-left text-danger"> + <small v-if="!funktion"> + <translate>Please enter a function</translate> + </small> + </span> + </div> + </div> + <div class="d-flex flex-column justify-content-between"> + <div class="mt-1 text-left"> + <small class="text-muted"> <translate>Start rhm</translate> </small> + <div class="d-flex flex-row"> + <input + id="startrhm" + type="text" + class="form-control" + placeholder="e.g. ATXXX00001000000019900" + aria-label="startrhm" + v-model="startrhm" + /> + <span class="input-group-text"> + <font-awesome-icon + @click="pipetteStart = !pipetteStart" + :class="{ 'text-info': pipetteStart }" + icon="bullseye" + ></font-awesome-icon> + </span> + </div> + <span class="text-left text-danger"> + <small v-if="!startrhm"> + <translate>Please enter a start point</translate> + </small> + </span> + </div> + <div class="mt-1 text-left"> + <small class="text-muted"> <translate>End rhm</translate> </small> + <div class="d-flex flex-row"> + <input + id="endrhm" + type="text" + class="form-control" + placeholder="e.g. ATXXX00001000000019900" + aria-label="endrhm" + v-model="endrhm" + /> + <span class="input-group-text"> + <font-awesome-icon + @click="pipetteEnd = !pipetteEnd" + :class="{ 'text-info': pipetteEnd }" + icon="bullseye" + ></font-awesome-icon> + </span> + </div> + <span class="text-left text-danger"> + <small v-if="!endrhm"> + <translate>Please enter an end point</translate> + </small> + </span> + </div> + </div> + <div class="d-flex flex-row justify-content-between"> + <div class="mt-1 mr-2 w-50 text-left"> + <small class="text-muted"> <translate>Object name</translate> </small> + <input + id="objbn" + type="text" + class="form-control" + placeholder="" + aria-label="objbn" + v-model="objbn" + /> + <span class="text-left text-danger"> + <small v-if="!objbn"> + <translate>Please enter an objectname</translate> + </small> + </span> + </div> + <div class="mt-1 ml-2 w-50 text-left"> + <small class="text-muted"> + <translate>National Object name</translate> + </small> + <input + id="nobjbn" + type="text" + class="form-control" + placeholder="" + aria-label="nobjbn" + v-model="nobjbn" + /> + <span class="text-left text-danger"> + <small v-if="!nobjbn"> + <translate>Please enter an objectname</translate> + </small> + </span> + </div> + </div> + <div class="d-flex flex-row justify-content-between"> + <div class="mt-1 mr-2 w-50 text-left"> + <small class="text-muted"> <translate>Date info</translate> </small> + <input + id="date_info" + type="date" + class="form-control" + placeholder="date_info" + aria-label="date_info" + v-model="date_info" + /> + <span class="text-left text-danger"> + <small v-if="!date_info"> + <translate>Please enter a date</translate> + </small> + </span> + </div> + <div class="mt-1 ml-2 w-50 text-left"> + <small class="text-muted"> <translate>Source</translate> </small> + <input + id="source" + type="text" + class="form-control" + placeholder="source" + aria-label="source" + v-model="source" + /> + <span class="text-left text-danger"> + <small v-if="!source"> + <translate>Please enter a source</translate> + </small> + </span> + </div> + </div> + </div> + <div class="text-right mr-3 mb-3"> + <button + @click="submit" + type="submit" + class="shadow-sm btn btn-info submit-button" + > + <translate>Submit</translate> + </button> + </div> </div> </template> @@ -21,13 +184,51 @@ * Author(s): * Thomas Junk <thomas.junk@intevation.de> */ +import { mapState } from "vuex"; +import { displayInfo } from "@/lib/errors.js"; export default { name: "importstretches", data() { - return {}; + return { + id: "", + funktion: "", + startrhm: "", + endrhm: "", + objbn: "", + nobjbn: "", + date_info: new Date().toISOString().split("T")[0], + source: "", + pipetteStart: false, + pipetteEnd: false + }; }, - methods: {} + methods: { + submit() { + displayInfo({ + title: this.$gettext("Sections"), + message: this.$gettext("Not implemented!") + }); + } + }, + watch: { + identifiedFeatures() { + const filterDistanceMarks = x => { + return /^distance_marks/.test(x["id_"]); + }; + const distanceMark = this.identifiedFeatures.filter(filterDistanceMarks); + if (distanceMark.length > 0) { + const value = distanceMark[0]["id_"] + .split(".")[1] + .replace(/,|\(|\)/g, ""); + this.startrhm = this.pipetteStart ? value : this.startrhm; + this.endrhm = this.pipetteEnd ? value : this.endrhm; + } + } + }, + computed: { + ...mapState("map", ["identifiedFeatures", "currentMeasurement"]) + } }; </script>
--- a/client/src/components/ImportWaterwayProfiles.vue Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/components/ImportWaterwayProfiles.vue Tue Jan 15 17:44:20 2019 +0100 @@ -16,17 +16,17 @@ <div class="d-flex flex-row input-group mb-4"> <div class="flex-column w-100"> <div class="custom-file"> - <input - accept=".zip" - type="file" - @change="fileSelected" - class="custom-file-input" - id="uploadFile" - /> - <label class="custom-file-label" for="uploadFile"> - {{ uploadLabel }} - </label> - </div> + <input + accept=".zip" + type="file" + @change="fileSelected" + class="custom-file-input" + id="uploadFile" + /> + <label class="custom-file-label" for="uploadFile"> + {{ uploadLabel }} + </label> + </div> </div> </div> <div class="buttons text-right">
--- a/client/src/locale/bg_BG/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/bg_BG/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gemmajs 1.99.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-12-05 12:23+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/de_AT/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/de_AT/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: wamosjs 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-12-11 17:08+0000\n" "Last-Translator: Sascha L. Teichmann <sascha.teichmann@intevation.de>\n" "Language-Team: Austrian German <https://hosted.weblate.org/projects/gemma/client/de_AT/>\n" @@ -61,7 +61,7 @@ msgstr "zurück zur Anmeldung" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -121,14 +121,13 @@ msgid "choose .zip- file" msgstr "Wählen Sie eine .zip Datei" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -#, fuzzy -msgid "Choose format:" +msgid "Chose format:" msgstr "Format wählen:" #: src/components/fairway/Profiles.vue:64 @@ -162,6 +161,11 @@ msgid "Date" msgstr "Datum" +#: src/components/ImportStretches.vue:92 +#, fuzzy +msgid "Date info" +msgstr "Datum" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -206,6 +210,10 @@ msgid "Email Notification" msgstr "E-Mail Benachrichtigung" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "Hinzugefügt" @@ -279,11 +287,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "Identifiziert" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -451,6 +463,10 @@ msgid "Name" msgstr "Name" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -477,6 +493,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -532,6 +552,7 @@ msgstr "Bitte wählen Sie eine Rolle aus" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "Bitte ein Datum eingeben" @@ -553,6 +574,16 @@ msgid "Please enter a reference" msgstr "Bitte ein Höhenreferenzsystem eingeben" +#: src/components/ImportStretches.vue:117 +#, fuzzy +msgid "Please enter a source" +msgstr "Bitte ein Datum eingeben" + +#: src/components/ImportStretches.vue:34 +#, fuzzy +msgid "Please enter a start point" +msgstr "Bitte ein Datum eingeben" + #: src/components/importschedule/Importscheduledetail.vue:106 #, fuzzy msgid "Please enter a URL" @@ -563,6 +594,21 @@ msgid "Please enter a Username" msgstr "Bitte ein Datum eingeben" +#: src/components/ImportStretches.vue:50 +#, fuzzy +msgid "Please enter an end point" +msgstr "Bitte ein Datum eingeben" + +#: src/components/ImportStretches.vue:18 +#, fuzzy +msgid "Please enter an id" +msgstr "Bitte ein Datum eingeben" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +#, fuzzy +msgid "Please enter an objectname" +msgstr "Bitte eine Projektion eingeben" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -685,6 +731,10 @@ msgid "Sounding Result" msgstr "Seichtstellenvermessung" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "Quelltext" @@ -701,11 +751,17 @@ msgid "Start" msgstr "Start" +#: src/components/ImportStretches.vue:23 +#, fuzzy +msgid "Start rhm" +msgstr "Start" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "Import gestartet " -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -757,7 +813,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 #, fuzzy @@ -858,10 +914,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "Sie können diese Koordinaten aus dem \"Gespeicherte Profile\"-Menü auswählen, um diesen Profilschnitt wieder herzustellen." -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "Länge" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr "Fläche"
--- a/client/src/locale/en_GB/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/en_GB/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: wamosjs 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-07-03 17:18+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/hr_HR/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/hr_HR/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gemmajs 1.99.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-12-05 12:23+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/hu_HU/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/hu_HU/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gemmajs 1.99.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-12-05 12:23+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/ro_RO/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/ro_RO/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gemmajs 1.99.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-12-05 12:23+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/sk_SK/LC_MESSAGES/app.po Tue Jan 15 10:07:10 2019 +0100 +++ b/client/src/locale/sk_SK/LC_MESSAGES/app.po Tue Jan 15 17:44:20 2019 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: wamosjs 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-15 10:04+0100\n" +"POT-Creation-Date: 2019-01-15 14:37+0100\n" "PO-Revision-Date: 2018-07-03 17:18+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" #: src/components/Bottlenecks.vue:274 -#: src/components/ImportApprovedGaugeMeasurement.vue:107 +#: src/components/ImportApprovedGaugeMeasurement.vue:111 #: src/components/ImportSoundingresults.vue:216 #: src/components/ImportSoundingresults.vue:255 #: src/components/ImportSoundingresults.vue:286 src/components/Search.vue:258 @@ -118,13 +118,13 @@ msgid "choose .zip- file" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:76 +#: src/components/ImportApprovedGaugeMeasurement.vue:78 #: src/components/ImportWaterwayProfiles.vue:75 msgid "choose file to upload" msgstr "" #: src/components/Pdftool.vue:18 -msgid "Choose format:" +msgid "Chose format:" msgstr "" #: src/components/fairway/Profiles.vue:64 @@ -158,6 +158,10 @@ msgid "Date" msgstr "" +#: src/components/ImportStretches.vue:92 +msgid "Date info" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:454 msgid "day" msgstr "" @@ -202,6 +206,10 @@ msgid "Email Notification" msgstr "" +#: src/components/ImportStretches.vue:39 +msgid "End rhm" +msgstr "" + #: src/components/importqueue/Importqueue.vue:55 msgid "Enqueued" msgstr "" @@ -274,11 +282,15 @@ msgid "Id" msgstr "" +#: src/components/ImportStretches.vue:8 +msgid "ID" +msgstr "" + #: src/components/Identify.vue:10 msgid "Identified" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:99 +#: src/components/ImportApprovedGaugeMeasurement.vue:101 #: src/components/ImportSoundingresults.vue:278 #: src/components/ImportWaterwayProfiles.vue:88 src/components/Sidebar.vue:56 #: src/components/importschedule/Importschedule.vue:33 @@ -444,6 +456,10 @@ msgid "Name" msgstr "" +#: src/components/ImportStretches.vue:74 +msgid "National Object name" +msgstr "" + #: src/components/importschedule/Importschedule.vue:93 #: src/components/importschedule/Importscheduledetail.vue:520 msgid "New Import" @@ -469,6 +485,10 @@ msgid "o' clock" msgstr "" +#: src/components/ImportStretches.vue:57 +msgid "Object name" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:478 msgid "October" msgstr "" @@ -524,6 +544,7 @@ msgstr "" #: src/components/ImportSoundingresults.vue:84 +#: src/components/ImportStretches.vue:102 msgid "Please enter a date" msgstr "" @@ -543,6 +564,14 @@ msgid "Please enter a reference" msgstr "" +#: src/components/ImportStretches.vue:117 +msgid "Please enter a source" +msgstr "" + +#: src/components/ImportStretches.vue:34 +msgid "Please enter a start point" +msgstr "" + #: src/components/importschedule/Importscheduledetail.vue:106 msgid "Please enter a URL" msgstr "" @@ -551,6 +580,18 @@ msgid "Please enter a Username" msgstr "" +#: src/components/ImportStretches.vue:50 +msgid "Please enter an end point" +msgstr "" + +#: src/components/ImportStretches.vue:18 +msgid "Please enter an id" +msgstr "" + +#: src/components/ImportStretches.vue:68 src/components/ImportStretches.vue:86 +msgid "Please enter an objectname" +msgstr "" + #: src/components/fairway/Profiles.vue:417 #: src/components/fairway/Profiles.vue:418 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" @@ -669,6 +710,10 @@ msgid "Sounding Result" msgstr "" +#: src/components/ImportStretches.vue:106 +msgid "Source" +msgstr "" + #: src/components/Identify.vue:57 msgid "source-code" msgstr "" @@ -685,11 +730,16 @@ msgid "Start" msgstr "" +#: src/components/ImportStretches.vue:23 +msgid "Start rhm" +msgstr "" + #: src/components/ImportSoundingresults.vue:279 msgid "Starting import for " msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:100 +#: src/components/ImportApprovedGaugeMeasurement.vue:102 +#: src/components/ImportApprovedGaugeMeasurement.vue:103 msgid "Starting import of Approved Gauge Measurements" msgstr "" @@ -740,7 +790,7 @@ msgid "Thursday" msgstr "" -#: src/components/ImportApprovedGaugeMeasurement.vue:43 +#: src/components/ImportApprovedGaugeMeasurement.vue:45 #: src/components/ImportWaterwayProfiles.vue:43 #: src/components/importschedule/Importscheduledetail.vue:407 msgid "Trigger import" @@ -836,10 +886,10 @@ msgid "You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile." msgstr "" -#: src/store/map.js:416 +#: src/store/map.js:415 msgid "Length" msgstr "" -#: src/store/map.js:437 +#: src/store/map.js:436 msgid "Area" msgstr ""
--- a/client/src/locale/translations.json Tue Jan 15 10:07:10 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{"bg_BG":{},"de_AT":{"Accepted":"Akzeptiert","Accesslog":"Zugriffs-Protokoll","Add User":"Benutzer hinzufügen","Author":"Autor","back to login":"zurück zur Anmeldung","Backend Error":"Server-Fehler","Bottleneck":"Seichtstelle","Bottleneck Areas fill-color":"Flächenfüllfarbe Seichtstelle","Bottleneck Areas stroke-color":"Flächenumrandungsfarbe Seichtstelle","Bottlenecks":"Seichtstellen","Cancel Upload":"Hochladen abbrechen","Chainage":"Stationierung","choose .zip- file":"Wählen Sie eine .zip Datei","Compare with":"Vergleiche mit","Configuration":"Konfiguration","Confirm":"Bestätigen","Coordinates copied to clipboard!":"Koordinaten auf die Zwischenablage kopiert!","Country":"Land","Date":"Datum","Depthreference":"Tiefenreferenz","Download":"Herunterladen","Download Meta.json":"Meta.json Herunterladen","Email":"E-Mail","Email address":"E-Mail Adresse","Email Notification":"E-Mail Benachrichtigung","Enqueued":"Hinzugefügt","Enter coordinates manually":"Manuelle Koordinateneingabe","Enter label for cross profile":"Namen für Profilschnitt eingeben","Enter passphrase":"Passphrase eingeben","Enter username":"Benutzername eingeben","Error while saving user":"Während des Speicherns der Nutzerdaten trat ein Fehler auf","Errorlog":"Fehlerprotokoll","Failed":"Fehlgeschlagen","Forgot password":"Passwort vergessen","Generate PDF":"PDF generieren","Identified":"Identifiziert","Import":"Daten-Import","Import soundingresults":"Seichtstellenmessungen importieren","Import Soundingresults":"Seichtstellenmessungen importieren","Imported":"Importiert","Importqueue":"Import-Warteschlange","Imports":"Daten-Import","invalid email":"Ungültige E-Mail","Invalid input":"Ungültige Eingabe","Kind":"Art","landscape":"Querformat","Last refresh:":"Letzter Abgleich:","Latest":"Neuste","Layers":"Ebenen","Login":"Login","Login failed":"Login fehlgeschlagen","Logout":"Abmelden","Logs":"Protokolle","Mail was sent":"E-Mail wurde gesendet","Map":"Karte","Measurement":"Messung","Name":"Name","New Import":"Neuer Import","No features identified.":"Keine Objekte identifiziert.","No results.":"Keine Ergebnisse.","Open in new window":"In neuem Fenster öffnen","password":"Passwort","Password":"Passwort","password again":"Noch einmal das Passwort","Password reset requested!":"Passwort Zurücksetzung angefragt!","Password should at least be 8 char long including 1 digit and 1 special char like $":"Das Passwort sollte mindestens 8 Zeichen lang sein, eine Zahlenziffer und ein Sonderzeichen wie etwa $ enthalten","Passwords do not match!":"Die Passwörter stimmen nicht überein!","Pending":"Ausstehend","Please choose a country":"Bitte wählen Sie ein Land aus","Please choose a role":"Bitte wählen Sie eine Rolle aus","Please enter a date":"Bitte ein Datum eingeben","Please enter a projection":"Bitte eine Projektion eingeben","Please enter a reference":"Bitte ein Höhenreferenzsystem eingeben","Please enter correct coordinates in the format: Lat,Lon,Lat,Lon":"Bitte geben Sie die Koordinaten in folgendem Format an: Lat,Lon,Lat,Lon","Please select a bottleneck":"Bitte eine Seichtstelle wählen","Please select one":"Bitte auswählen","portrait":"Hochformat","Profile deleted!":"Profil gelöscht!","Profile saved!":"Profil gespeichert!","Profiles":"Profile","Projection":"Projektion","Refresh":"Aktualisieren","Rejected":"Abgelehnt","Repeat Password":"Passwort erneut eingeben","Request password reset!":"Passwort-Zurücksetzung anfragen!","Role":"Rolle","Saved cross profiles":"Gespeicherte Profile","Schedule":"Zeitplan","Select Bottleneck":"Wähle Seichtstelle","Send":"Absenden","Send testmail":"Test-E-Mail versenden","Signer":"Überprüft durch","Sounding Result":"Seichtstellenvermessung","source-code":"Quelltext","Staging area":"Import-Überprüfung","Staging Area":"Import-Überprüfung","Start":"Start","Starting import for ":"Import gestartet ","State":"Zustand","Submit":"Abschicken","Success":"Erfolg","Successful":"Erfolgreich","Sysadmin":"Sys-Admin","Systemadministration":"System-Administration","Systemconfiguration":"System-Konfiguation","Type":"Typ","Upload":"Hochladen","User":"Benutzer","Username":"Benutzername","Users":"Benutzer","Waterway Admin":"Waterway-Admin","Waterway User":"Waterway-Benutzer","You can now select these coordinates from the \"Saved cross profiles\" menu to restore this cross profile.":"Sie können diese Koordinaten aus dem \"Gespeicherte Profile\"-Menü auswählen, um diesen Profilschnitt wieder herzustellen.","Length":"Länge","Area":"Fläche"},"en_GB":{},"hr_HR":{},"hu_HU":{},"ro_RO":{},"sk_SK":{}} \ No newline at end of file
--- a/client/yarn.lock Tue Jan 15 10:07:10 2019 +0100 +++ b/client/yarn.lock Tue Jan 15 17:44:20 2019 +0100 @@ -10885,10 +10885,10 @@ esquery "^1.0.0" lodash "^4.17.4" -vue-gettext@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/vue-gettext/-/vue-gettext-2.1.1.tgz#8431b57c27d0becff131de6a643ac4ea8ffcb52c" - integrity sha512-vbKhl7VGlVtTElNIdvpC4GKTRH1CwZmzhELcP6jS/UaFcF+yZvS5bIIAiPCQzMEU5dpAI0hIgJAxAKOMIg7UXw== +vue-gettext@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/vue-gettext/-/vue-gettext-2.1.2.tgz#b6b5160bed8ce61b6ead6adf5f4029ff04f57720" + integrity sha512-issGZfHvGntflaoLd+46Ru305lWOVEG/0vTI7uB5zvq/4JVGoF7J/+DUrcYswowiCKpJluYqf6inILat2HNeRQ== vue-highlightjs@^1.3.3: version "1.3.3"
--- a/pkg/controllers/manualimports.go Tue Jan 15 10:07:10 2019 +0100 +++ b/pkg/controllers/manualimports.go Tue Jan 15 17:44:20 2019 +0100 @@ -87,6 +87,21 @@ return wa, due, retries, wai.SendEmail } +func importWaterwayGauge(input interface{}) (interface{}, time.Time, int, bool) { + wgi := input.(*models.WaterwayGaugeImport) + username, _ := wgi.Attributes.Get("username") + password, _ := wgi.Attributes.Get("password") + insecure := wgi.Attributes.Bool("insecure") + wg := &imports.WaterwayGauge{ + URL: wgi.URL, + Username: username, + Password: password, + Insecure: insecure, + } + due, retries := retry(wgi.Attributes) + return wg, due, retries, wgi.SendEmail +} + func manualImport( kind imports.JobKind, setup func(interface{}) (interface{}, time.Time, int, bool),
--- a/pkg/controllers/routes.go Tue Jan 15 10:07:10 2019 +0100 +++ b/pkg/controllers/routes.go Tue Jan 15 17:44:20 2019 +0100 @@ -205,6 +205,12 @@ NoConn: true, })).Methods(http.MethodPost) + api.Handle("/imports/waterwaygauge", waterwayAdmin(&JSONHandler{ + Input: func() interface{} { return new(models.WaterwayGaugeImport) }, + Handle: manualImport(imports.WGJobKind, importWaterwayGauge), + NoConn: true, + })).Methods(http.MethodPost) + // Import scheduler configuration api.Handle("/imports/config/{id:[0-9]+}/run", waterwayAdmin(&JSONHandler{
--- a/pkg/imports/scheduled.go Tue Jan 15 10:07:10 2019 +0100 +++ b/pkg/imports/scheduled.go Tue Jan 15 17:44:20 2019 +0100 @@ -87,6 +87,19 @@ SortBy: sb, }, nil }, + + WGJobKind: func(cfg *IDConfig) (interface{}, error) { + log.Println("info: schedule 'wg' import") + username, _ := cfg.Attributes.Get("username") + password, _ := cfg.Attributes.Get("password") + insecure := cfg.Attributes.Bool("insecure") + return &WaterwayGauge{ + URL: *cfg.URL, + Username: username, + Password: password, + Insecure: insecure, + }, nil + }, } func init() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkg/imports/wg.go Tue Jan 15 17:44:20 2019 +0100 @@ -0,0 +1,81 @@ +// This is Free Software under GNU Affero General Public License v >= 3.0 +// without warranty, see README.md and license for details. +// +// SPDX-License-Identifier: AGPL-3.0-or-later +// License-Filename: LICENSES/AGPL-3.0.txt +// +// Copyright (C) 2018 by via donau +// – Österreichische Wasserstraßen-Gesellschaft mbH +// Software engineering by Intevation GmbH +// +// Author(s): +// * Sascha L. Teichmann <sascha.teichmann@intevation.de> + +package imports + +import ( + "context" + "database/sql" + "errors" + + "gemma.intevation.de/gemma/pkg/common" +) + +type WaterwayGauge struct { + // URL is the URL of the SOAP service. + URL string `json:"url"` + // Username is the username used to authenticate. + Username string `json:"username"` + // Passwort is the password to authenticate. + Password string `json:"password"` + // Insecure indicates if HTTPS traffic + // should validate certificates or not. + Insecure bool `json:"insecure"` +} + +const WGJobKind JobKind = "wg" + +type wgJobCreator struct{} + +func init() { + RegisterJobCreator(WGJobKind, wgJobCreator{}) +} + +func (wgJobCreator) Description() string { return "waterway gauges" } + +func (wgJobCreator) AutoAccept() bool { return false } + +func (wgJobCreator) Create(_ JobKind, data string) (Job, error) { + wg := new(WaterwayGauge) + if err := common.FromJSONString(data, wg); err != nil { + return nil, err + } + return wg, nil +} + +func (wgJobCreator) Depends() []string { + return []string{ + "gauges", + } +} + +func (wgJobCreator) StageDone( + ctx context.Context, + tx *sql.Tx, + id int64, +) error { + // TODO: Implement me! + return nil +} + +func (*WaterwayGauge) CleanUp() error { return nil } + +func (wg *WaterwayGauge) Do( + ctx context.Context, + importID int64, + conn *sql.Conn, + feedback Feedback, +) (interface{}, error) { + // TODO: Implement me! + return nil, errors.New("Not implemented, yet!") +}
--- a/pkg/models/waterway.go Tue Jan 15 10:07:10 2019 +0100 +++ b/pkg/models/waterway.go Tue Jan 15 17:44:20 2019 +0100 @@ -45,4 +45,15 @@ // Attributes are optional attributes. Attributes common.Attributes `json:"attributes,omitempty"` } + + // WaterwayAxisImport specifies an import of waterway gauges. + WaterwayGaugeImport struct { + // URL is the SOAP service URL. + URL string `json:"url"` + // SendEmail is set to true if an email should be send after + // importing the waterway gauges. + SendEmail bool `json:"send-email"` + // Attributes are optional attributes. + Attributes common.Attributes `json:"attributes,omitempty"` + } )