Mercurial > gemma
changeset 4621:d2eac69ba86b geoserver_sql_views
Merge default into geoserver_sql_views
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 04 Oct 2019 16:40:04 +0200 |
| parents | f77a6f9216ae (current diff) 7caf620dda50 (diff) |
| children | b03aa1502736 |
| files | 3rdpartylibs.sh package.json schema/gemma.sql schema/version.sql yarn.lock |
| diffstat | 68 files changed, 3806 insertions(+), 1959 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdpartylibs.sh Fri Sep 20 17:48:47 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -#!/bin/sh - -# pgx hase undergone some major incompatible changes in v4, -# we need to stick to v3 for now... -# Unfortunatly using gopkg.in does not work as expected here, so lets -# get hackisch... -go get -u -v gopkg.in/jackc/pgx.v3 -oldcwd="$CWD" -cd "$GOPATH"/src/github.com/jackc/pgx -git checkout v3.6.0 -cd "$oldcwd" -# MIT - -go get -u -v github.com/etcd-io/bbolt/... -# MIT - -go get -u -v github.com/mitchellh/go-homedir -# MIT - -go get -u -v github.com/spf13/cobra -# Apache-2.0 - -go get -u -v github.com/spf13/viper -# MIT - -go get -u -v github.com/gorilla/mux -# BSD-3-Clause - -go get -u -v gopkg.in/gomail.v2 -# MIT - -go get -u -v github.com/rs/cors -# MIT - -go get -u -v golang.org/x/net/html/charset -# Go License (aka BSD-3-Clause?) - -go get -u -v github.com/golang/snappy -# BSD-3-Clause - -go get -u -v github.com/jonas-p/go-shp -# MIT - -go get -u -v gopkg.in/robfig/cron.v1 -# MIT - -go get -u -v github.com/tidwall/rtree -# MIT - -go get -u -v golang.org/x/sync/semaphore -# Go License (aka BSD-3-Clause?) - -go get -u -v gonum.org/v1/gonum/stat -# BSD-3-Clause - -go get -u -v github.com/sergi/go-diff/diffmatchpatch -# MIT -# Only used in tests. - -# Only needed when generating SVG graphics for debugging. -# go get -u -v github.com/ajstarks/svgo -# Attribution 3.0 United States (CC BY 3.0 US) - -## list of additional licenses that get fetched and installed as dependencies -# github.com/fsnotify/fsnotify/ BSD-3-Clause -# github.com/hashicorp/hcl/ MPL-2.0 -# github.com/magiconair/properties/ BSD-2-Clause -# github.com/mitchellh/go-homedir/ MIT -# github.com/mitchellh/mapstructure MIT -# github.com/pelletier/go-toml/ MIT -# github.com/pkg/errors BSD-2-Clause -# github.com/spf13/afero/ Apache 2.0 -# github.com/spf13/cast MIT -# github.com/spf13/jwalterweatherman MIT -# gopkg.in/yaml.v2/#
--- a/Makefile Fri Sep 20 17:48:47 2019 +0200 +++ b/Makefile Fri Oct 04 16:40:04 2019 +0200 @@ -12,18 +12,14 @@ export BUILDBASE -3rdpartylibs-stamp := $(BUILDBASE)/3rdpartylibs-build - -.PHONY: all 3rdpartylibs gemma client clean +.PHONY: all gemma client clean all: gemma client $(ENVWARPPER): @echo "Preparing go build environment:" + mkdir -p "$(GOPATH)" mkdir -p "$(GOCACHE)" - mkdir -p "$(GOPATH)/src/gemma.intevation.de" - [ -e "$(GOPATH)/src/gemma.intevation.de/gemma" ] || \ - ln -s "$(basedir)" "$(GOPATH)/src/gemma.intevation.de/gemma" @echo "Creating wrapper script:" echo '#!/bin/sh' >"$(ENVWARPPER)" echo 'export GOPATH=$(GOPATH)' >>"$(ENVWARPPER)" @@ -31,14 +27,8 @@ echo 'exec "$$@"' >>"$(ENVWARPPER)" chmod +x "$(ENVWARPPER)" -$(3rdpartylibs-stamp): $(ENVWARPPER) 3rdpartylibs.sh - "$(ENVWARPPER)" bash ./3rdpartylibs.sh && \ - touch $@ - -3rdpartylibs: $(3rdpartylibs-stamp) - -gemma: $(3rdpartylibs-stamp) $(ENVWARPPER) - cd cmd/gemma && "$(ENVWARPPER)" go build +gemma: $(ENVWARPPER) + "$(ENVWARPPER)" go build -o ./cmd/gemma/gemma ./cmd/gemma client: $(MAKE) -f Makefile.build -C client @@ -50,9 +40,10 @@ v="gemma-$$(hg id -i)" ;\ tar --transform "s@^@$${v}/@" \ -cJf "../$${v}.tar.xz" \ - cmd/gemma/gemma schema web misc example_conf.toml + cmd/gemma/gemma schema style-templates web misc example_conf.toml clean: $(MAKE) -f Makefile.build -C client $@ rm -f "$(gemma-bin)" + chmod -R u+w "$(BUILDBASE)" # This is neccessary for deletion to work... rm -rf "$(BUILDBASE)"
--- a/README.md Fri Sep 20 17:48:47 2019 +0200 +++ b/README.md Fri Oct 04 16:40:04 2019 +0200 @@ -18,6 +18,9 @@ - To only build the SPA-Client in demo mode you can use `make clientdemo`. +Check [client/README](client/README.md) for details, especially +if you want to do a production setup. + For further details see [docs/DEVELOPMENT](docs/DEVELOPMENT.md). @@ -40,7 +43,8 @@ - You will need a PostgreSQL cluster with PostGIS. -- To install the **gemma** schema and roles use the script +- To install the **gemma** schema, roles and some default system configuration + use the script `./schema/install-db.sh`. - `./schema/install-db.sh --help` shows you available options. @@ -57,7 +61,7 @@ - Install and run GeoServer as described here: http://docs.geoserver.org/stable/en/user/installation/ -- Add tables you want to publish as OGC-Service Layers via GeoServer in +- Add addional tables you want to publish as OGC-Service Layers via GeoServer in the database. For example publish the bottleneck areas: ``` INSERT INTO sys_admin.published_services (name, as_wfs) VALUES @@ -92,6 +96,16 @@ ./cmd/gemma/gemma ``` +## Adding default style templates for geoserver + +- To add default style layers for geoserver run the script: + ``` + ./style-templates/upload-styles.sh + ``` + +- `./style-templates/upload-styles.sh --help` shows an overview of its options. + + ## Proxying OGC services through gemma - Add services you want to publish via gemma (e.g. for same-origin policy
--- a/client/README.md Fri Sep 20 17:48:47 2019 +0200 +++ b/client/README.md Fri Oct 04 16:40:04 2019 +0200 @@ -35,6 +35,11 @@ * Build `yarn build` builds the production ready assets to `web` folder. + This is what the `../Makefile` will call, which you should use anyway. + + For a real production use, edit the `title` tag in `public/index.html` + to something matching your installation. + * Build `yarn build-demo` sets the hg revision as a node env var and builds the production ready assets to `web` folder.
--- a/client/package.json Fri Sep 20 17:48:47 2019 +0200 +++ b/client/package.json Fri Oct 04 16:40:04 2019 +0200 @@ -40,11 +40,11 @@ "file-saver": "^2.0.2", "glob-all": "^3.1.0", "locale2": "^2.2.0", - "lodash.debounce": "^4.0.8", "ol": "^5.3.0", "path": "^0.12.7", "prettier": "^1.15.3", "purgecss-webpack-plugin": "^1.4.0", + "sanitize-filename": "^1.6.3", "svg2pdf.js": "https://github.com/Intevation/svg2pdf.js.git#production", "v-tooltip": "^2.0.0-rc.33", "vue": "^2.5.16",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/assets/gauge.svg Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="60" + viewBox="0 0 4.2333333 15.875" + version="1.1" + id="svg8" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="gauge.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="12.126881" + inkscape:cx="31.322772" + inkscape:cy="34.203936" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1680" + inkscape:window-height="989" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + scale-x="1"> + <sodipodi:guide + position="2.2908816,16.919787" + orientation="0,1" + id="guide872" + inkscape:locked="false" /> + <sodipodi:guide + position="2.4763339,13.439839" + orientation="0,1" + id="guide874" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-281.12499)"> + <path + style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#0000ff;stroke-width:0.55202734;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 0.77381186,282.13376 v 10.06185 H 3.4350038 v -10.06185 z m 0.2080221,10.36838 c -0.1256944,5.4e-4 -0.2099006,0.002 -0.2115864,0.005 -0.00674,0.0117 0.66754664,1.15609 0.67428964,1.16777 0.00674,0.0117 0.6608036,1.1681 0.6742897,1.1681 0.013486,0 0.6675465,-1.15642 0.6742896,-1.1681 0.00674,-0.0117 0.6810326,-1.15609 0.6742896,-1.16777 -0.00674,-0.0117 -1.3350932,0 -1.3485792,0 -0.010114,0 -0.7599098,-0.007 -1.13699294,-0.005 z" + id="rect10" + inkscape:connector-curvature="0" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.59327978;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect823" + width="1.8121783" + height="9.7080975" + x="1.1877859" + y="282.60016" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.18090582;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect825-3-6" + width="1.183345" + height="2.1888461" + x="2.1041241" + y="282.31506" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.19347596;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect825-3-6-7" + width="1.1970251" + height="2.1888461" + x="0.90709877" + y="284.50391" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.19347596;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect825-3-6-7-5" + width="1.1970251" + height="2.1888461" + x="2.1041238" + y="286.69275" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.19347596;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect825-3-6-7-5-3" + width="1.1970251" + height="2.1888461" + x="0.90709865" + y="288.88162" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.8310926;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect825-3-6-7-5-3-5" + width="1.1970251" + height="1.5253521" + x="2.1041238" + y="291.07047" /> + </g> +</svg>
--- a/client/src/components/Bottlenecks.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/Bottlenecks.vue Fri Oct 04 16:40:04 2019 +0200 @@ -162,6 +162,10 @@ preventZoomOut: true }); }); + this.$store.commit( + "bottlenecks/setBottleneckForPrint", + bottleneck.properties.name + ); }, loadSurveys(bottleneck) { if (bottleneck === this.openBottleneck) {
--- a/client/src/components/Pdftool.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/Pdftool.vue Fri Oct 04 16:40:04 2019 +0200 @@ -118,6 +118,8 @@ import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors"; import { pdfgen, templateLoader } from "@/lib/mixins"; +import sanitize from "sanitize-filename"; +import { containsCoordinate } from "ol/extent"; const paperSizes = { // in millimeter, landscape [width, height] @@ -152,13 +154,12 @@ { type: "scalebar", position: "bottomright", - offset: { x: 2, y: 2 } + offset: { x: 1, y: 1 } }, { type: "textbox", position: "bottomleft", - offset: { x: 2, y: 2 }, - width: 60, + offset: { x: 1, y: 1 }, fontSize: 8, text: this.$gettext("Generated by") + " " + "{user}, {date}" }, @@ -167,6 +168,16 @@ position: "topleft", offset: { x: 6, y: 4 }, size: 2 + }, + { + type: "bottleneck", + position: "topright", + offset: { x: 2, y: 2 } + }, + { + type: "legend", + position: "topright", + offset: { x: 2, y: 25 } } ] } @@ -186,31 +197,49 @@ }, computed: { ...mapState("application", ["showPdfTool", "logoForPDF"]), - ...mapState("bottlenecks", ["selectedBottleneck", "selectedSurvey"]), + ...mapState("bottlenecks", [ + "selectedBottleneck", + "selectedSurvey", + "bottleneckForPrint" + ]), ...mapState("map", ["isolinesLegendImgDataURL"]), ...mapGetters("map", ["openLayersMap"]), generatePdfLable() { return this.$gettext("Generate PDF"); }, filename() { - let date = new Date() - .toISOString() - .slice(0, 10) - .replace(/-/g, ""); let filename = "map"; - - if (this.selectedBottleneck) { - filename = this.selectedBottleneck; - if (this.selectedSurvey) { - filename += "-sr" + this.selectedSurvey.date_info.replace(/-/g, ""); + if (this.bottleneckForPrint) { + if (this.isBottleneckInView()) { + filename = `BN-${sanitize(this.bottleneckForPrint)}`; + if (this.selectedSurvey) { + filename += "-sr" + this.selectedSurvey.date_info.replace(/-/g, ""); + } } } - - filename = filename.toLowerCase() + "-exported" + date + ".pdf"; - return filename; + return `${filename}-${this.dateForPDF()}.pdf`; } }, methods: { + // Check if the view contains the selected bottleneck + // to avoid including bottleneck info in pdf in case view has changed to another location + isBottleneckInView() { + let map = this.openLayersMap(); + // Get extent of the viewport + let viewExtent = map.getView().calculateExtent(map.getSize()); + let btnExtent = map // Extent of the selected bottleneck + .getLayer("BOTTLENECKS") + .getSource() + .getFeatures() + .find(f => f.get("objnam") === this.bottleneckForPrint) + .getGeometry().extent_; + // Get center of bottleneck from extent + let centerCoordinat = [ + (btnExtent[0] + btnExtent[2]) / 2, + (btnExtent[1] + btnExtent[3]) / 2 + ]; + return containsCoordinate(viewExtent, centerCoordinat); + }, close() { this.$store.commit("application/showPdfTool", false); }, @@ -262,13 +291,6 @@ * */ this.readyToGenerate = false; - console.log( - "will generate pdf with", - this.form.paperSize, - this.form.format, - this.form.resolution - ); - if (this.form.format !== "portrait") { this.pdf.width = paperSizes[this.form.paperSize][0]; this.pdf.height = paperSizes[this.form.paperSize][1]; @@ -300,7 +322,6 @@ .getResolution() ) ); - console.log("scaleDenominator = ", scaleDenominator); var snapshot = canvas.toDataURL("image/jpeg"); this.pdf.doc.addImage( snapshot, @@ -422,7 +443,6 @@ } } }); - this.pdf.doc.save(this.filename); } map.setSize(this.mapSize); @@ -518,12 +538,10 @@ maxLength /= unitConversionFactor; - // DEBUG console.log(maxLength, unit); let unroundedLength = maxLength; let numberOfDigits = Math.floor(log10(unroundedLength)); let factor = Math.pow(10, numberOfDigits); let mapped = unroundedLength / factor; - // DEBUG console.log(mapped); var length = Math.floor(maxLength); // just to have an upper limit @@ -656,8 +674,9 @@ }, addLegend(position, offset, rounding, brcolor) { if ( - this.selectedBottleneck && + this.bottleneckForPrint && this.selectedSurvey && + this.isBottleneckInView() && this.openLayersMap() .getLayer("BOTTLENECKISOLINE") .getVisible() @@ -697,8 +716,9 @@ }, addBottleneckInfo(position, offset, rounding, color, brcolor) { if ( - this.selectedBottleneck && + this.bottleneckForPrint && this.selectedSurvey && + this.isBottleneckInView() && this.openLayersMap() .getLayer("BOTTLENECKISOLINE") .getVisible() @@ -766,39 +786,44 @@ // bottleneck this.pdf.doc.setFontStyle("italic"); - this.pdf.doc.text(x + padding, y + padding, str1_1, textOptions); + this.pdf.doc.text(x + padding, y + padding + 2, str1_1, textOptions); this.pdf.doc.setFontStyle("bold"); - this.pdf.doc.text(x + padding + w1_1, y + padding, str1_2, textOptions); + this.pdf.doc.text( + x + padding + w1_1, + y + padding + 2, + str1_2, + textOptions + ); // survey date this.pdf.doc.setFontStyle("italic"); - this.pdf.doc.text(x + padding, y + padding + 4, str2_1, textOptions); + this.pdf.doc.text(x + padding, y + padding + 6, str2_1, textOptions); this.pdf.doc.setFontStyle("normal"); this.pdf.doc.text( x + padding + w2_1, - y + padding + 4, + y + padding + 6, str2_2, textOptions ); // ref gauge this.pdf.doc.setFontStyle("italic"); - this.pdf.doc.text(x + padding, y + padding + 8, str3_1, textOptions); + this.pdf.doc.text(x + padding, y + padding + 10, str3_1, textOptions); this.pdf.doc.setFontStyle("normal"); this.pdf.doc.text( x + padding + w3_1, - y + padding + 8, + y + padding + 10, str3_2, textOptions ); // depth relative to this.pdf.doc.setFontStyle("italic"); - this.pdf.doc.text(x + padding, y + padding + 12, str4_1, textOptions); + this.pdf.doc.text(x + padding, y + padding + 14, str4_1, textOptions); this.pdf.doc.setFontStyle("normal"); this.pdf.doc.text( x + padding + w4_1, - y + padding + 12, + y + padding + 14, str4_2, textOptions );
--- a/client/src/components/Popup.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/Popup.vue Fri Oct 04 16:40:04 2019 +0200 @@ -14,6 +14,23 @@ :class="{ 'p-3': popup.padding !== false }" v-html="popup.content" ></div> + <div + v-if="popup.dateSelection" + class="dateselection d-flex flex-column mx-2" + > + <div class="d-flex flex-column text-left"> + <small class="my-auto text-muted"> + <translate>From</translate> + </small> + <input type="date" v-model="from" /> + </div> + <div class="text-left d-flex flex-column"> + <small class="my-auto text-muted"> + <translate>To</translate> + </small> + <input type="date" v-model="to" /> + </div> + </div> <div class="popup-footer" v-if="popup.cancel || popup.confirm"> <button class="btn btn-sm btn-warning" @@ -49,6 +66,8 @@ </template> <style lang="sass" scoped> +.dateselection + width: 250px .overlay position: fixed z-index: 9 @@ -111,16 +130,30 @@ */ import { mapState } from "vuex"; +import { format, subMonths } from "date-fns"; + +const isoFormat = date => { + return format(date, "YYYY-MM-DD"); +}; export default { name: "popup", + data() { + return { + from: isoFormat(subMonths(new Date(), 1)), + to: isoFormat(new Date()) + }; + }, computed: { ...mapState("application", ["popup"]) }, methods: { confirm() { if (this.popup.confirm && this.popup.confirm.callback) - this.popup.confirm.callback(); + this.popup.confirm.callback({ + from: this.from, + to: this.to + }); this.close(); }, cancel() {
--- a/client/src/components/Search.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/Search.vue Fri Oct 04 16:40:04 2019 +0200 @@ -166,7 +166,7 @@ * Author(s): * Markus Kottländer <markus.kottlaender@intevation.de> */ -import debounce from "lodash.debounce"; +import debounce from "debounce"; import { mapState, mapGetters } from "vuex"; import { displayError } from "@/lib/errors";
--- a/client/src/components/fairway/AvailableFairwayDepthDialogue.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/fairway/AvailableFairwayDepthDialogue.vue Fri Oct 04 16:40:04 2019 +0200 @@ -56,57 +56,59 @@ </label> </div> </div> - <select - v-if="type === $options.BOTTLENECK" - @change="entrySelected" - class="form-control font-weight-bold" - v-model="selectedEntry" - > - <option :value="null">{{ placeholder }}</option> - <optgroup - v-for="(bottlenecksForCountry, cc) in orderedBottlenecks" - :key="cc" - :label="cc" + <div class="d-flex"> + <select + v-if="type === $options.BOTTLENECK" + class="form-control font-weight-bold" + v-model="selectedEntry" > + <option :value="null">{{ placeholder }}</option> + <optgroup + v-for="(bottlenecksForCountry, cc) in orderedBottlenecks" + :key="cc" + :label="cc" + > + <option + v-for="bn in bottlenecksForCountry" + :key="bn.properties.id" + :value="bn" + > + {{ bn.properties.name }} + </option> + </optgroup> + </select> + <select + v-else-if="type === $options.STRETCH" + class="form-control font-weight-bold" + v-model="selectedEntry" + > + <option :value="null">{{ placeholder }}</option> <option - v-for="bn in bottlenecksForCountry" - :key="bn.properties.id" - :value="bn" + v-for="stretch in stretches" + :value="stretch" + :key="stretch.id" > - {{ bn.properties.name }} + {{ stretch.properties.name }} </option> - </optgroup> - </select> - <select - v-else-if="type === $options.STRETCH" - @change="entrySelected" - class="form-control font-weight-bold" - v-model="selectedEntry" - > - <option :value="null">{{ placeholder }}</option> - <option - v-for="stretch in stretches" - :value="stretch" - :key="stretch.id" + </select> + <select + v-else-if="type === $options.SECTION" + class="form-control font-weight-bold" + v-model="selectedEntry" > - {{ stretch.properties.name }} - </option> - </select> - <select - v-else-if="type === $options.SECTION" - @change="entrySelected" - class="form-control font-weight-bold" - v-model="selectedEntry" - > - <option :value="null">{{ placeholder }}</option> - <option - v-for="section in sections" - :value="section" - :key="section.id" - > - {{ section.properties.name }} - </option> - </select> + <option :value="null">{{ placeholder }}</option> + <option + v-for="section in sections" + :value="section" + :key="section.id" + > + {{ section.properties.name }} + </option> + </select> + <button @click="takeMeThere" class="btn btn-sm btn-info"> + <font-awesome-icon icon="crosshairs" /> + </button> + </div> <div class="d-flex mt-2"> <div class="d-flex flex-column w-50 mr-1"> <small class="my-auto text-muted"> @@ -135,30 +137,117 @@ </div> </div> <div class="d-flex mt-2"> - <div class="d-flex flex-column w-50 mr-1"> + <div + :key="new Date().getTime()" + v-if="selectedFrequency === $options.FREQUENCIES.monthly" + class="d-flex flex-column w-50 mr-1" + > <small for="from" class="my-auto text-muted"> - <translate>Date from</translate> + <translate>Starting Month</translate> </small> - <input - id="from" - v-model="fromDate" - class="form-control form-control-sm" - type="date" - /> + <select v-model="startMonth" class="form-control form-control-sm"> + <option + v-for="month in Object.keys($options.MONTHS)" + :key="'start' + month" + :value="month" + >{{ $options.MONTHS[month] }}</option + > + </select> </div> - <div class="d-flex flex-column w-50 ml-1"> - <small for="to" class="my-auto text-muted"> - <translate>Date to</translate> + <div + :key="new Date().getTime()" + v-if="selectedFrequency === $options.FREQUENCIES.quarterly" + class="d-flex flex-column w-50 mr-1" + > + <small for="from" class="my-auto text-muted"> + <translate>Starting Quarter</translate> </small> - <input - id="to" - v-model="toDate" - class="form-control form-control-sm" - type="date" - /> + <select v-model="startQuarter" class="form-control form-control-sm"> + <option + v-for="month in [1, 2, 3, 4]" + :key="'qstart' + month" + :value="month" + >Q{{ month }}</option + > + </select> + </div> + <div + :class="[ + 'd-flex', + 'flex-column', + 'w-50', + { 'ml-1': selectedFrequency !== $options.FREQUENCIES.yearly } + ]" + > + <small for="from" class="my-auto text-muted"> + <translate>Starting Year</translate> + </small> + <select v-model="startYear" class="form-control form-control-sm"> + <option + v-for="year in $options.YEARS" + :key="'start' + year" + :value="year" + >{{ year }}</option + > + </select> </div> </div> - + <div class="d-flex mt-2"> + <div + :key="new Date().getTime()" + class="d-flex flex-column w-50 mr-1" + v-if="selectedFrequency === $options.FREQUENCIES.monthly" + > + <small for="to" class="my-auto text-muted"> + <translate>Ending Month</translate> + </small> + <select v-model="endMonth" class="form-control form-control-sm"> + <option + v-for="month in Object.keys($options.MONTHS)" + :key="'end' + month" + :value="month" + >{{ $options.MONTHS[month] }}</option + > + </select> + </div> + <div + :key="new Date().getTime()" + v-if="selectedFrequency === $options.FREQUENCIES.quarterly" + class="d-flex flex-column w-50 mr-1" + > + <small for="from" class="my-auto text-muted"> + <translate>Ending Quarter</translate> + </small> + <select v-model="endQuarter" class="form-control form-control-sm"> + <option + v-for="month in [1, 2, 3, 4]" + :key="'qend' + month" + :value="month" + >Q{{ month }}</option + > + </select> + </div> + <div + :class="[ + 'd-flex', + 'flex-column', + 'w-50', + { 'ml-1': selectedFrequency !== $options.FREQUENCIES.yearly } + ]" + > + <small for="to" class="my-auto text-muted"> + <translate>Ending Year</translate> + </small> + <select v-model="endYear" class="form-control form-control-sm"> + <option + v-for="year in $options.YEARS" + :key="'end' + year" + :value="year" + >{{ year }}</option + > + </select> + </div> + </div> <div v-if="depthLimitVisible" class="d-flex mt-2" :key="1"> <div class="d-flex flex-column w-50 mr-1"> <small for="from" class="my-auto text-muted"> @@ -221,7 +310,18 @@ /> </div> </div> - + <div class="d-flex mt-2"> + <div class="d-flex flex-column w-50 ml-1"> + <small for="from" class="my-auto text-muted"> + <translate>From</translate> {{ fromDate | surveyDate }} + </small> + </div> + <div class="d-flex flex-column w-50 ml-1"> + <small for="to" class="my-auto text-muted"> + <translate>To</translate> {{ toDate | surveyDate }} + </small> + </div> + </div> <div class="mt-3"> <button @click="openFairwaydepthDiagram" @@ -276,11 +376,35 @@ import { displayError } from "@/lib/errors"; import { mapState, mapGetters } from "vuex"; import { LIMITINGFACTORS } from "@/store/fairwayavailability"; +import { + subYears, + getMonth, + startOfYear, + startOfMonth, + endOfMonth, + endOfYear, + format, + getQuarter, + startOfQuarter, + endOfQuarter, + setQuarter, + getYear +} from "date-fns"; + +const isoFormat = date => { + return format(date, "YYYY-MM-DD"); +}; export default { data() { return { - loading: false + loading: false, + startMonth: null, + endMonth: null, + startQuarter: null, + endQuarter: null, + startYear: null, + endYear: null }; }, computed: { @@ -339,13 +463,7 @@ ]; }, isComplete() { - return ( - !!this.from && - !!this.to && - !!this.frequency && - !!this.los && - this.selectedFairwayAvailabilityFeature !== null - ); + return this.selectedFairwayAvailabilityFeature !== null; }, type: { get() { @@ -448,6 +566,57 @@ } }, watch: { + selectedFrequency() { + const now = new Date(); + switch (this.selectedFrequency) { + case this.$options.FREQUENCIES.monthly: + this.startMonth = getMonth(now) + 1; + this.endMonth = getMonth(now) + 1; + this.startYear = getYear(subYears(now, 1)); + this.endYear = getYear(now); + this.fromDate = isoFormat(subYears(startOfMonth(now), 1)); + this.toDate = isoFormat(endOfMonth(now)); + break; + case this.$options.FREQUENCIES.quarterly: + this.startQuarter = this.dateToQuarter(now); + this.endQuarter = this.dateToQuarter(now); + this.startYear = getYear(subYears(now, 1)); + this.endYear = getYear(now); + this.fromDate = isoFormat(subYears(startOfQuarter(now), 1)); + this.toDate = this.toDate = isoFormat(endOfQuarter(now)); + break; + case this.$options.FREQUENCIES.yearly: + this.startYear = getYear(subYears(now, 1)); + this.endYear = getYear(now); + this.fromDate = isoFormat(subYears(startOfYear(now), 1)); + this.toDate = isoFormat(endOfYear(now)); + break; + default: + throw new Error("undefined frequency"); + } + }, + startQuarter() { + this.fromDate = isoFormat( + startOfQuarter(this.quarterToDate(this.startYear, this.startQuarter)) + ); + }, + endQuarter() { + this.toDate = isoFormat( + endOfQuarter(this.quarterToDate(this.endYear, this.endQuarter)) + ); + }, + startMonth() { + this.calcStart(); + }, + startYear() { + this.calcStart(); + }, + endMonth() { + this.calcEnd(); + }, + endYear() { + this.calcEnd(); + }, depthLimitVisible() { if (this.depthLimitVisible) { this.depthLimit1 = 2.3; @@ -466,29 +635,6 @@ this.type = this.$options.SECTION; this.setSelectedSection(); }, - type(type) { - if (type === this.$options.BOTTLENECK && this.selectedBottleneck) { - this.openLayersMap() - .getLayer("BOTTLENECKS") - .setVisible(true); - this.setSelectedBottleneck(); - } else if (type === this.$options.STRETCH && this.selectedStretchId) { - this.openLayersMap() - .getLayer("STRETCHES") - .setVisible(true); - this.setSelectedStretch(); - } else if (type === this.$options.SECTION && this.selectedSectionId) { - this.openLayersMap() - .getLayer("SECTIONS") - .setVisible(true); - this.setSelectedSection(); - } else { - this.$store.commit( - "fairwayavailability/setSelectedFairwayAvailability", - null - ); - } - }, showFairwayDepth() { if (this.showFairwayDepth) { this.loading = true; @@ -506,6 +652,98 @@ } }, methods: { + takeMeThere() { + if (this.type === this.$options.BOTTLENECK) { + this.openLayersMap() + .getLayer("BOTTLENECKS") + .setVisible(true); + this.$store.dispatch( + "bottlenecks/setSelectedBottleneck", + this.selectedFairwayAvailabilityFeature.properties.name + ); + this.$store.commit( + "bottlenecks/setBottleneckForPrint", + this.selectedBottleneck + ); + } + if (this.type === this.$options.STRETCH) { + this.openLayersMap() + .getLayer("STRETCHES") + .setVisible(true); + } + if (this.type === this.$options.SECTION) { + this.openLayersMap() + .getLayer("SECTIONS") + .setVisible(true); + } + if (this.selectedFairwayAvailabilityFeature) { + this.$store.dispatch("map/moveToFeauture", { + feature: this.selectedFairwayAvailabilityFeature, + zoom: 17, + preventZoomOut: true + }); + } + }, + dateToQuarter(date) { + return getQuarter(date); + }, + quarterToDate(year, quarter) { + return setQuarter(new Date(year, 1, 1), quarter); + }, + calcStart() { + switch (this.selectedFrequency) { + case this.$options.FREQUENCIES.monthly: + this.fromDate = isoFormat( + startOfMonth(new Date(this.startYear, this.startMonth - 1, 1)) + ); + break; + case this.$options.FREQUENCIES.quarterly: + this.fromDate = isoFormat( + startOfQuarter( + this.quarterToDate(this.startYear, this.startQuarter) + ) + ); + break; + case this.$options.FREQUENCIES.yearly: + this.fromDate = isoFormat(new Date(this.startYear, 0, 1)); + break; + default: + throw new Error("undefined frequency"); + } + }, + calcEnd() { + switch (this.selectedFrequency) { + case this.$options.FREQUENCIES.monthly: + this.toDate = isoFormat( + endOfMonth(new Date(this.endYear, this.endMonth - 1, 1)) + ); + break; + case this.$options.FREQUENCIES.quarterly: + this.toDate = isoFormat( + isoFormat( + endOfQuarter(this.quarterToDate(this.endYear, this.endQuarter)) + ) + ); + break; + case this.$options.FREQUENCIES.yearly: + this.toDate = isoFormat(endOfYear(new Date(this.endYear, 11, 31))); + break; + default: + throw new Error("undefined frequency"); + } + }, + initDates() { + const endDate = new Date(); + const startDate = subYears(new Date(), 1); + this.startMonth = getMonth(startDate) + 1; + this.endMonth = getMonth(endDate) + 1; + this.startYear = getYear(startDate); + this.endYear = getYear(endDate); + this.fromDate = isoFormat(startOfMonth(startDate)); + this.toDate = isoFormat(endOfMonth(endDate)); + this.startQuarter = this.dateToQuarter(startDate); + this.endQuarter = this.dateToQuarter(endDate); + }, openFairwaydepthLNWLDiagram() { this.clearInvisibleFormValues(); this.loading = true; @@ -571,7 +809,6 @@ this.$store.commit("application/paneSetup", "AVAILABLEFAIRWAYDEPTH"); }) .catch(error => { - console.log(error); const { status, data } = error.response; displayError({ title: this.$gettext("Backend Error"), @@ -586,36 +823,6 @@ this.$store.commit("application/showFairwayDepth", false); this.$store.commit("application/showFairwayDepthLNWL", false); }, - entrySelected() { - if (this.type === this.$options.BOTTLENECK) { - this.openLayersMap() - .getLayer("BOTTLENECKS") - .setVisible(true); - if (this.showProfiles) { - this.$store.dispatch( - "bottlenecks/setSelectedBottleneck", - this.selectedFairwayAvailabilityFeature.properties.name - ); - } - } - if (this.type === this.$options.STRETCH) { - this.openLayersMap() - .getLayer("STRETCHES") - .setVisible(true); - } - if (this.type === this.$options.SECTION) { - this.openLayersMap() - .getLayer("SECTIONS") - .setVisible(true); - } - if (this.selectedFairwayAvailabilityFeature) { - this.$store.dispatch("map/moveToFeauture", { - feature: this.selectedFairwayAvailabilityFeature, - zoom: 17, - preventZoomOut: true - }); - } - }, setSelectedBottleneck() { const bn = this.bottlenecksList.filter( x => x.properties.name === this.selectedBottleneck @@ -640,6 +847,9 @@ ); } }, + mounted() { + this.initDates(); + }, BOTTLENECK: "bottleneck", SECTION: "section", STRETCH: "stretch", @@ -649,6 +859,58 @@ quarterly: app.$gettext("quarterly"), yearly: app.$gettext("yearly") }, + YEARS: [ + 2015, + 2016, + 2017, + 2018, + 2019, + 2020, + 2021, + 2022, + 2023, + 2024, + 2025, + 2026, + 2027, + 2028, + 2029, + 2030, + 2031, + 2032, + 2033, + 2034, + 2035, + 2036, + 2037, + 2038, + 2039, + 2040, + 2041, + 2042, + 2043, + 2044, + 2045, + 2046, + 2047, + 2048, + 2049, + 2050 + ], + MONTHS: { + 1: "January", + 2: "February", + 3: "March", + 4: "April", + 5: "May", + 6: "June", + 7: "July", + 8: "August", + 9: "September", + 10: "October", + 11: "November", + 12: "December" + }, LIMITINGFACTORS: LIMITINGFACTORS }; </script>
--- a/client/src/components/fairway/AvailableFairwayDepthLNWL.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/fairway/AvailableFairwayDepthLNWL.vue Fri Oct 04 16:40:04 2019 +0200 @@ -91,6 +91,7 @@ import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors"; import { defaultDiagramTemplate } from "@/lib/DefaultDiagramTemplate"; +import sanitize from "sanitize-filename"; export default { mixins: [diagram, pdfgen, templateLoader], @@ -289,7 +290,10 @@ templateData: this.templateData, diagramTitle: title }); - this.pdf.doc.save(`Available Fairway Depth LNWL: ${this.featureName}`); + const filename = `AFDLNWL-${sanitize( + this.featureName + )}-${this.dateForPDF()}.pdf`; + this.pdf.doc.save(filename); }, addDiagramLegend(position, offset, color) { let x = offset.x,
--- a/client/src/components/fairway/BottleneckDialogue.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/fairway/BottleneckDialogue.vue Fri Oct 04 16:40:04 2019 +0200 @@ -13,28 +13,32 @@ /> <div class="box-body"> <UISpinnerOverlay v-if="surveysLoading || profileLoading" /> - <select - @change="moveToBottleneck" - v-model="selectedBottleneck" - class="form-control font-weight-bold" - > - <option :value="null"> - <translate>Select Bottleneck</translate> - </option> - <optgroup - v-for="(bottlenecksForCountry, cc) in orderedBottlenecks" - :key="cc" - :label="cc" + <div class="d-flex flex-row"> + <select + v-model="selectedBottleneck" + class="form-control font-weight-bold" > - <option - v-for="bn in bottlenecksForCountry" - :key="bn.properties.id" - :value="bn.properties.name" + <option :value="null"> + <translate>Select Bottleneck</translate> + </option> + <optgroup + v-for="(bottlenecksForCountry, cc) in orderedBottlenecks" + :key="cc" + :label="cc" > - {{ bn.properties.name }} - </option> - </optgroup> - </select> + <option + v-for="bn in bottlenecksForCountry" + :key="bn.properties.id" + :value="bn.properties.name" + > + {{ bn.properties.name }} + </option> + </optgroup> + </select> + <button @click="takeMeThere" class="btn btn-sm btn-info"> + <font-awesome-icon icon="crosshairs" /> + </button> + </div> <div v-if="selectedBottleneck"> <div class="d-flex flex-column mt-2"> <div class="flex-fill"> @@ -151,6 +155,32 @@ </div> <hr class="w-100 mb-0" /> <small class="text-muted d-block mt-2"> + <translate>Custom Depth</translate>: + </small> + <div class="d-flex"> + <input + class="form-control form-control-sm w-100 mt-1" + v-model.number="depth" + type="number" + step="0.1" + min="0" + /> + <button + @click="useCustomDepth = !useCustomDepth" + :class="[ + 'btn', + 'btn-xs', + 'ml-2', + { + 'btn-info': useCustomDepth, + 'btn-secondary': !useCustomDepth + } + ]" + > + {{ useCustomDepth ? "disable" : "enable" }} + </button> + </div> + <small class="text-muted d-block mt-2"> <translate>Saved cross profiles</translate>: </small> <div class="d-flex"> @@ -338,6 +368,22 @@ profilesLable() { return this.$gettext("Bottleneck Surveys"); }, + useCustomDepth: { + get() { + return this.$store.state.fairwayprofile.useCustomDepth; + }, + set(value) { + this.$store.commit("fairwayprofile/setUseCustomDepth", value); + } + }, + depth: { + get() { + return this.$store.state.fairwayprofile.depth; + }, + set(value) { + this.$store.commit("fairwayprofile/setDepth", value); + } + }, selectedBottleneck: { get() { return this.$store.state.bottlenecks.selectedBottleneck; @@ -472,6 +518,10 @@ }, selectedCut(cut) { if (cut) { + if (cut.depth) { + this.depth = cut.depth; + this.useCustomDepth = true; + } this.applyCoordinates(cut.coordinates); } } @@ -614,7 +664,8 @@ label: this.cutLabel, bottleneckName: this.selectedBottleneck, coordinates: [...this.startPoint, ...this.endPoint], - timestamp: new Date().getTime() + timestamp: new Date().getTime(), + depth: this.depth }; const existingEntry = previousCuts.find(cut => { return JSON.stringify(cut) === JSON.stringify(newEntry); @@ -689,11 +740,15 @@ } }); }, - moveToBottleneck() { + takeMeThere() { const bottleneck = this.bottlenecksList.find( bn => bn.properties.name === this.selectedBottleneck ); if (!bottleneck) return; + this.$store.commit( + "bottlenecks/setBottleneckForPrint", + this.selectedBottleneck + ); this.$store.dispatch("map/moveToFeauture", { feature: bottleneck, zoom: 17,
--- a/client/src/components/fairway/Fairwayprofile.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/fairway/Fairwayprofile.vue Fri Oct 04 16:40:04 2019 +0200 @@ -144,6 +144,7 @@ import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors"; import { defaultDiagramTemplate } from "@/lib/DefaultDiagramTemplate"; +import sanitize from "sanitize-filename"; const GROUND_COLOR = "#4A2F06"; const WATER_COLOR = "#005DFF"; @@ -182,7 +183,9 @@ "endPoint", "fairwayData", "maxAlt", - "selectedWaterLevel" + "selectedWaterLevel", + "depth", + "useCustomDepth" ]), ...mapState("bottlenecks", ["selectedSurvey", "selectedBottleneck"]), ...mapState("application", ["paneSetup"]), @@ -235,6 +238,13 @@ } }, watch: { + depth() { + if (!this.useCustomDepth) return; + this.drawDiagram(); + }, + useCustomDepth() { + this.drawDiagram(); + }, currentData() { this.drawDiagram(); }, @@ -318,15 +328,14 @@ downloadPDF() { let fairwayInfo = this.selectedBottleneck + " (" + this.selectedSurvey.date_info + ")"; - this.generatePDF({ templateData: this.templateData, diagramTitle: fairwayInfo }); - - this.pdf.doc.save( - this.title.replace(/\s/g, "_").replace(/[():,]/g, "") + ".pdf" - ); + const filename = `Fairwayprofile-${sanitize( + this.selectedBottleneck + )}-${this.dateForPDF()}.pdf`; + this.pdf.doc.save(filename); }, // Diagram legend @@ -465,7 +474,10 @@ }); graph .append("path") - .datum([{ x: startPoint, y: depth }, { x: endPoint, y: depth }]) + .datum([ + { x: startPoint, y: this.useCustomDepth ? this.depth : depth }, + { x: endPoint, y: this.useCustomDepth ? this.depth : depth } + ]) .attr("fill", `${this.getLayerStyle(data.los).fillColor}`) .attr("fill-opacity", this.getLayerStyle(data.los).fillOpacity) .attr("stroke", `${this.getLayerStyle(data.los).strokeColor}`)
--- a/client/src/components/gauge/Gauges.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/gauge/Gauges.vue Fri Oct 04 16:40:04 2019 +0200 @@ -13,27 +13,32 @@ /> <div class="box-body"> <UISpinnerOverlay v-if="loading" /> - <select - v-model="selectedGaugeISRS" - class="form-control font-weight-bold" - > - <option :value="null"> - <translate>Select Gauge</translate> - </option> - <optgroup - v-for="(gaugesForCountry, cc) in orderedGauges" - :key="cc" - :label="cc" + <div class="d-flex"> + <select + v-model="selectedGaugeISRS" + class="form-control font-weight-bold" > - <option - v-for="g in gaugesForCountry" - :key="g.properties.isrs_code" - :value="g.properties.isrs_code" + <option :value="null"> + <translate>Select Gauge</translate> + </option> + <optgroup + v-for="(gaugesForCountry, cc) in orderedGauges" + :key="cc" + :label="cc" > - {{ gaugeLabel(g) }} - </option> - </optgroup> - </select> + <option + v-for="g in gaugesForCountry" + :key="g.properties.isrs_code" + :value="g.properties.isrs_code" + > + {{ gaugeLabel(g) }} + </option> + </optgroup> + </select> + <button @click="takeMeThere" class="btn btn-sm btn-info"> + <font-awesome-icon icon="crosshairs" /> + </button> + </div> <div v-if="selectedGaugeISRS" class="mt-2"> <hr class="mb-1" /> <div class="row no-gutters mb-2"> @@ -109,11 +114,13 @@ * Author(s): * Markus Kottländer <markus.kottlaender@intevation.de> */ -/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "_" }]*/ + import { mapState, mapGetters } from "vuex"; import { displayError } from "@/lib/errors"; +import { pdfgen } from "@/lib/mixins"; export default { + mixins: [pdfgen], data() { return { loading: false @@ -143,7 +150,7 @@ return this.$store.state.gauges.selectedGaugeISRS; }, set(isrs) { - this.$store.dispatch("gauges/selectedGaugeISRS", isrs); + this.$store.dispatch("gauges/setSelectedGaugeISRS", isrs); } }, dateFrom: { @@ -173,19 +180,20 @@ }, watch: { selectedGaugeISRS(gauge) { - if (gauge) { - let coordinates = this.selectedGauge.geometry.coordinates; - this.$store.dispatch("map/moveMap", { - coordinates, - zoom: 15, - preventZoomOut: true - }); - } else { + if (!gauge) { this.$store.commit("application/paneSetup", "DEFAULT"); } } }, methods: { + takeMeThere() { + let coordinates = this.selectedGauge.geometry.coordinates; + this.$store.dispatch("map/moveMap", { + coordinates, + zoom: 15, + preventZoomOut: true + }); + }, close() { this.$store.commit("application/showGauges", false); }, @@ -244,27 +252,6 @@ }, gaugeLabel(gauge) { return `${gauge.properties.objname} (${this.isrsInfo(gauge).orc})`; - }, - isrsInfo(gauge) { - // See https://www.elwis.de/DE/Service/Daten-und-Fakten/RIS-Index/RIS-Index-node.html - const [ - _, - countryCode, - loCode, - fairwaySection, - orc, - hectometre - ] = gauge.properties.isrs_code.match( - /(\w{2})(\w{3})(\w{5})(\w{5})(\w{5})/ - ); - - return { - countryCode: countryCode, - loCode: loCode, - fairwaySection: fairwaySection, - orc: orc, - hectometre: hectometre - }; } }, mounted() {
--- a/client/src/components/gauge/HydrologicalConditions.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/gauge/HydrologicalConditions.vue Fri Oct 04 16:40:04 2019 +0200 @@ -108,6 +108,7 @@ import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors"; import { defaultDiagramTemplate } from "@/lib/DefaultDiagramTemplate"; +import sanitize from "sanitize-filename"; export default { mixins: [diagram, pdfgen, templateLoader], @@ -215,20 +216,18 @@ ); }, downloadPDF() { - let diagramTitle = - this.gaugeInfo(this.selectedGaugeD) + - ": Hydrological Conditions " + - this.longtermIntervalD.join(" - "); + let diagramTitle = `${this.selectedGaugeD.properties.objname} (${ + this.isrsInfo(this.selectedGaugeD).orc + }): Hydrological Conditions ${this.longtermIntervalD.join(" - ")}`; this.generatePDF({ templateData: this.templateData, diagramTitle: diagramTitle }); - - this.pdf.doc.save( - this.selectedGaugeD.properties.objname + - " Hydrological-condition Diagram.pdf" - ); + const filename = `HydrologicalCondition-${sanitize( + this.selectedGaugeD.properties.objname + )}-${this.dateForPDF()}.pdf`; + this.pdf.doc.save(filename); }, applyChange() { if (this.form.template.hasOwnProperty("properties")) {
--- a/client/src/components/gauge/Waterlevel.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/gauge/Waterlevel.vue Fri Oct 04 16:40:04 2019 +0200 @@ -120,6 +120,7 @@ import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors"; import { defaultDiagramTemplate } from "@/lib/DefaultDiagramTemplate"; +import sanitize from "sanitize-filename"; // we should load only d3 modules we need but for now we'll go with the lazy way // https://www.giacomodebidda.com/how-to-import-d3-plugins-with-webpack/ // d3-line-chunked plugin: https://github.com/pbeshai/d3-line-chunked @@ -222,19 +223,17 @@ saveAs(blog, filename); }, downloadPDF() { - let diagramTitle = - this.gaugeInfo(this.selectedGauge) + - ": Waterlevel " + - this.dateFromD.toLocaleDateString() + - " - " + - this.dateToD.toLocaleDateString(); + let diagramTitle = `${this.selectedGaugeD.properties.objname} (${ + this.isrsInfo(this.selectedGaugeD).orc + }): Waterlevel ${this.dateFromD.toLocaleDateString()} - ${this.dateToD.toLocaleDateString()}`; this.generatePDF({ templateData: this.templateData, diagramTitle: diagramTitle }); - this.pdf.doc.save( - this.selectedGauge.properties.objname + " Waterlevel-Diagram.pdf" - ); + const filename = `Waterlevel-${sanitize( + this.selectedGauge.properties.objname + )}-${this.dateForPDF()}.pdf`; + this.pdf.doc.save(filename); }, applyChange() { if (this.form.template.hasOwnProperty("properties")) { @@ -1170,7 +1169,11 @@ } }, created() { - this.resizeListenerFunction = debounce(this.drawDiagram, 100); + this.resizeListenerFunction = debounce(() => { + this.zoomStore // restore last zoom level + ? this.drawDiagram({ ...this.zoomStore }) + : this.drawDiagram(); + }, 100); window.addEventListener("resize", this.resizeListenerFunction); }, mounted() {
--- a/client/src/components/identify/Identify.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/identify/Identify.vue Fri Oct 04 16:40:04 2019 +0200 @@ -407,11 +407,13 @@ const latestInHours = this.config.gm_latest_hours; const measurementsIn14D = this.config.gm_min_values_14d; const gauge = classifications.getGauge(feature); - const lastMeasureDate = filters.surveyDate(gauge.get("gm_measuredate")); + const lastMeasureDate = gauge.get("gm_measuredate") + ? filters.surveyDate(new Date(gauge.get("gm_measuredate"))) + : this.$gettext("No measurement available"); const in14Days = gauge.get("gm_n_14d"); const messagesPerState = { OK: [ - this.$gettext("Avail: Latest measurement from") + + this.$gettext("Avail: Latest measurement from ") + `${lastMeasureDate}`, this.$gettext("Measurement is within") + ` ${latestInHours}h`, `${in14Days} / ${measurementsIn14D} ${this.$gettext( @@ -426,7 +428,7 @@ ], DANGER: [ this.$gettext("Avail: Latest measurement older than") + - ` ${latestInHours} d`, + ` ${latestInHours}h`, `(${lastMeasureDate})` ] }; @@ -467,7 +469,13 @@ if (!revisitingTime) return [this.$gettext("No revisiting time defined")]; const latest = feature.get("date_max"); if (!latest) return [this.$gettext("No survey-data available")]; - const latestMeasurement = filters.surveyDate(new Date(latest)); + const latestMeasurement = filters.surveyDate( + // remove a tailing "Z" if there is one, as some versions of + // firefox barf on it. The definition of Date Time String Format + // used for new Date() assumes UTC so it is okay, see + // http://www.ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 + new Date(latest.replace("Z", "")) + ); const messagesPerState = { OK: [ this.$gettext("Data within the revisiting time") +
--- a/client/src/components/importconfiguration/Import.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/importconfiguration/Import.vue Fri Oct 04 16:40:04 2019 +0200 @@ -169,7 +169,6 @@ }); }, deleteSchedule(schedule) { - console.log(schedule); this.$store.commit("application/popup", { icon: "trash", title: this.$gettext("Delete Import"),
--- a/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Fri Oct 04 16:40:04 2019 +0200 @@ -95,7 +95,6 @@ }, methods: { toggleDiff(number) { - console.log(number); if (this.showDiff !== number) { this.showDiff = number; } else {
--- a/client/src/components/importoverview/ImportOverview.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/importoverview/ImportOverview.vue Fri Oct 04 16:40:04 2019 +0200 @@ -4,7 +4,10 @@ icon="clipboard-check" :title="importReviewLabel" :closeCallback="$parent.close" - :actions="[{ callback: loadUpdatedLogs, icon: 'sync' }]" + :actions="[ + { callback: saveImportsView, icon: 'download' }, + { callback: loadUpdatedLogs, icon: 'sync' } + ]" /> <div class="position-relative"> <UISpinnerOverlay v-if="loading" /> @@ -131,6 +134,7 @@ import { STATES } from "@/store/imports"; import { sortTable } from "@/lib/mixins"; import { HTTP } from "@/lib/http"; +import app from "@/main"; import { startOfDay, startOfHour, @@ -227,6 +231,78 @@ } }, methods: { + saveImportsView() { + const content = ""; + this.$store.commit("application/popup", { + icon: "clipboard-check", + title: this.$gettext("Export logs"), + padding: false, + big: true, + content: content, + confirm: { + icon: "check", + callback: dates => { + const { from, to } = dates; + displayInfo({ + title: "Generating CSV", + message: `${from} - ${to}`, + options: { + timeout: 0, + buttons: [{ text: "Ok", action: null, bold: true }] + } + }); + HTTP.get( + `/imports?from=${encodeURIComponent( + format(startOfDay(new Date(from)), "YYYY-MM-DDTHH:mm:ssZ") + )}&to=${encodeURIComponent( + format(endOfDay(new Date(to)), "YYYY-MM-DDTHH:mm:ssZ") + )}&query=`, + { + headers: { "X-Gemma-Auth": localStorage.getItem("token") } + } + ) + .then(response => { + const { imports } = response.data; + app.$snotify.clear(); + if (!imports) return; + const csvLink = + "data:text/csv;charset=utf-8," + + encodeURIComponent( + "id, kind, enqueued, user, country, signer, state, warnings\n" + + imports + .map(el => { + return ` ${el.id}, ${el.kind}, ${ + el.enqueued + }, ${el.user || " "}, ${this.userCountries[el.user] || + " "}, ${el.signer || " "}, ${el.state || + " "}, ${el.warnings || " "}`; + }) + .join("\n") + ); + let element = document.createElement("a"); + element.setAttribute("download", "log.txt"); + element.setAttribute("href", csvLink); + document.querySelector("body").appendChild(element); + element.click(); + document.querySelector("body").removeChild(element); + }) + .catch(error => { + const { status, data } = error.response; + app.$snotify.clear(); + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }); + } + }, + cancel: { + label: this.$gettext("Cancel"), + icon: "times" + }, + dateSelection: true + }); + }, showSingleRessource(id) { id = id * 1; this.loadDetails(id)
--- a/client/src/components/importoverview/SectionDetails.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/importoverview/SectionDetails.vue Fri Oct 04 16:40:04 2019 +0200 @@ -103,7 +103,6 @@ }); }) .catch(error => { - console.log(error); const { status, data } = error.response; displayError({ title: this.$gettext("Backend Error"),
--- a/client/src/components/importoverview/StretchDetails.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/importoverview/StretchDetails.vue Fri Oct 04 16:40:04 2019 +0200 @@ -134,7 +134,6 @@ }); }) .catch(error => { - console.log(error); const { status, data } = error.response; displayError({ title: this.$gettext("Backend Error"),
--- a/client/src/components/map/Map.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/map/Map.vue Fri Oct 04 16:40:04 2019 +0200 @@ -131,31 +131,94 @@ } }, selectedStretchId(id) { - this.layers - .get("STRETCHES") + let stretch = this.layers.get("STRETCHES"); + stretch + .getSource() + .getFeatures() + .forEach(f => { + f.set("highlighted", false); + f.setStyle(null); + if (id === f.getId()) { + f.set("highlighted", true); + let highlight = new Style({ + fill: new Fill({ + color: this.colorLuminance( + stretch + .getStyle() + .getFill() + .getColor(), + 0.3 + ) + }), + stroke: new Stroke({ + color: this.colorLuminance( + stretch + .getStyle() + .getStroke() + .getColor(), + 0.3 + ), + width: 3 + }) + }); + f.setStyle(highlight); + } + }); + }, + selectedSectionId(id) { + let section = this.layers.get("SECTIONS"); + section .getSource() .getFeatures() .forEach(f => { f.set("highlighted", false); if (id === f.getId()) { f.set("highlighted", true); - } - }); - }, - selectedSectionId(id) { - this.layers - .get("SECTIONS") - .getSource() - .getFeatures() - .forEach(f => { - f.set("highlighted", false); - if (id === f.getId()) { - f.set("highlighted", true); + let highlight = new Style({ + fill: new Fill({ + color: this.colorLuminance( + section + .getStyle() + .getFill() + .getColor(), + 0.3 + ) + }), + stroke: new Stroke({ + color: this.colorLuminance( + section + .getStyle() + .getStroke() + .getColor(), + 0.3 + ), + width: 4 + }) + }); + f.setStyle(highlight); } }); } }, methods: { + colorLuminance(hex, lum) { + hex = String(hex).replace(/[^0-9a-f]/gi, ""); + if (hex.length < 6) { + hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2]; + } + lum = lum || 0; + let opacity = hex.substr(6, 2); + var rgb = "#", + c, + i; + for (i = 0; i < 3; i++) { + c = parseInt(hex.substr(i * 2, 2), 16); + c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16); + rgb += ("00" + c).substr(c.length); + } + + return rgb + opacity; + }, updateBottleneckFilter(bottleneck_id, datestr) { if (!bottleneck_id) return; const exists = bottleneck_id != "does_not_exist"; @@ -256,108 +319,118 @@ this.$store.dispatch("map/initIdentifyTool", this.map); }, loadStyles() { + const getRGBA = color => { + return ( + "rgba(" + + parseInt(color.slice(1, 3), 16) + + ", " + + parseInt(color.slice(3, 5), 16) + + ", " + + parseInt(color.slice(5, 7), 16) + + (color.length > 7 + ? ", " + parseInt(color.slice(7, 9), 16) / 255 + : "") + + ")" + ); + }; // load configured bottleneck colors HTTP.get("/system/settings", { headers: { "X-Gemma-Auth": localStorage.getItem("token") } - }) - .then(response => { - let btlnStrokeC = response.data.bottlenecks_stroke, - btlnFillC = response.data.bottlenecks_fill, - strFillC = response.data.stretches_fill, - strStrokeC = response.data.stretches_stroke, - secStrokeC = response.data.sections_stroke, - secFillC = response.data.sections_fill, - fwd1StrokeC = response.data.fairwaydimensionslos1_stroke, - fwd1FillC = response.data.fairwaydimensionslos1_fill, - fwd2StrokeC = response.data.fairwaydimensionslos2_stroke, - fwd2FillC = response.data.fairwaydimensionslos2_fill, - fwd3StrokeC = response.data.fairwaydimensionslos3_stroke, - fwd3FillC = response.data.fairwaydimensionslos3_fill, - wwpStokeC = response.data.waterwayprofiles_stroke; - let btlnStyle = new Style({ - stroke: new Stroke({ - color: btlnStrokeC, - width: 4 - }), - fill: new Fill({ - color: btlnFillC - }) + }).then(response => { + let btlnStrokeC = getRGBA(response.data.bottlenecks_stroke), + btlnFillC = getRGBA(response.data.bottlenecks_fill), + strFillC = getRGBA(response.data.stretches_fill), + strStrokeC = getRGBA(response.data.stretches_stroke), + secStrokeC = getRGBA(response.data.sections_stroke), + secFillC = getRGBA(response.data.sections_fill), + fwd1StrokeC = getRGBA(response.data.fairwaydimensionslos1_stroke), + fwd1FillC = getRGBA(response.data.fairwaydimensionslos1_fill), + fwd2StrokeC = getRGBA(response.data.fairwaydimensionslos2_stroke), + fwd2FillC = getRGBA(response.data.fairwaydimensionslos2_fill), + fwd3StrokeC = getRGBA(response.data.fairwaydimensionslos3_stroke), + fwd3FillC = getRGBA(response.data.fairwaydimensionslos3_fill), + wwpStokeC = getRGBA(response.data.waterwayprofiles_stroke); + let btlnStyle = new Style({ + stroke: new Stroke({ + color: btlnStrokeC, + width: 4 }), - strStyle = new Style({ - stroke: new Stroke({ - color: strStrokeC, - width: 2 - }), - fill: new Fill({ - color: strFillC - }) + fill: new Fill({ + color: btlnFillC + }) + }), + strStyle = new Style({ + stroke: new Stroke({ + color: strStrokeC, + width: 2 }), - secStyle = new Style({ - stroke: new Stroke({ - color: secStrokeC, - width: 5 - }), - fill: new Fill({ - color: secFillC - }) + fill: new Fill({ + color: strFillC + }) + }), + secStyle = new Style({ + stroke: new Stroke({ + color: secStrokeC, + width: 5 + }), + fill: new Fill({ + color: secFillC + }) + }), + fwd1Style = new Style({ + stroke: new Stroke({ + lineDash: [2, 4], + lineCap: "round", + color: fwd1StrokeC, + width: 2 }), - fwd1Style = new Style({ - stroke: new Stroke({ - lineDash: [2, 4], - lineCap: "round", - color: fwd1StrokeC, - width: 2 - }), - fill: new Fill({ - color: fwd1FillC - }) + fill: new Fill({ + color: fwd1FillC + }) + }), + fwd2Style = new Style({ + stroke: new Stroke({ + lineDash: [3, 6], + lineCap: "round", + color: fwd2StrokeC, + width: 2 }), - fwd2Style = new Style({ - stroke: new Stroke({ - lineDash: [3, 6], - lineCap: "round", - color: fwd2StrokeC, - width: 2 - }), - fill: new Fill({ - color: fwd2FillC - }) + fill: new Fill({ + color: fwd2FillC + }) + }), + fwd3Style = new Style({ + stroke: new Stroke({ + color: fwd3StrokeC, + width: 2 }), - fwd3Style = new Style({ - stroke: new Stroke({ - color: fwd3StrokeC, - width: 2 - }), - fill: new Fill({ - color: fwd3FillC - }) - }), - wwpStyle = new Style({ - stroke: new Stroke({ - color: wwpStokeC, - lineDash: [5, 5], - width: 2 - }) - }); - this.layers.get("WATERWAYPROFILES").setStyle(wwpStyle); - this.layers - .get("FAIRWAYDIMENSIONSLOS1") - .setStyle(() => [fwd1Style, styles.textFW1]); - this.layers - .get("FAIRWAYDIMENSIONSLOS2") - .setStyle(() => [fwd2Style, styles.textFW2]); - this.layers - .get("FAIRWAYDIMENSIONSLOS3") - .setStyle(() => [fwd3Style, styles.textFW3]); - this.layers.get("SECTIONS").setStyle(secStyle); - this.layers.get("STRETCHES").setStyle(strStyle); - this.layers.get("BOTTLENECKS").setStyle(btlnStyle); - this.$store.commit("gauges/deleteNashSutcliffeCache"); - this.$store.dispatch("map/refreshLayers"); - }) - .catch(error => { - console.log(error); - }); + fill: new Fill({ + color: fwd3FillC + }) + }), + wwpStyle = new Style({ + stroke: new Stroke({ + color: wwpStokeC, + lineDash: [5, 5], + width: 2 + }) + }); + this.layers.get("WATERWAYPROFILES").setStyle(wwpStyle); + this.layers + .get("FAIRWAYDIMENSIONSLOS1") + .setStyle(() => [fwd1Style, styles.textFW1]); + this.layers + .get("FAIRWAYDIMENSIONSLOS2") + .setStyle(() => [fwd2Style, styles.textFW2]); + this.layers + .get("FAIRWAYDIMENSIONSLOS3") + .setStyle(() => [fwd3Style, styles.textFW3]); + this.layers.get("SECTIONS").setStyle(secStyle); + this.layers.get("STRETCHES").setStyle(strStyle); + this.layers.get("BOTTLENECKS").setStyle(btlnStyle); + this.$store.commit("gauges/deleteNashSutcliffeCache"); + this.$store.dispatch("map/refreshLayers"); + }); } }, mounted() {
--- a/client/src/components/map/layers.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/map/layers.js Fri Oct 04 16:40:04 2019 +0200 @@ -470,7 +470,6 @@ TILED: true }, tileLoadFunction: function(tile, src) { - // console.log("calling for", tile, src); HTTP.get(src, { headers: { "X-Gemma-Auth": localStorage.getItem("token") @@ -496,7 +495,6 @@ TILED: true }, tileLoadFunction: function(tile, src) { - // console.log("calling for", tile, src); HTTP.get(src, { headers: { "X-Gemma-Auth": localStorage.getItem("token")
--- a/client/src/components/systemconfiguration/PDFTemplates.vue Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/components/systemconfiguration/PDFTemplates.vue Fri Oct 04 16:40:04 2019 +0200 @@ -272,8 +272,6 @@ this.$refs.uploadTemplate.value = null; } }; - - reader.onerror = error => console.log(error); reader.readAsText(this.$refs.uploadTemplate.files[0]); }, loadTemplates() {
--- a/client/src/lib/mixins.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/lib/mixins.js Fri Oct 04 16:40:04 2019 +0200 @@ -20,8 +20,7 @@ import { HTTP } from "@/lib/http"; import * as d3 from "d3"; -/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "debugSVG" }]*/ - +/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "[debugSVG|_]" }]*/ const debugSVG = ({ svg, svgWidth, svgHeight }) => { d3.select(svg) .append("rect") @@ -216,17 +215,25 @@ pixel2millimeter(pixels, dpi) { return (pixels * 25.4) / dpi; }, - gaugeInfo(selectedGauge) { - // returns string with formatted gauge info - return ( - selectedGauge.properties.objname + - " (" + - selectedGauge.id - .split(".")[1] - .replace(/[()]/g, "") - .split(",")[3] + - ")" + isrsInfo(gauge) { + // See https://www.elwis.de/DE/Service/Daten-und-Fakten/RIS-Index/RIS-Index-node.html + const [ + _, + countryCode, + loCode, + fairwaySection, + orc, + hectometre + ] = gauge.properties.isrs_code.match( + /(\w{2})(\w{3})(\w{5})(\w{5})(\w{5})/ ); + return { + countryCode: countryCode, + loCode: loCode, + fairwaySection: fairwaySection, + orc: orc, + hectometre: hectometre + }; }, generatePDF(params) { // creates a new jsPDF object into this.pdf.doc @@ -496,28 +503,24 @@ background, brcolor ); - if (["bottomright", "bottomleft"].indexOf(position) !== -1) { - this.addText( - position, - { x: offset.x + padding, y: offset.y }, - textWidth, - fontSize, - color, - text - ); - } else { - this.addText( - position, - { - x: offset.x + padding, - y: offset.y + height - this.getTextHeight(textLines.length) - }, - textWidth, - fontSize, - color, - text - ); - } + let yForText = + ["bottomright", "bottomleft"].indexOf(position) !== -1 + ? offset.y + : offset.y + height - this.getTextHeight(textLines.length); + this.addText( + position, + { x: offset.x + padding, y: yForText }, + textWidth, + fontSize, + color, + text + ); + }, + dateForPDF() { + return new Date() + .toISOString() + .slice(0, 10) + .replace(/-/g, ""); } } };
--- a/client/src/locale/bg_BG/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/bg_BG/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -55,7 +55,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -67,7 +67,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -104,7 +104,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -128,15 +128,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 -msgid "Avail: Latest measurement from" +#: src/components/identify/Identify.vue:416 +msgid "Avail: Latest measurement from " msgstr "" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 msgid "Avail: Latest measurement older than" msgstr "" @@ -144,17 +144,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 msgid "Available fairway depth vs LNWL" msgstr "" @@ -171,28 +171,28 @@ msgid "back to login" msgstr "" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -203,14 +203,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -221,7 +222,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -235,7 +236,7 @@ msgid "BeamType" msgstr "Тип" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 #, fuzzy msgid "Bottleneck" @@ -245,7 +246,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" @@ -262,15 +263,16 @@ msgid "Bottlenecks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" msgstr "" @@ -309,23 +311,23 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 msgid "Compare to" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -333,19 +335,19 @@ msgid "Configuration" msgstr "" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -357,23 +359,27 @@ msgid "Cronstring" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -384,23 +390,15 @@ msgid "Date" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -msgid "Date from" -msgstr "" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -msgid "Date to" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 msgid "Day" msgstr "" @@ -428,22 +426,22 @@ msgid "Define Stretches" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 msgid "Delete cross profile" msgstr "" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 msgid "Delete Import" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 msgid "Delete Template" msgstr "" @@ -459,15 +457,15 @@ msgid "deleted" msgstr "" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 msgid "deleted successfully" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -477,19 +475,19 @@ msgid "Depth" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -513,11 +511,11 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -525,7 +523,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -537,11 +535,11 @@ msgid "Download Meta.json" msgstr "" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 #, fuzzy msgid "Email" @@ -562,15 +560,27 @@ msgid "End rhm" msgstr "" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "" @@ -611,6 +621,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -647,11 +661,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 msgid "Fairwayprofile" msgstr "" @@ -675,7 +689,7 @@ msgid "File Import" msgstr "" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -696,7 +710,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -708,11 +724,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -728,16 +744,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 msgid "Generated by" msgstr "" @@ -745,7 +761,7 @@ msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -753,27 +769,27 @@ msgid "hour" msgstr "" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 msgid "hours." msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "" @@ -807,11 +823,11 @@ msgstr "" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 msgid "Import review" msgstr "" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 msgid "Import Schedule" msgstr "" @@ -833,8 +849,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "" @@ -850,7 +866,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "" @@ -866,7 +882,7 @@ msgid "June" msgstr "" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "" @@ -878,13 +894,13 @@ msgid "Last refresh:" msgstr "" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 msgid "Later" msgstr "" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 msgid "Latest measurement" msgstr "" @@ -925,7 +941,7 @@ msgid "Logs" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "" @@ -978,12 +994,12 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 msgid "Measurement is within" msgstr "" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 msgid "measurements" msgstr "" @@ -1017,7 +1033,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 msgid "monthly" msgstr "" @@ -1091,11 +1107,15 @@ msgid "No features identified." msgstr "" +#: src/components/identify/Identify.vue:412 +msgid "No measurement available" +msgstr "" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "" -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1103,7 +1123,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1111,8 +1131,8 @@ msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1132,7 +1152,7 @@ msgid "of" msgstr "" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1152,8 +1172,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1193,7 +1213,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1301,7 +1321,7 @@ msgid "Please enter an originator" msgstr "Моля, изберете държава" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1330,7 +1350,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1342,11 +1362,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "" @@ -1354,7 +1374,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1363,7 +1383,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Критични участъци" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1392,7 +1412,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1421,7 +1441,7 @@ msgid "Role" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1438,7 +1458,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "" @@ -1446,7 +1466,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1454,7 +1474,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "" @@ -1471,7 +1491,7 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1481,20 +1501,20 @@ msgid "Select Bottleneck" msgstr "" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 msgid "Select stretch" msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1513,23 +1533,23 @@ msgid "September" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "" @@ -1591,7 +1611,7 @@ msgid "Staging Area" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "" @@ -1611,7 +1631,19 @@ msgid "Starting import of section" msgstr "" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +msgid "Starting Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +msgid "Starting Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +msgid "Starting Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:200 msgid "Status" msgstr "" @@ -1638,12 +1670,12 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1675,7 +1707,7 @@ msgid "Testmail sent" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1684,13 +1716,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1723,19 +1755,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1758,9 +1790,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1786,7 +1818,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1810,8 +1844,8 @@ msgid "Tuesday" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 #, fuzzy msgid "Type" @@ -1897,17 +1931,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -1965,11 +1999,11 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -1977,7 +2011,7 @@ msgid "year" msgstr "Година" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "Година" @@ -1987,7 +2021,7 @@ msgid "yes" msgstr "Слоеве" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/de_AT/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/de_AT/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -55,7 +55,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -67,7 +67,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -105,7 +105,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -130,16 +130,16 @@ msgid "August" msgstr "August" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 +#: src/components/identify/Identify.vue:416 #, fuzzy -msgid "Avail: Latest measurement from" +msgid "Avail: Latest measurement from " msgstr "Messung" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 #, fuzzy msgid "Avail: Latest measurement older than" msgstr "Messung" @@ -149,19 +149,19 @@ msgid "Availability of Gauge Measurements" msgstr "Messung" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Verfügbare Fahrrinnen Tiefen" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 #, fuzzy msgid "Available Fairway Depth" msgstr "Verfügbare Fahrrinnen Tiefen" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "Verfügbare Fahrrinnen Tiefen" @@ -180,28 +180,28 @@ msgid "back to login" msgstr "zurück zur Anmeldung" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -212,14 +212,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -230,7 +231,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -244,7 +245,7 @@ msgid "BeamType" msgstr "Typ" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Seichtstelle" @@ -253,7 +254,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" @@ -270,15 +271,16 @@ msgid "Bottlenecks" msgstr "Seichtstellen" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 #, fuzzy msgid "Cancel" @@ -318,24 +320,24 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 #, fuzzy msgid "Compare to" msgstr "Vergleiche mit" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "Vergleiche mit" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -343,19 +345,19 @@ msgid "Configuration" msgstr "Konfiguration" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "Bestätigen" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "Koordinaten auf die Zwischenablage kopiert!" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -366,23 +368,27 @@ msgid "Cronstring" msgstr "Crontab-Zeile" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -393,25 +399,15 @@ msgid "Date" msgstr "Datum" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -#, fuzzy -msgid "Date from" -msgstr "Datum" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "Datum" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -#, fuzzy -msgid "Date to" -msgstr "Datum" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "Tag" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 #, fuzzy msgid "Day" msgstr "Tag" @@ -440,25 +436,25 @@ msgid "Define Stretches" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 #, fuzzy msgid "Delete" msgstr "Konto löschen" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 #, fuzzy msgid "Delete cross profile" msgstr "Gespeicherte Profile" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 #, fuzzy msgid "Delete Import" msgstr "Neuer Import" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 #, fuzzy msgid "Delete Template" msgstr "Konto löschen" @@ -477,16 +473,16 @@ msgid "deleted" msgstr "Konto löschen" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 #, fuzzy msgid "deleted successfully" msgstr "Erfolgreich" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -496,20 +492,20 @@ msgid "Depth" msgstr "Tiefe" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 #, fuzzy msgid "Depth Reference" msgstr "Tiefenreferenz" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -533,11 +529,11 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -545,7 +541,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -557,11 +553,11 @@ msgid "Download Meta.json" msgstr "Meta.json Herunterladen" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 msgid "Email" msgstr "E-Mail" @@ -581,15 +577,27 @@ msgid "End rhm" msgstr "" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "Hinzugefügt" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "Manuelle Koordinateneingabe" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "Namen für Profilschnitt eingeben" @@ -631,6 +639,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -672,11 +684,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 #, fuzzy msgid "Fairwayprofile" msgstr "Einlesen der Wasserwegsprofile" @@ -703,7 +715,7 @@ msgid "File Import" msgstr "Neuer Import" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -724,7 +736,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -736,11 +750,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -757,16 +771,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "PDF generieren" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 #, fuzzy msgid "Generated by" msgstr "– erstellt von:" @@ -776,7 +790,7 @@ msgid "Generated PDFs use font:" msgstr "PDF generieren" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -784,28 +798,28 @@ msgid "hour" msgstr "Stunde" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 #, fuzzy msgid "hours." msgstr "Stunde" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "Id" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "ID" @@ -841,12 +855,12 @@ msgstr "Neuer Import" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 #, fuzzy msgid "Import review" msgstr "Importiert" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 #, fuzzy msgid "Import Schedule" msgstr "Zeitplan" @@ -872,8 +886,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "Daten-Import" @@ -890,7 +904,7 @@ msgid "invalid email" msgstr "Ungültige E-Mail" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "Ungültige Eingabe" @@ -906,7 +920,7 @@ msgid "June" msgstr "Juni" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "Art" @@ -918,14 +932,14 @@ msgid "Last refresh:" msgstr "Letzter Abgleich:" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 #, fuzzy msgid "Later" msgstr "Neueste" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 #, fuzzy msgid "Latest measurement" msgstr "Messung" @@ -970,7 +984,7 @@ msgid "Logs" msgstr "Protokolle" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "" @@ -1024,13 +1038,13 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 #, fuzzy msgid "Measurement is within" msgstr "Messung" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 #, fuzzy msgid "measurements" msgstr "Messung" @@ -1065,7 +1079,7 @@ msgid "month" msgstr "Monat" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 #, fuzzy msgid "monthly" msgstr "monatlich" @@ -1141,11 +1155,16 @@ msgid "No features identified." msgstr "Keine Objekte identifiziert." +#: src/components/identify/Identify.vue:412 +#, fuzzy +msgid "No measurement available" +msgstr "Messung" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "Keine Ergebnisse." -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1153,7 +1172,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1161,8 +1180,8 @@ msgid "November" msgstr "November" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1183,7 +1202,7 @@ msgid "of" msgstr "" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1204,8 +1223,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1248,7 +1267,7 @@ msgid "pending" msgstr "Ausstehend" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1367,7 +1386,7 @@ msgid "Please enter an originator" msgstr "Bitte einen Endpunkt eingeben" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" "Bitte geben Sie die Koordinaten in folgendem Format an: Lat,Lon,Lat,Lon" @@ -1397,7 +1416,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1409,11 +1428,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "Profil gelöscht!" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "Profil gespeichert!" @@ -1421,7 +1440,7 @@ msgid "Projection" msgstr "Projektion" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1430,7 +1449,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Seichtstellen" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1461,7 +1480,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1490,7 +1509,7 @@ msgid "Role" msgstr "Rolle" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1507,7 +1526,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "Gespeicherte Profile" @@ -1516,7 +1535,7 @@ msgid "Saved import: #" msgstr "Neuer Import" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1524,7 +1543,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "Zeitplan" @@ -1544,7 +1563,7 @@ msgid "Sections" msgstr "Projektion" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1554,21 +1573,21 @@ msgid "Select Bottleneck" msgstr "Wähle Seichtstelle" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 #, fuzzy msgid "Select stretch" msgstr "Konto löschen" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1588,23 +1607,23 @@ msgid "September" msgstr "September" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 #, fuzzy msgid "Signer" msgstr "Überprüft durch" @@ -1673,7 +1692,7 @@ msgid "Staging Area" msgstr "Import-Überprüfung" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "Start" @@ -1695,7 +1714,22 @@ msgid "Starting import of section" msgstr "Import gestartet " -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +#, fuzzy +msgid "Starting Month" +msgstr "Import gestartet " + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +#, fuzzy +msgid "Starting Quarter" +msgstr "Import-Überprüfung" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +#, fuzzy +msgid "Starting Year" +msgstr "Import-Überprüfung" + +#: src/components/importoverview/ImportOverview.vue:200 #, fuzzy msgid "Status" msgstr "Zustand" @@ -1725,12 +1759,12 @@ msgid "Sunday" msgstr "Sonntag" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1764,7 +1798,7 @@ msgid "Testmail sent" msgstr "E-Mail wurde gesendet" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1773,13 +1807,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1812,19 +1846,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1847,9 +1881,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1875,7 +1909,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1900,8 +1936,8 @@ msgid "Tuesday" msgstr "Dienstag" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 msgid "Type" msgstr "Typ" @@ -1992,17 +2028,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -2067,11 +2103,11 @@ msgid "Weekly" msgstr "wöchentlich" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -2079,7 +2115,7 @@ msgid "year" msgstr "Jahr" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "Jahr" @@ -2089,7 +2125,7 @@ msgid "yes" msgstr "Ebenen" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2098,6 +2134,14 @@ "auswählen, um diesen Profilschnitt wieder herzustellen." #, fuzzy +#~ msgid "Date from" +#~ msgstr "Datum" + +#, fuzzy +#~ msgid "Date to" +#~ msgstr "Datum" + +#, fuzzy #~ msgid "Delete survey" #~ msgstr "Konto löschen" @@ -2183,9 +2227,6 @@ #~ msgid "Rejected" #~ msgstr "Abgelehnt" -#~ msgid "Staging area" -#~ msgstr "Import-Überprüfung" - #, fuzzy #~ msgid "Startpoint is not before endpoint." #~ msgstr "Der Startpunkt ist nicht vor dem Endpunkt."
--- a/client/src/locale/en_GB/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/en_GB/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -53,7 +53,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -65,7 +65,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -102,7 +102,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -126,15 +126,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 -msgid "Avail: Latest measurement from" +#: src/components/identify/Identify.vue:416 +msgid "Avail: Latest measurement from " msgstr "" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 msgid "Avail: Latest measurement older than" msgstr "" @@ -142,17 +142,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 msgid "Available fairway depth vs LNWL" msgstr "" @@ -169,28 +169,28 @@ msgid "back to login" msgstr "" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -201,14 +201,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -219,7 +220,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -232,7 +233,7 @@ msgid "BeamType" msgstr "" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "" @@ -241,7 +242,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 msgid "Bottleneck Surveys" msgstr "" @@ -256,15 +257,16 @@ msgid "Bottlenecks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" msgstr "" @@ -303,23 +305,23 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 msgid "Compare to" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -327,19 +329,19 @@ msgid "Configuration" msgstr "" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -350,23 +352,27 @@ msgid "Cronstring" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -377,23 +383,15 @@ msgid "Date" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -msgid "Date from" -msgstr "" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -msgid "Date to" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 msgid "Day" msgstr "" @@ -421,22 +419,22 @@ msgid "Define Stretches" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 msgid "Delete cross profile" msgstr "" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 msgid "Delete Import" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 msgid "Delete Template" msgstr "" @@ -452,15 +450,15 @@ msgid "deleted" msgstr "" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 msgid "deleted successfully" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -470,19 +468,19 @@ msgid "Depth" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -506,11 +504,11 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -518,7 +516,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -530,11 +528,11 @@ msgid "Download Meta.json" msgstr "" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 msgid "Email" msgstr "" @@ -554,15 +552,27 @@ msgid "End rhm" msgstr "" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "" @@ -603,6 +613,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -639,11 +653,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 msgid "Fairwayprofile" msgstr "" @@ -667,7 +681,7 @@ msgid "File Import" msgstr "" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -688,7 +702,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -700,11 +716,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -720,16 +736,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 msgid "Generated by" msgstr "" @@ -737,7 +753,7 @@ msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -745,27 +761,27 @@ msgid "hour" msgstr "" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 msgid "hours." msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "" @@ -799,11 +815,11 @@ msgstr "" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 msgid "Import review" msgstr "" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 msgid "Import Schedule" msgstr "" @@ -825,8 +841,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "" @@ -842,7 +858,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "" @@ -858,7 +874,7 @@ msgid "June" msgstr "" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "" @@ -870,13 +886,13 @@ msgid "Last refresh:" msgstr "" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 msgid "Later" msgstr "" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 msgid "Latest measurement" msgstr "" @@ -916,7 +932,7 @@ msgid "Logs" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "" @@ -968,12 +984,12 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 msgid "Measurement is within" msgstr "" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 msgid "measurements" msgstr "" @@ -1007,7 +1023,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 msgid "monthly" msgstr "" @@ -1080,11 +1096,15 @@ msgid "No features identified." msgstr "" +#: src/components/identify/Identify.vue:412 +msgid "No measurement available" +msgstr "" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "" -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1092,7 +1112,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1100,8 +1120,8 @@ msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1121,7 +1141,7 @@ msgid "of" msgstr "" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1141,8 +1161,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1182,7 +1202,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1287,7 +1307,7 @@ msgid "Please enter an originator" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1316,7 +1336,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1328,11 +1348,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "" @@ -1340,7 +1360,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1348,7 +1368,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1377,7 +1397,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1406,7 +1426,7 @@ msgid "Role" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1423,7 +1443,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "" @@ -1431,7 +1451,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1439,7 +1459,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "" @@ -1456,7 +1476,7 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 msgid "Select bottleneck" msgstr "" @@ -1465,20 +1485,20 @@ msgid "Select Bottleneck" msgstr "" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 msgid "Select stretch" msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1497,23 +1517,23 @@ msgid "September" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "" @@ -1575,7 +1595,7 @@ msgid "Staging Area" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "" @@ -1595,7 +1615,19 @@ msgid "Starting import of section" msgstr "" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +msgid "Starting Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +msgid "Starting Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +msgid "Starting Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:200 msgid "Status" msgstr "" @@ -1622,12 +1654,12 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1659,7 +1691,7 @@ msgid "Testmail sent" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1668,13 +1700,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1707,19 +1739,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1742,9 +1774,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1770,7 +1802,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1794,8 +1828,8 @@ msgid "Tuesday" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 msgid "Type" msgstr "" @@ -1880,17 +1914,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -1948,11 +1982,11 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -1960,7 +1994,7 @@ msgid "year" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 msgid "yearly" msgstr "" @@ -1968,7 +2002,7 @@ msgid "yes" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/hr_HR/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/hr_HR/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -56,7 +56,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -68,7 +68,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -106,7 +106,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -131,16 +131,16 @@ msgid "August" msgstr "Kolovoz" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 +#: src/components/identify/Identify.vue:416 #, fuzzy -msgid "Avail: Latest measurement from" +msgid "Avail: Latest measurement from " msgstr "Mjerenje" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 #, fuzzy msgid "Avail: Latest measurement older than" msgstr "Mjerenje" @@ -150,19 +150,19 @@ msgid "Availability of Gauge Measurements" msgstr "Započinje uvoz odobrenih vodostaja" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Dostupne dubine plovnog puta" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 #, fuzzy msgid "Available Fairway Depth" msgstr "Dostupne dubine plovnog puta" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "Dostupne dubine plovnog puta" @@ -181,28 +181,28 @@ msgid "back to login" msgstr "natrag na prijavu" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -213,14 +213,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -231,7 +232,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -245,7 +246,7 @@ msgid "BeamType" msgstr "Tip" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Kritični sektor" @@ -254,7 +255,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" @@ -271,15 +272,16 @@ msgid "Bottlenecks" msgstr "Kritični sektori" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 #, fuzzy msgid "Cancel" @@ -319,24 +321,24 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 #, fuzzy msgid "Compare to" msgstr "Usporedi sa" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "Usporedi sa" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -344,19 +346,19 @@ msgid "Configuration" msgstr "Konfiguracija" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "Potvrdi" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "Koordinate su kopirane u međuspremnik!" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -367,23 +369,27 @@ msgid "Cronstring" msgstr "Crontab - linija" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -394,25 +400,15 @@ msgid "Date" msgstr "Datum" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -#, fuzzy -msgid "Date from" -msgstr "Datum" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "Datum" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -#, fuzzy -msgid "Date to" -msgstr "Datum" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "Dan" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 #, fuzzy msgid "Day" msgstr "Dan" @@ -444,25 +440,25 @@ msgid "Define Stretches" msgstr "Definiraj dionice" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 #, fuzzy msgid "Delete" msgstr "Brisanje " -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 #, fuzzy msgid "Delete cross profile" msgstr "Spremljeni poprečni profili" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 #, fuzzy msgid "Delete Import" msgstr "Obrisan uvoz: #" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 #, fuzzy msgid "Delete Template" msgstr "Obrisan uvoz: #" @@ -482,16 +478,16 @@ msgid "deleted" msgstr "Brisanje " -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "Obrisan uvoz: #" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 #, fuzzy msgid "deleted successfully" msgstr "Uspješno" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -501,20 +497,20 @@ msgid "Depth" msgstr "Dubina" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 #, fuzzy msgid "Depth Reference" msgstr "Referentna dubina" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -542,11 +538,11 @@ msgid "Distance marks virtual" msgstr "Virtualne Oznake Udaljenosti" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -554,7 +550,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -566,11 +562,11 @@ msgid "Download Meta.json" msgstr "Preuzmi Meta.json" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 msgid "Email" msgstr "E-mail" @@ -590,15 +586,27 @@ msgid "End rhm" msgstr "Završni rkm" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "Na čekanju" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "Unesi koordinate ručno" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "Unesi oznaku poprečnog profila" @@ -641,6 +649,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -682,11 +694,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 #, fuzzy msgid "Fairwayprofile" msgstr "Uvoz Profila Plovnog Puta" @@ -712,7 +724,7 @@ msgid "File Import" msgstr "Novi uvoz" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -733,7 +745,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -745,11 +759,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -766,16 +780,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "Kreiraj PDF" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 #, fuzzy msgid "Generated by" msgstr "– kreiran od:" @@ -785,7 +799,7 @@ msgid "Generated PDFs use font:" msgstr "Kreiraj PDF" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -793,28 +807,28 @@ msgid "hour" msgstr "sat" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 #, fuzzy msgid "hours." msgstr "sat" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "Id" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "ID" @@ -850,12 +864,12 @@ msgstr "ažuriraj uvoz: #" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 #, fuzzy msgid "Import review" msgstr "Uvezeno" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 #, fuzzy msgid "Import Schedule" msgstr "Raspored" @@ -881,8 +895,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "Uvozi" @@ -899,7 +913,7 @@ msgid "invalid email" msgstr "nevažeći email" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "nevažeći unos" @@ -915,7 +929,7 @@ msgid "June" msgstr "Lipanj" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "Tip" @@ -927,14 +941,14 @@ msgid "Last refresh:" msgstr "Posljednje ažuriranje:" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 #, fuzzy msgid "Later" msgstr "Najnovije" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 #, fuzzy msgid "Latest measurement" msgstr "Mjerenje" @@ -979,7 +993,7 @@ msgid "Logs" msgstr "Zapisi" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "LOS" @@ -1033,13 +1047,13 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 #, fuzzy msgid "Measurement is within" msgstr "Mjerenje" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 #, fuzzy msgid "measurements" msgstr "Mjerenje" @@ -1074,7 +1088,7 @@ msgid "month" msgstr "mjesec" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 #, fuzzy msgid "monthly" msgstr "Mjesečno" @@ -1150,11 +1164,16 @@ msgid "No features identified." msgstr "Nema identificiranih objekata." +#: src/components/identify/Identify.vue:412 +#, fuzzy +msgid "No measurement available" +msgstr "Mjerenje" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "Nema rezultata." -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1162,7 +1181,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1170,8 +1189,8 @@ msgid "November" msgstr "Studeni" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1191,7 +1210,7 @@ msgid "of" msgstr "od" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1212,8 +1231,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1256,7 +1275,7 @@ msgid "pending" msgstr "Na čekanju" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1364,7 +1383,7 @@ msgid "Please enter an originator" msgstr "Unesite završnu točku" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "Unesite točne koordinate u formatu: Lat,Lon,Lat,Lon" @@ -1393,7 +1412,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1405,11 +1424,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "Profil obrisan!" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "Profil spremljen!" @@ -1417,7 +1436,7 @@ msgid "Projection" msgstr "Projekcija" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1426,7 +1445,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Kritični sektori" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1457,7 +1476,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1486,7 +1505,7 @@ msgid "Role" msgstr "Uloga" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1503,7 +1522,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "Spremljeni poprečni profili" @@ -1511,7 +1530,7 @@ msgid "Saved import: #" msgstr "Spremljen uvoz: #" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1519,7 +1538,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "Raspored" @@ -1538,7 +1557,7 @@ msgid "Sections" msgstr "Projekcija" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1548,21 +1567,21 @@ msgid "Select Bottleneck" msgstr "Odaberi Kritični sektor" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 #, fuzzy msgid "Select stretch" msgstr "Definiraj dionice" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1582,23 +1601,23 @@ msgid "September" msgstr "Rujan" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "Potpisnik" @@ -1667,7 +1686,7 @@ msgid "Staging Area" msgstr "Pristanište" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "Početak" @@ -1688,7 +1707,22 @@ msgid "Starting import of section" msgstr "Započinje uvoz dionice" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +#, fuzzy +msgid "Starting Month" +msgstr "započinje uvoz za " + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +#, fuzzy +msgid "Starting Quarter" +msgstr "Pristanište" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +#, fuzzy +msgid "Starting Year" +msgstr "Pristanište" + +#: src/components/importoverview/ImportOverview.vue:200 #, fuzzy msgid "Status" msgstr "Stanje" @@ -1718,12 +1752,12 @@ msgid "Sunday" msgstr "Nedjelja" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1756,7 +1790,7 @@ msgid "Testmail sent" msgstr "E-mail je poslan" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1765,13 +1799,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1804,19 +1838,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1839,9 +1873,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1869,7 +1903,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1893,8 +1929,8 @@ msgid "Tuesday" msgstr "Utorak" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 msgid "Type" msgstr "Tip" @@ -1984,17 +2020,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -2057,11 +2093,11 @@ msgid "Weekly" msgstr "Tjedno" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -2069,7 +2105,7 @@ msgid "year" msgstr "godina" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "godina" @@ -2079,7 +2115,7 @@ msgid "yes" msgstr "Slojevi" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2088,6 +2124,14 @@ "profili\" da biste vratili ovaj poprečni profil." #, fuzzy +#~ msgid "Date from" +#~ msgstr "Datum" + +#, fuzzy +#~ msgid "Date to" +#~ msgstr "Datum" + +#, fuzzy #~ msgid "Delete survey" #~ msgstr "Brisanje " @@ -2184,9 +2228,6 @@ #~ msgid "Rejected" #~ msgstr "Odbijen" -#~ msgid "Staging area" -#~ msgstr "Pristanište" - #~ msgid "Startpoint is not before endpoint." #~ msgstr "Početna točka nije prije završne točke."
--- a/client/src/locale/hu_HU/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/hu_HU/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -55,7 +55,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -67,7 +67,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -105,7 +105,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -129,15 +129,15 @@ msgid "August" msgstr "Augusztus" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 -msgid "Avail: Latest measurement from" +#: src/components/identify/Identify.vue:416 +msgid "Avail: Latest measurement from " msgstr "" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 msgid "Avail: Latest measurement older than" msgstr "" @@ -145,19 +145,19 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "hajóút mélysége" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 #, fuzzy msgid "Available Fairway Depth" msgstr "hajóút mélysége" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 #, fuzzy msgid "Available fairway depth vs LNWL" msgstr "hajóút mélysége" @@ -175,28 +175,28 @@ msgid "back to login" msgstr "vissza a bejelentkezéshez" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -207,14 +207,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -225,7 +226,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -239,7 +240,7 @@ msgid "BeamType" msgstr "Típus" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 #, fuzzy msgid "Bottleneck" @@ -249,7 +250,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" @@ -266,15 +267,16 @@ msgid "Bottlenecks" msgstr "Gázlók" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" msgstr "" @@ -313,23 +315,23 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 msgid "Compare to" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -337,19 +339,19 @@ msgid "Configuration" msgstr "" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -361,23 +363,27 @@ msgid "Cronstring" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -388,23 +394,15 @@ msgid "Date" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -msgid "Date from" -msgstr "" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -msgid "Date to" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 msgid "Day" msgstr "" @@ -432,22 +430,22 @@ msgid "Define Stretches" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 msgid "Delete cross profile" msgstr "" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 msgid "Delete Import" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 msgid "Delete Template" msgstr "" @@ -463,15 +461,15 @@ msgid "deleted" msgstr "" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 msgid "deleted successfully" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -481,19 +479,19 @@ msgid "Depth" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -517,11 +515,11 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -529,7 +527,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -541,11 +539,11 @@ msgid "Download Meta.json" msgstr "" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 #, fuzzy msgid "Email" @@ -566,15 +564,27 @@ msgid "End rhm" msgstr "" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "" @@ -615,6 +625,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -651,11 +665,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 msgid "Fairwayprofile" msgstr "" @@ -679,7 +693,7 @@ msgid "File Import" msgstr "" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -700,7 +714,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -712,11 +728,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -732,16 +748,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 #, fuzzy msgid "Generated by" msgstr "- létrehozta:" @@ -750,7 +766,7 @@ msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -758,27 +774,27 @@ msgid "hour" msgstr "" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 msgid "hours." msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "" @@ -812,11 +828,11 @@ msgstr "" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 msgid "Import review" msgstr "" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 msgid "Import Schedule" msgstr "" @@ -838,8 +854,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "" @@ -855,7 +871,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "" @@ -871,7 +887,7 @@ msgid "June" msgstr "" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "" @@ -883,13 +899,13 @@ msgid "Last refresh:" msgstr "" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 msgid "Later" msgstr "" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 msgid "Latest measurement" msgstr "" @@ -930,7 +946,7 @@ msgid "Logs" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "" @@ -983,12 +999,12 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 msgid "Measurement is within" msgstr "" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 msgid "measurements" msgstr "" @@ -1022,7 +1038,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 msgid "monthly" msgstr "" @@ -1096,11 +1112,15 @@ msgid "No features identified." msgstr "" +#: src/components/identify/Identify.vue:412 +msgid "No measurement available" +msgstr "" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "" -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1108,7 +1128,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1116,8 +1136,8 @@ msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1137,7 +1157,7 @@ msgid "of" msgstr "" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1157,8 +1177,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1198,7 +1218,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1306,7 +1326,7 @@ msgid "Please enter an originator" msgstr "Kérem, válasszon országot" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1335,7 +1355,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1347,11 +1367,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "" @@ -1359,7 +1379,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1368,7 +1388,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Gázlók" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1397,7 +1417,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1426,7 +1446,7 @@ msgid "Role" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1443,7 +1463,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "" @@ -1451,7 +1471,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1459,7 +1479,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "" @@ -1476,7 +1496,7 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1486,20 +1506,20 @@ msgid "Select Bottleneck" msgstr "" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 msgid "Select stretch" msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1520,23 +1540,23 @@ msgid "September" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "" @@ -1598,7 +1618,7 @@ msgid "Staging Area" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "" @@ -1618,7 +1638,19 @@ msgid "Starting import of section" msgstr "" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +msgid "Starting Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +msgid "Starting Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +msgid "Starting Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:200 msgid "Status" msgstr "" @@ -1645,12 +1677,12 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1682,7 +1714,7 @@ msgid "Testmail sent" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1691,13 +1723,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1730,19 +1762,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1765,9 +1797,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1793,7 +1825,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1817,8 +1851,8 @@ msgid "Tuesday" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 #, fuzzy msgid "Type" @@ -1904,17 +1938,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -1972,11 +2006,11 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -1984,7 +2018,7 @@ msgid "year" msgstr "Év" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "Év" @@ -1994,7 +2028,7 @@ msgid "yes" msgstr "Rétegek" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/locale/ro_RO/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/ro_RO/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: gemmajs 1.99.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-25 10:11+0100\n" -"PO-Revision-Date: 2019-06-03 08:01+0000\n" +"PO-Revision-Date: 2019-10-03 15:56+0000\n" "Last-Translator: MANESCU CARMEN <compania@acn.ro>\n" "Language-Team: Romanian <https://hosted.weblate.org/projects/gemma/client/ro/" ">\n" @@ -18,11 +18,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 3.7-dev\n" +"X-Generator: Weblate 3.9-dev\n" #: src/components/systemconfiguration/PDFTemplates.vue:216 msgid " does not match any template's element" -msgstr "" +msgstr " 'niciun element din template nu se potriveste" #: src/components/importconfiguration/types/WaterwayProfiles.vue:189 msgid " was successfully uploaded." @@ -30,15 +30,15 @@ #: src/components/systemconfiguration/ColorSettings.vue:21 msgid "%{layerName} Border Color" -msgstr "" +msgstr "%{layerName} Culoare chenar" #: src/components/systemconfiguration/ColorSettings.vue:7 msgid "%{layerName} Fill Color" -msgstr "" +msgstr "%{layerName} Culoarea de umplere" #: src/components/importconfiguration/ScheduledImports.vue:674 msgid "0 means no retry" -msgstr "" +msgstr "0 inseamna nicio intrare" #: src/components/Pdftool.vue:41 msgid "120 dpi" @@ -54,21 +54,21 @@ #: src/components/importconfiguration/ScheduledImports.vue:663 msgid "2h45m for for two hours and 45 Minutes" -msgstr "" - -#: src/components/importoverview/ImportOverview.vue:52 +msgstr "2h45m pentru doua ore si 45 de minute" + +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "30 zile" #: src/components/importconfiguration/ScheduledImports.vue:663 msgid "30m for 30 Minutes" -msgstr "" +msgstr "30m pentru 30 minute" #: src/components/importconfiguration/ScheduledImports.vue:662 msgid "60 for 60 Seconds " -msgstr "" - -#: src/components/importoverview/ImportOverview.vue:49 +msgstr "60 pentru 60 secunde " + +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "7 zile" @@ -94,7 +94,7 @@ #: src/components/identify/Identify.vue:74 msgid "According gauge data:" -msgstr "" +msgstr "Conform date statie de masura nivel:" #: src/components/usermanagement/Userdetail.vue:242 #: src/components/usermanagement/Usermanagement.vue:82 @@ -105,7 +105,7 @@ msgid "Additional Info" msgstr "Informaţii suplimentare" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "aprobat" @@ -129,41 +129,37 @@ msgid "August" msgstr "August" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" -msgstr "" - -#: src/components/identify/Identify.vue:414 -#, fuzzy -msgid "Avail: Latest measurement from" -msgstr "Ultima Masuratoare" - -#: src/components/identify/Identify.vue:428 -#, fuzzy +msgstr "Disponibil: Sub prag" + +#: src/components/identify/Identify.vue:416 +msgid "Avail: Latest measurement from " +msgstr "DUltima Masuratoare " + +#: src/components/identify/Identify.vue:430 msgid "Avail: Latest measurement older than" -msgstr "Ultima Masuratoare" +msgstr "Disponibil :Ultima masuratoare mai veche decat" #: src/components/systemconfiguration/DataAccuracy.vue:61 -#, fuzzy msgid "Availability of Gauge Measurements" -msgstr "Incepe importul nivelurilor oficiale" - -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +msgstr "Disponbilitatea masuratoriilor statiilor de masura nivel" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 #, fuzzy msgid "Available fairway depth" msgstr "Adâncimi disponibile în şenal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 #, fuzzy msgid "Available Fairway Depth" msgstr "Adâncimi disponibile în şenal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 -#, fuzzy +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 msgid "Available fairway depth vs LNWL" -msgstr "Adâncimi disponibile în şenal" +msgstr "Adâncimi disponibile în şenal vs LNWL" #: src/components/importconfiguration/ImportDetails.vue:35 msgid "Available fairway depths" @@ -172,34 +168,34 @@ #: src/components/sections/SectionForm.vue:178 #: src/components/stretches/StretchForm.vue:18 msgid "Back" -msgstr "" +msgstr "Inapoi" #: src/components/Login.vue:70 msgid "back to login" msgstr "inapoi la login" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -210,14 +206,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -228,7 +225,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -238,24 +235,22 @@ msgstr "Eroare Server" #: src/components/importconfiguration/types/Soundingresults.vue:56 -#, fuzzy msgid "BeamType" -msgstr "Tip" - -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +msgstr "Tip fascicul" + +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Punct critic" #: src/components/systemconfiguration/Systemconfiguration.vue:52 msgid "Bottleneck Morphology Classbreaks" -msgstr "" - -#: src/components/fairway/BottleneckDialogue.vue:339 +msgstr "Izobate" + +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 -#, fuzzy msgid "Bottleneck Surveys" -msgstr "Puncte critice" +msgstr "Masuratori Puncte critice" #: src/components/importoverview/SoundingResultDetail.vue:7 #, fuzzy @@ -268,15 +263,16 @@ msgid "Bottlenecks" msgstr "Puncte critice" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" -msgstr "" - -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +msgstr "Calcul diferente" + +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" msgstr "Anulaţi" @@ -291,11 +287,11 @@ #: src/components/sections/SectionForm.vue:251 msgid "Choose a distance mark by clicking on the map." -msgstr "" +msgstr "Alege o distanta printr-un clic pe harta" #: src/components/systemconfiguration/MorphologyClassbreaks.vue:301 msgid "Choose color" -msgstr "" +msgstr "Alege o culoare" #: src/components/importconfiguration/ScheduledImports.vue:499 #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:97 @@ -314,45 +310,48 @@ "Colour changes need a map reload. Value changes need a de- and re-select\n" " of a difference calculation. Inform your users!" msgstr "" - -#: src/components/importoverview/ImportOverview.vue:17 +"Schimbarile de culoare au nevoie de o reincarcare a hartii. Schimbarile de " +"valoare au nevoie de un de-și re-select\n" +" a unui calcul al diferentei. Informati-va utilizatorii!" + +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "aproba" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 #, fuzzy msgid "Compare to" msgstr "Compara cu" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "Compara cu" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" -msgstr "" - -#: src/components/identify/Identify.vue:450 +msgstr "Sigure pentru 24 ore" + +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" -msgstr "" +msgstr "Sigure pentru 72 de ore" #: src/components/Sidebar.vue:65 msgid "Configuration" msgstr "Configurare" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "Confirmă" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "Coordonate copiate in memorie !" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -363,26 +362,30 @@ msgid "Cronstring" msgstr "Sir cronologic" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 #, fuzzy msgid "Current Waterlevel" msgstr "Nivelul apei" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" -msgstr "" - -#: src/components/identify/Identify.vue:483 +msgstr "Disponibilitate Date/ Acuratete" + +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" -msgstr "" - -#: src/components/identify/Identify.vue:478 +msgstr "Date prea vechi. Limita:" + +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" -msgstr "" - -#: src/components/identify/Identify.vue:473 +msgstr "Date in limita revizuita" + +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" -msgstr "" +msgstr "Date cu timp de revizuire" #: src/components/importconfiguration/types/Soundingresults.vue:94 #: src/components/sections/Sections.vue:127 @@ -391,25 +394,15 @@ msgid "Date" msgstr "Data" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -#, fuzzy -msgid "Date from" -msgstr "Dată informaţii" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "Dată informaţii" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -#, fuzzy -msgid "Date to" -msgstr "Dată informaţii" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "zi" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 msgid "Day" msgstr "Ziua" @@ -439,22 +432,22 @@ msgid "Define Stretches" msgstr "Defineşte sectoarele" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "Șterge" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 msgid "Delete cross profile" msgstr "Sterge profile transversale" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 msgid "Delete Import" msgstr "Sterge importul" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 msgid "Delete Template" msgstr "Sterge templat-ul" @@ -471,15 +464,15 @@ msgid "deleted" msgstr "Șterge" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "Import sters: #" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 msgid "deleted successfully" msgstr "sterse cu succes" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -489,31 +482,29 @@ msgid "Depth" msgstr "Adâncime" -#: src/components/fairway/BottleneckDialogue.vue:48 -#, fuzzy +#: src/components/fairway/BottleneckDialogue.vue:52 msgid "Depth Reference" -msgstr "Adâncimea de eeferinţă" - -#: src/components/Pdftool.vue:720 +msgstr "Adâncimea de referinţă" + +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "Adâncime relativă la" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" -msgstr "" - -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +msgstr "Adancimea limita 1 [m]" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" -msgstr "" +msgstr "Adancimea limita 2 [m]" #: src/components/importconfiguration/types/Soundingresults.vue:74 msgid "Depthreference" msgstr "Adâncimea de eeferinţă" #: src/components/identify/formatter.js:68 -#, fuzzy msgid "Distance Mark" -msgstr "Marcaj distanță pe uscat" +msgstr "Marcaj distanță" #: src/components/identify/formatter.js:71 #, fuzzy @@ -528,11 +519,11 @@ msgid "Distance marks virtual" msgstr "Marcaj distanță virtual" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "Chiar vrei să ştergi profilul transversal:" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "Chiar vrei să ştergi următorul cont de utilizator:" @@ -540,7 +531,7 @@ msgid "Do you really want to delete the following user account:" msgstr "Chiar vrei să ştergi următorul cont de utilizator:" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "Chiar vrei să ştergi importul cu ID" @@ -552,11 +543,11 @@ msgid "Download Meta.json" msgstr "Descarcă Meta.json" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "Mai devreme" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 msgid "Email" msgstr "E-mail" @@ -576,15 +567,27 @@ msgid "End rhm" msgstr "Rhm final" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "Sfarsitul lunii" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "Sfarsit patrar" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "Sfarsit An" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "In asteptare" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "Introdu coordonatele manual" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "Introdu eticheta pentru profil transversal" @@ -614,16 +617,21 @@ #: src/components/importconfiguration/ScheduledImports.vue:660 msgid "Examples:" -msgstr "" +msgstr "Exemple:" #: src/components/gauge/HydrologicalConditions.vue:71 #: src/components/gauge/Waterlevel.vue:58 msgid "Export as CSV" -msgstr "" +msgstr "Export in format CSV" #: src/components/gauge/Waterlevel.vue:9 msgid "Export as SVG" -msgstr "" +msgstr "Export in format SVG" + +#: src/components/importoverview/ImportOverview.vue:238 +#, fuzzy +msgid "Export logs" +msgstr "Export in format CSV" #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 @@ -631,7 +639,7 @@ #: src/components/gauge/HydrologicalConditions.vue:60 #: src/components/gauge/Waterlevel.vue:48 msgid "Export to PDF" -msgstr "" +msgstr "Export in format PDF" #: src/components/importoverview/Filters.vue:12 msgid "failed" @@ -639,12 +647,11 @@ #: src/components/map/MapPopup.vue:168 msgid "Fairway Availability" -msgstr "" +msgstr "Disponibilitate Senal navigabil" #: src/components/identify/formatter.js:32 -#, fuzzy msgid "Fairway Critical" -msgstr "Profile ale caii navigabile" +msgstr "Senal navigabil critic" #: src/components/identify/formatter.js:31 #, fuzzy @@ -662,16 +669,15 @@ #: src/components/fairway/AvailableFairwayDepth.vue:209 msgid "fairwayavailability" -msgstr "" - -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +msgstr "disponibilitate senal navigabil" + +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" -msgstr "" - -#: src/components/fairway/Fairwayprofile.vue:197 -#, fuzzy +msgstr "disponibilitate senal navigabil LNWL" + +#: src/components/fairway/Fairwayprofile.vue:200 msgid "Fairwayprofile" -msgstr "Profile ale caii navigabile" +msgstr "Profilul Senalului navigabil" #: src/components/importconfiguration/types/Distancemarksashore.vue:25 #: src/components/importconfiguration/types/Fairwaydimensions.vue:25 @@ -693,7 +699,7 @@ msgid "File Import" msgstr "Importa fisier" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "Finalizare reviziune" @@ -714,7 +720,9 @@ msgid "from" msgstr "de la" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "De la" @@ -723,15 +731,14 @@ msgstr "" #: src/components/identify/formatter.js:102 -#, fuzzy msgid "Gauge" -msgstr "Mire" - -#: src/components/systemconfiguration/DataAccuracy.vue:195 +msgstr "Mira" + +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -745,20 +752,19 @@ msgstr "Nivelul apei" #: src/components/identify/formatter.js:37 -#, fuzzy msgid "Gauge Waterlevel Date" -msgstr "Nivelul apei" - -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +msgstr "Data Nivel apa" + +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "Mire" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "Genereaza PDF" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 msgid "Generated by" msgstr "Generat de" @@ -766,50 +772,48 @@ msgid "Generated PDFs use font:" msgstr "Genereaza PDF-uri:" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" -msgstr "" +msgstr "Siguranta maxima" #: src/components/importconfiguration/ScheduledImports.vue:1062 msgid "hour" msgstr "ora" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "Ora" -#: src/components/systemconfiguration/DataAccuracy.vue:116 -#, fuzzy +#: src/components/systemconfiguration/DataAccuracy.vue:117 msgid "hours." -msgstr "ora" - -#: src/components/gauge/HydrologicalConditions.vue:150 +msgstr "ore." + +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "Conditii hidrologice" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 #, fuzzy msgid "hydrological-conditions" msgstr "Conditii hidrologice" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "Eticheta" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "Eticheta" #: src/components/identify/Identify.vue:294 src/components/map/MapPopup.vue:148 #: src/components/toolbar/Identify.vue:49 -#, fuzzy msgid "Identified Features" -msgstr "Identificat" +msgstr "Functionalitati identificate" #: src/components/importconfiguration/ScheduledImports.vue:668 msgid "If there is no error during import, there will be no retry" -msgstr "" +msgstr "Daca nu sunt erori in timpul importului, nu vor mai fi reluari" #: src/components/importconfiguration/ScheduledImports.vue:911 #: src/components/importconfiguration/ScheduledImports.vue:991 @@ -831,11 +835,11 @@ msgstr "importă importul: #" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 msgid "Import review" msgstr "Revizuire Import" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 msgid "Import Schedule" msgstr "Import plan" @@ -844,9 +848,8 @@ msgstr "Import rezultate masuratori" #: src/components/importconfiguration/ImportDetails.vue:5 -#, fuzzy msgid "Import type" -msgstr "Import" +msgstr "Tip Import" #: src/components/importconfiguration/ScheduledImports.vue:29 msgid "Import via" @@ -858,8 +861,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "Importuri" @@ -876,7 +879,7 @@ msgid "invalid email" msgstr "adresa de email nevalabila" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "Inregistrare nevalida" @@ -892,7 +895,7 @@ msgid "June" msgstr "Iunie" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "Tip" @@ -904,13 +907,13 @@ msgid "Last refresh:" msgstr "Ultima actualizare:" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 msgid "Later" msgstr "Mai tarziu" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 #, fuzzy msgid "Latest measurement" msgstr "Ultima Masuratoare" @@ -920,14 +923,12 @@ msgstr "Ultima Masuratoare" #: src/components/identify/formatter.js:106 -#, fuzzy msgid "Latest Waterlevel" -msgstr "Nivelul apei" +msgstr "Ultimul nivel al apei" #: src/components/identify/formatter.js:105 -#, fuzzy msgid "Latest Waterlevel Date" -msgstr "Nivelul apei" +msgstr "Data ultimului nivel al apei" #: src/components/systemconfiguration/MapLayers.vue:18 #, fuzzy @@ -954,7 +955,7 @@ msgid "Logs" msgstr "Loguri" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "LOS" @@ -971,9 +972,8 @@ #: src/components/layers/Layers.vue:73 #: src/components/systemconfiguration/Systemconfiguration.vue:31 #: src/components/toolbar/Layers.vue:35 -#, fuzzy msgid "Map Layers" -msgstr "Straturi" +msgstr "Straturi harta" #: src/components/importconfiguration/ScheduledImports.vue:1080 msgid "March" @@ -981,7 +981,7 @@ #: src/components/importconfiguration/ScheduledImports.vue:668 msgid "Maximum retry count" -msgstr "" +msgstr "Maxim incercari" #: src/components/importconfiguration/types/Fairwaydimensions.vue:131 msgid "MaxWidth" @@ -993,40 +993,37 @@ #: src/components/toolbar/Polygontool.vue:31 msgid "Measure Area" -msgstr "" +msgstr "Aria masurata" #: src/components/toolbar/Linetool.vue:28 msgid "Measure Distance" -msgstr "" +msgstr "Distanta masurata" #: src/components/identify/Identify.vue:16 -#, fuzzy msgid "Measurement" -msgstr "Ultima Masuratoare" +msgstr "Masuratoare" #: src/components/identify/formatter.js:108 msgid "Measurement Count in Last 14 Days" -msgstr "" - -#: src/components/identify/Identify.vue:416 -#, fuzzy +msgstr "Masuratori in ultimele 14 zile" + +#: src/components/identify/Identify.vue:418 msgid "Measurement is within" -msgstr "Ultima Masuratoare" - -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 -#, fuzzy +msgstr "Masuratoare este in" + +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 msgid "measurements" -msgstr "Ultima Masuratoare" +msgstr "Masuratori" #: src/components/systemconfiguration/DataAccuracy.vue:97 msgid "measurements in the last 14 days." -msgstr "" +msgstr "masuratori in ultimele 14 zile" #: src/components/identify/formatter.js:85 #: src/components/identify/formatter.js:96 msgid "Min. G.W. Count in Last 14 Days" -msgstr "" +msgstr "Min. nivel masurat in ultimele 14 zile" #: src/components/identify/formatter.js:83 #: src/components/identify/formatter.js:94 @@ -1049,7 +1046,7 @@ msgid "month" msgstr "luna" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 #, fuzzy msgid "monthly" msgstr "Lunar" @@ -1073,12 +1070,12 @@ #: src/components/identify/Identify.vue:352 #: src/components/identify/Identify.vue:355 msgid "Nash-Sutcliffe" -msgstr "" +msgstr "Nash-Sutcliffe" #: src/components/identify/Identify.vue:326 #: src/components/identify/Identify.vue:357 msgid "Nash-Sutcliffe not available" -msgstr "" +msgstr "Nash-Sutcliffe nu este disponbil" #: src/components/sections/SectionForm.vue:131 msgid "National Object name" @@ -1086,7 +1083,7 @@ #: src/components/importconfiguration/types/Soundingresults.vue:111 msgid "Negate Z values in XYZ files" -msgstr "" +msgstr "Anuleaza valorile Z in fisierul XYZ" #: src/components/importconfiguration/ScheduledImports.vue:671 msgid "Negative values mean endless retry" @@ -1103,9 +1100,8 @@ msgstr "Import nou" #: src/components/sections/Sections.vue:66 -#, fuzzy msgid "New section" -msgstr "Sector nou" +msgstr "Sectiune noua" #: src/components/stretches/Stretches.vue:72 msgid "New stretch" @@ -1113,7 +1109,7 @@ #: src/components/identify/formatter.js:9 msgid "no" -msgstr "" +msgstr "nu" #: src/components/fairway/Fairwayprofile.vue:92 #: src/components/gauge/HydrologicalConditions.vue:79 @@ -1125,19 +1121,24 @@ msgid "No features identified." msgstr "Nicio caracteristica identificata." +#: src/components/identify/Identify.vue:412 +#, fuzzy +msgid "No measurement available" +msgstr "Nu sunt disponibile date." + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "Niciun rezultat." -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" -msgstr "" +msgstr "Nu e definit timpul de revizuire" #: src/components/systemconfiguration/ColorSettings.vue:272 msgid "No style-changes" -msgstr "" - -#: src/components/identify/Identify.vue:469 +msgstr "Nicio schimbare a stilului" + +#: src/components/identify/Identify.vue:471 #, fuzzy msgid "No survey-data available" msgstr "Nu sunt disponibile date." @@ -1146,8 +1147,8 @@ msgid "November" msgstr "Noiembrie" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "Acum" @@ -1167,7 +1168,7 @@ msgid "of" msgstr "al" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "de tipul" @@ -1180,18 +1181,17 @@ msgstr "inchis, in" #: src/components/importconfiguration/ImportDetails.vue:130 -#, fuzzy msgid "Onetime Imports" -msgstr "Sterge importul" +msgstr "Importa o singura data" #: src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue:153 msgid "originator" msgstr "initiator" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" -msgstr "" +msgstr "Proprietar" #: src/components/usermanagement/Userdetail.vue:212 msgid "password" @@ -1231,9 +1231,9 @@ msgid "pending" msgstr "in asteptare" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" -msgstr "" +msgstr "Procent" #: src/components/usermanagement/Userdetail.vue:285 msgid "Please choose a country" @@ -1337,7 +1337,7 @@ msgid "Please enter an originator" msgstr "Introduceti un initiator" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "Introduceti coordonatele corecte, in format: Lat,Lon,Lat,Lon" @@ -1364,9 +1364,9 @@ #: src/components/importconfiguration/ScheduledImports.vue:674 msgid "Positive values are the upper limit for retries" -msgstr "" - -#: src/components/identify/Identify.vue:455 +msgstr "Valorile pozitive sunt mai sus decat limita pentru reluari" + +#: src/components/identify/Identify.vue:457 #, fuzzy msgid "Predictions not available" msgstr "Nu sunt disponibile date." @@ -1379,11 +1379,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "Profil sters!" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "Profil salvat!" @@ -1391,7 +1391,7 @@ msgid "Projection" msgstr "Proiectie" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1400,7 +1400,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Puncte critice" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "Mira de referinta" @@ -1431,7 +1431,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1460,7 +1460,7 @@ msgid "Role" msgstr "Rol" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1477,7 +1477,7 @@ msgid "Save" msgstr "Salvare" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "Profile transversale salvate" @@ -1485,7 +1485,7 @@ msgid "Saved import: #" msgstr "Import salvat: #" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "Scara" @@ -1494,7 +1494,7 @@ msgid "Scale to 1:" msgstr "Scara" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "Plan, orar" @@ -1513,7 +1513,7 @@ msgid "Sections" msgstr "Proiectie" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1523,22 +1523,22 @@ msgid "Select Bottleneck" msgstr "Selecteaza punct critic" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "Selecteaza miră" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 #, fuzzy msgid "Select section" msgstr "Selecteaza miră" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 #, fuzzy msgid "Select stretch" msgstr "Sterge sectorul" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1558,25 +1558,25 @@ msgid "September" msgstr "Septembrie" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 #, fuzzy msgid "Show differences" msgstr "Arata Nivelurile apei" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "Arată Condițiile Hidrologice" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 #, fuzzy msgid "Show survey" msgstr "Masuratoare" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "Arata Nivelurile apei" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "Semnatar" @@ -1644,7 +1644,7 @@ msgid "Staging Area" msgstr "Debarcader" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "Porneste" @@ -1665,7 +1665,22 @@ msgid "Starting import of section" msgstr "Incepe importul secțiunii" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +#, fuzzy +msgid "Starting Month" +msgstr "Incepe importul pentru: " + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +#, fuzzy +msgid "Starting Quarter" +msgstr "Debarcader" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +#, fuzzy +msgid "Starting Year" +msgstr "Debarcader" + +#: src/components/importoverview/ImportOverview.vue:200 msgid "Status" msgstr "Stare" @@ -1694,12 +1709,12 @@ msgid "Sunday" msgstr "Duminica" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "Masuratoare" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "Data masuratorii" @@ -1733,7 +1748,7 @@ msgid "Testmail sent" msgstr "E-mail-ul de test a fost trimis" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1742,13 +1757,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1781,19 +1796,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1816,9 +1831,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1847,7 +1862,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "La" @@ -1872,8 +1889,8 @@ msgid "Tuesday" msgstr "Marti" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 msgid "Type" msgstr "Tip" @@ -1966,18 +1983,18 @@ msgid "warning" msgstr "avertisment" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "Nivelul apei" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 #, fuzzy msgid "Waterlevel [m]" msgstr "Nivelul apei [cm]" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 #, fuzzy msgid "waterlevels" msgstr "Nivelul apei" @@ -2040,11 +2057,11 @@ msgid "Weekly" msgstr "Saptamanal" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -2052,7 +2069,7 @@ msgid "year" msgstr "an" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "an" @@ -2062,7 +2079,7 @@ msgid "yes" msgstr "Straturi" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile." @@ -2071,6 +2088,14 @@ "\" pentru a restaura profilul transversal." #, fuzzy +#~ msgid "Date from" +#~ msgstr "Dată informaţii" + +#, fuzzy +#~ msgid "Date to" +#~ msgstr "Dată informaţii" + +#, fuzzy #~ msgid "days." #~ msgstr "7 zile" @@ -2185,9 +2210,6 @@ #~ msgid "Rejected" #~ msgstr "Respins" -#~ msgid "Staging area" -#~ msgstr "Debarcader" - #~ msgid "Startpoint is not before endpoint." #~ msgstr "Punctul de început nu este înainte de cel de sfârșit."
--- a/client/src/locale/sk_SK/LC_MESSAGES/app.po Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/locale/sk_SK/LC_MESSAGES/app.po Fri Oct 04 16:40:04 2019 +0200 @@ -55,7 +55,7 @@ msgid "2h45m for for two hours and 45 Minutes" msgstr "" -#: src/components/importoverview/ImportOverview.vue:52 +#: src/components/importoverview/ImportOverview.vue:55 msgid "30 Days" msgstr "" @@ -67,7 +67,7 @@ msgid "60 for 60 Seconds " msgstr "" -#: src/components/importoverview/ImportOverview.vue:49 +#: src/components/importoverview/ImportOverview.vue:52 msgid "7 days" msgstr "" @@ -104,7 +104,7 @@ msgid "Additional Info" msgstr "" -#: src/components/importoverview/ImportOverview.vue:393 +#: src/components/importoverview/ImportOverview.vue:469 msgid "approved" msgstr "" @@ -128,15 +128,15 @@ msgid "August" msgstr "" -#: src/components/identify/Identify.vue:422 +#: src/components/identify/Identify.vue:424 msgid "Avail: Below treshold" msgstr "" -#: src/components/identify/Identify.vue:414 -msgid "Avail: Latest measurement from" +#: src/components/identify/Identify.vue:416 +msgid "Avail: Latest measurement from " msgstr "" -#: src/components/identify/Identify.vue:428 +#: src/components/identify/Identify.vue:430 msgid "Avail: Latest measurement older than" msgstr "" @@ -144,17 +144,17 @@ msgid "Availability of Gauge Measurements" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:230 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:440 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:330 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:558 #: src/components/toolbar/AvailableFairwayDepth.vue:35 msgid "Available fairway depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:628 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:856 msgid "Available Fairway Depth" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:237 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:337 msgid "Available fairway depth vs LNWL" msgstr "" @@ -171,28 +171,28 @@ msgid "back to login" msgstr "" -#: src/components/Bottlenecks.vue:188 src/components/Logs.vue:163 -#: src/components/Pdftool.vue:237 src/components/Pdftool.vue:828 +#: src/components/Bottlenecks.vue:192 src/components/Logs.vue:163 +#: src/components/Pdftool.vue:266 src/components/Pdftool.vue:853 #: src/components/Search.vue:260 src/components/Search.vue:299 #: src/components/fairway/AvailableFairwayDepth.vue:168 #: src/components/fairway/AvailableFairwayDepth.vue:271 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:528 -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:559 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:167 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:280 -#: src/components/fairway/BottleneckDialogue.vue:516 -#: src/components/fairway/BottleneckDialogue.vue:657 -#: src/components/fairway/Fairwayprofile.vue:312 -#: src/components/fairway/Fairwayprofile.vue:706 -#: src/components/gauge/HydrologicalConditions.vue:253 -#: src/components/gauge/HydrologicalConditions.vue:1058 -#: src/components/gauge/Waterlevel.vue:259 -#: src/components/gauge/Waterlevel.vue:1206 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:773 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:814 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:168 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:281 +#: src/components/fairway/BottleneckDialogue.vue:566 +#: src/components/fairway/BottleneckDialogue.vue:708 +#: src/components/fairway/Fairwayprofile.vue:322 +#: src/components/fairway/Fairwayprofile.vue:718 +#: src/components/gauge/HydrologicalConditions.vue:252 +#: src/components/gauge/HydrologicalConditions.vue:1057 +#: src/components/gauge/Waterlevel.vue:258 +#: src/components/gauge/Waterlevel.vue:1209 #: src/components/importconfiguration/Import.vue:130 #: src/components/importconfiguration/Import.vue:147 #: src/components/importconfiguration/Import.vue:166 -#: src/components/importconfiguration/Import.vue:197 -#: src/components/importconfiguration/Import.vue:278 +#: src/components/importconfiguration/Import.vue:196 +#: src/components/importconfiguration/Import.vue:277 #: src/components/importconfiguration/ScheduledImports.vue:846 #: src/components/importconfiguration/ScheduledImports.vue:918 #: src/components/importconfiguration/ScheduledImports.vue:1008 @@ -203,14 +203,15 @@ #: src/components/importconfiguration/types/Soundingresults.vue:357 #: src/components/importconfiguration/types/WaterwayProfiles.vue:197 #: src/components/importoverview/BottleneckDetail.vue:154 -#: src/components/importoverview/ImportOverview.vue:246 -#: src/components/importoverview/ImportOverview.vue:364 -#: src/components/importoverview/ImportOverview.vue:376 -#: src/components/importoverview/ImportOverview.vue:459 -#: src/components/importoverview/LogEntry.vue:161 -#: src/components/importoverview/SectionDetails.vue:109 -#: src/components/importoverview/StretchDetails.vue:140 -#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:214 +#: src/components/importoverview/ImportOverview.vue:293 +#: src/components/importoverview/ImportOverview.vue:322 +#: src/components/importoverview/ImportOverview.vue:440 +#: src/components/importoverview/ImportOverview.vue:452 +#: src/components/importoverview/ImportOverview.vue:539 +#: src/components/importoverview/LogEntry.vue:164 +#: src/components/importoverview/SectionDetails.vue:108 +#: src/components/importoverview/StretchDetails.vue:139 +#: src/components/layers/Layerselect.vue:158 src/components/map/Map.vue:277 #: src/components/sections/SectionForm.vue:339 #: src/components/sections/Sections.vue:170 #: src/components/sections/Sections.vue:180 @@ -221,7 +222,7 @@ #: src/components/stretches/Stretches.vue:246 #: src/components/systemconfiguration/PDFTemplates.vue:165 #: src/components/systemconfiguration/PDFTemplates.vue:254 -#: src/components/systemconfiguration/PDFTemplates.vue:292 +#: src/components/systemconfiguration/PDFTemplates.vue:290 #: src/components/usermanagement/Userdetail.vue:330 #: src/components/usermanagement/Usermanagement.vue:216 #: src/components/usermanagement/Usermanagement.vue:253 @@ -235,7 +236,7 @@ msgid "BeamType" msgstr "Typ" -#: src/components/Pdftool.vue:714 src/components/identify/formatter.js:26 +#: src/components/Pdftool.vue:734 src/components/identify/formatter.js:26 #: src/components/importconfiguration/types/Soundingresults.vue:13 msgid "Bottleneck" msgstr "Brody a úžiny" @@ -244,7 +245,7 @@ msgid "Bottleneck Morphology Classbreaks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:339 +#: src/components/fairway/BottleneckDialogue.vue:369 #: src/components/toolbar/Profiles.vue:35 #, fuzzy msgid "Bottleneck Surveys" @@ -261,15 +262,16 @@ msgid "Bottlenecks" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:118 +#: src/components/fairway/BottleneckDialogue.vue:122 msgid "Calculating differences" msgstr "" -#: src/components/Pdftool.vue:83 src/components/Popup.vue:28 -#: src/components/fairway/BottleneckDialogue.vue:687 -#: src/components/importconfiguration/Import.vue:204 -#: src/components/importoverview/ImportOverview.vue:448 -#: src/components/systemconfiguration/PDFTemplates.vue:331 +#: src/components/Pdftool.vue:83 src/components/Popup.vue:45 +#: src/components/fairway/BottleneckDialogue.vue:738 +#: src/components/importconfiguration/Import.vue:203 +#: src/components/importoverview/ImportOverview.vue:300 +#: src/components/importoverview/ImportOverview.vue:528 +#: src/components/systemconfiguration/PDFTemplates.vue:329 #: src/components/usermanagement/Usermanagement.vue:268 msgid "Cancel" msgstr "" @@ -308,23 +310,23 @@ " of a difference calculation. Inform your users!" msgstr "" -#: src/components/importoverview/ImportOverview.vue:17 +#: src/components/importoverview/ImportOverview.vue:20 msgid "Commit" msgstr "" -#: src/components/gauge/Gauges.vue:67 +#: src/components/gauge/Gauges.vue:72 msgid "Compare to" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:95 +#: src/components/fairway/BottleneckDialogue.vue:99 msgid "Compare with" msgstr "" -#: src/components/identify/Identify.vue:453 +#: src/components/identify/Identify.vue:455 msgid "Confidence per 24h" msgstr "" -#: src/components/identify/Identify.vue:450 +#: src/components/identify/Identify.vue:452 msgid "Confidence per 72h" msgstr "" @@ -332,19 +334,19 @@ msgid "Configuration" msgstr "" -#: src/components/Popup.vue:42 +#: src/components/Popup.vue:59 #: src/components/importconfiguration/types/Soundingresults.vue:188 #: src/components/importconfiguration/types/Soundingresults.vue:433 msgid "Confirm" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:561 +#: src/components/fairway/BottleneckDialogue.vue:611 msgid "Coordinates copied to clipboard!" msgstr "" #: src/components/Bottlenecks.vue:110 -#: src/components/importconfiguration/Import.vue:220 -#: src/components/importoverview/ImportOverview.vue:175 +#: src/components/importconfiguration/Import.vue:219 +#: src/components/importoverview/ImportOverview.vue:179 #: src/components/systemconfiguration/PDFTemplates.vue:123 #: src/components/usermanagement/Userdetail.vue:28 #: src/components/usermanagement/Usermanagement.vue:172 @@ -355,23 +357,27 @@ msgid "Cronstring" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:59 +#: src/components/fairway/BottleneckDialogue.vue:63 msgid "Current Waterlevel" msgstr "" +#: src/components/fairway/BottleneckDialogue.vue:157 +msgid "Custom Depth" +msgstr "" + #: src/components/systemconfiguration/Systemconfiguration.vue:40 msgid "Data Availability/Accuracy" msgstr "" -#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:491 msgid "Data too old. Treshold:" msgstr "" -#: src/components/identify/Identify.vue:478 +#: src/components/identify/Identify.vue:486 msgid "Data within revisiting treshold" msgstr "" -#: src/components/identify/Identify.vue:473 +#: src/components/identify/Identify.vue:481 msgid "Data within the revisiting time" msgstr "" @@ -382,23 +388,15 @@ msgid "Date" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:139 -msgid "Date from" -msgstr "" - #: src/components/sections/SectionForm.vue:144 msgid "Date info" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:150 -msgid "Date to" -msgstr "" - #: src/components/importconfiguration/ScheduledImports.vue:1063 msgid "day" msgstr "" -#: src/components/importoverview/ImportOverview.vue:47 +#: src/components/importoverview/ImportOverview.vue:50 #, fuzzy msgid "Day" msgstr "Mapa" @@ -427,22 +425,22 @@ msgid "Define Stretches" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:672 -#: src/components/importconfiguration/Import.vue:182 -#: src/components/systemconfiguration/PDFTemplates.vue:308 +#: src/components/fairway/BottleneckDialogue.vue:723 +#: src/components/importconfiguration/Import.vue:181 +#: src/components/systemconfiguration/PDFTemplates.vue:306 #: src/components/usermanagement/Usermanagement.vue:242 msgid "Delete" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:665 +#: src/components/fairway/BottleneckDialogue.vue:716 msgid "Delete cross profile" msgstr "" -#: src/components/importconfiguration/Import.vue:175 +#: src/components/importconfiguration/Import.vue:174 msgid "Delete Import" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:300 +#: src/components/systemconfiguration/PDFTemplates.vue:298 msgid "Delete Template" msgstr "" @@ -458,15 +456,15 @@ msgid "deleted" msgstr "" -#: src/components/importconfiguration/Import.vue:191 +#: src/components/importconfiguration/Import.vue:190 msgid "Deleted import: #" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:324 +#: src/components/systemconfiguration/PDFTemplates.vue:322 msgid "deleted successfully" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:650 +#: src/components/fairway/BottleneckDialogue.vue:701 #: src/components/sections/Sections.vue:197 #: src/components/stretches/Stretches.vue:221 msgid "Deleting " @@ -476,19 +474,19 @@ msgid "Depth" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:48 +#: src/components/fairway/BottleneckDialogue.vue:52 msgid "Depth Reference" msgstr "" -#: src/components/Pdftool.vue:720 +#: src/components/Pdftool.vue:740 msgid "Depth relativ to" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:164 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:253 msgid "Depthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:181 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:270 msgid "Depthlimit 2 [m]" msgstr "" @@ -512,11 +510,11 @@ msgid "Distance marks virtual" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:668 +#: src/components/fairway/BottleneckDialogue.vue:719 msgid "Do you really want to delete the cross profile:" msgstr "" -#: src/components/systemconfiguration/PDFTemplates.vue:302 +#: src/components/systemconfiguration/PDFTemplates.vue:300 msgid "Do you really want to delete the following template:" msgstr "" @@ -524,7 +522,7 @@ msgid "Do you really want to delete the following user account:" msgstr "" -#: src/components/importconfiguration/Import.vue:177 +#: src/components/importconfiguration/Import.vue:176 msgid "Do you really want to delete the import with ID" msgstr "" @@ -536,11 +534,11 @@ msgid "Download Meta.json" msgstr "" -#: src/components/importoverview/ImportOverview.vue:29 +#: src/components/importoverview/ImportOverview.vue:32 msgid "Earlier" msgstr "" -#: src/components/importconfiguration/Import.vue:264 +#: src/components/importconfiguration/Import.vue:263 #: src/components/usermanagement/Usermanagement.vue:175 msgid "Email" msgstr "E-mail" @@ -560,15 +558,27 @@ msgid "End rhm" msgstr "" -#: src/components/importoverview/ImportOverview.vue:187 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:201 +msgid "Ending Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:218 +msgid "Ending Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:238 +msgid "Ending Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:191 msgid "Enqueued" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:180 +#: src/components/fairway/BottleneckDialogue.vue:210 msgid "Enter coordinates manually" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:244 +#: src/components/fairway/BottleneckDialogue.vue:274 msgid "Enter label for cross profile" msgstr "" @@ -609,6 +619,10 @@ msgid "Export as SVG" msgstr "" +#: src/components/importoverview/ImportOverview.vue:238 +msgid "Export logs" +msgstr "" + #: src/components/fairway/AvailableFairwayDepth.vue:35 #: src/components/fairway/AvailableFairwayDepthLNWL.vue:35 #: src/components/fairway/Fairwayprofile.vue:81 @@ -645,11 +659,11 @@ msgid "fairwayavailability" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:208 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:209 msgid "fairwayavailabilityLNWL" msgstr "" -#: src/components/fairway/Fairwayprofile.vue:197 +#: src/components/fairway/Fairwayprofile.vue:200 msgid "Fairwayprofile" msgstr "" @@ -673,7 +687,7 @@ msgid "File Import" msgstr "" -#: src/components/importoverview/ImportOverview.vue:401 +#: src/components/importoverview/ImportOverview.vue:477 msgid "Finish Review" msgstr "" @@ -694,7 +708,9 @@ msgid "from" msgstr "" -#: src/components/gauge/Gauges.vue:40 +#: src/components/Popup.vue:22 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:315 +#: src/components/gauge/Gauges.vue:45 msgid "From" msgstr "" @@ -706,11 +722,11 @@ msgid "Gauge" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:195 +#: src/components/systemconfiguration/DataAccuracy.vue:196 msgid "Gauge Forecast Confidence" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:124 +#: src/components/systemconfiguration/DataAccuracy.vue:125 msgid "Gauge Forecast vs. Reality" msgstr "" @@ -726,16 +742,16 @@ msgid "Gauge Waterlevel Date" msgstr "" -#: src/components/gauge/Gauges.vue:127 src/components/toolbar/Gauges.vue:34 +#: src/components/gauge/Gauges.vue:134 src/components/toolbar/Gauges.vue:34 msgid "Gauges" msgstr "" -#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:193 +#: src/components/Pdftool.vue:73 src/components/Pdftool.vue:208 #: src/components/toolbar/Pdftool.vue:32 msgid "Generate PDF" msgstr "" -#: src/components/Pdftool.vue:163 +#: src/components/Pdftool.vue:164 msgid "Generated by" msgstr "" @@ -743,7 +759,7 @@ msgid "Generated PDFs use font:" msgstr "" -#: src/components/identify/Identify.vue:445 +#: src/components/identify/Identify.vue:447 msgid "Highest confidence" msgstr "" @@ -751,27 +767,27 @@ msgid "hour" msgstr "" -#: src/components/importoverview/ImportOverview.vue:45 +#: src/components/importoverview/ImportOverview.vue:48 msgid "Hour" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:116 +#: src/components/systemconfiguration/DataAccuracy.vue:117 msgid "hours." msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:150 +#: src/components/gauge/HydrologicalConditions.vue:151 msgid "Hydrological Conditions" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:159 +#: src/components/gauge/HydrologicalConditions.vue:160 msgid "hydrological-conditions" msgstr "" -#: src/components/importoverview/ImportOverview.vue:181 +#: src/components/importoverview/ImportOverview.vue:185 msgid "Id" msgstr "" -#: src/components/importconfiguration/Import.vue:252 +#: src/components/importconfiguration/Import.vue:251 #: src/components/sections/SectionForm.vue:5 msgid "ID" msgstr "" @@ -805,11 +821,11 @@ msgstr "" #: src/components/Sidebar.vue:28 -#: src/components/importoverview/ImportOverview.vue:178 +#: src/components/importoverview/ImportOverview.vue:182 msgid "Import review" msgstr "" -#: src/components/importconfiguration/Import.vue:249 +#: src/components/importconfiguration/Import.vue:248 msgid "Import Schedule" msgstr "" @@ -831,8 +847,8 @@ #: src/components/Sidebar.vue:35 #: src/components/importconfiguration/Import.vue:159 -#: src/components/importconfiguration/Import.vue:190 -#: src/components/importconfiguration/Import.vue:233 +#: src/components/importconfiguration/Import.vue:189 +#: src/components/importconfiguration/Import.vue:232 msgid "Imports" msgstr "" @@ -848,7 +864,7 @@ msgid "invalid email" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:603 +#: src/components/fairway/BottleneckDialogue.vue:653 msgid "Invalid input" msgstr "" @@ -864,7 +880,7 @@ msgid "June" msgstr "" -#: src/components/importoverview/ImportOverview.vue:184 +#: src/components/importoverview/ImportOverview.vue:188 msgid "Kind" msgstr "" @@ -876,13 +892,13 @@ msgid "Last refresh:" msgstr "" -#: src/components/importoverview/ImportOverview.vue:62 +#: src/components/importoverview/ImportOverview.vue:65 msgid "Later" msgstr "" -#: src/components/identify/Identify.vue:475 -#: src/components/identify/Identify.vue:480 -#: src/components/identify/Identify.vue:485 +#: src/components/identify/Identify.vue:483 +#: src/components/identify/Identify.vue:488 +#: src/components/identify/Identify.vue:493 msgid "Latest measurement" msgstr "" @@ -923,7 +939,7 @@ msgid "Logs" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:128 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:130 #: src/components/importconfiguration/types/Fairwaydimensions.vue:67 msgid "LOS" msgstr "" @@ -977,12 +993,12 @@ msgid "Measurement Count in Last 14 Days" msgstr "" -#: src/components/identify/Identify.vue:416 +#: src/components/identify/Identify.vue:418 msgid "Measurement is within" msgstr "" -#: src/components/identify/Identify.vue:417 -#: src/components/identify/Identify.vue:423 +#: src/components/identify/Identify.vue:419 +#: src/components/identify/Identify.vue:425 msgid "measurements" msgstr "" @@ -1016,7 +1032,7 @@ msgid "month" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:630 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:858 msgid "monthly" msgstr "" @@ -1089,11 +1105,15 @@ msgid "No features identified." msgstr "" +#: src/components/identify/Identify.vue:412 +msgid "No measurement available" +msgstr "" + #: src/components/ui/UITableBody.vue:20 msgid "No results." msgstr "" -#: src/components/identify/Identify.vue:467 +#: src/components/identify/Identify.vue:469 msgid "No revisiting time defined" msgstr "" @@ -1101,7 +1121,7 @@ msgid "No style-changes" msgstr "" -#: src/components/identify/Identify.vue:469 +#: src/components/identify/Identify.vue:471 msgid "No survey-data available" msgstr "" @@ -1109,8 +1129,8 @@ msgid "November" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:647 -#: src/components/gauge/Waterlevel.vue:756 +#: src/components/gauge/HydrologicalConditions.vue:646 +#: src/components/gauge/Waterlevel.vue:755 msgid "Now" msgstr "" @@ -1130,7 +1150,7 @@ msgid "of" msgstr "" -#: src/components/importconfiguration/Import.vue:179 +#: src/components/importconfiguration/Import.vue:178 msgid "of type" msgstr "" @@ -1150,8 +1170,8 @@ msgid "originator" msgstr "" -#: src/components/importconfiguration/Import.vue:258 -#: src/components/importoverview/ImportOverview.vue:190 +#: src/components/importconfiguration/Import.vue:257 +#: src/components/importoverview/ImportOverview.vue:194 msgid "Owner" msgstr "" @@ -1191,7 +1211,7 @@ msgid "pending" msgstr "" -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:669 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:673 msgid "Percent" msgstr "" @@ -1298,7 +1318,7 @@ msgid "Please enter an originator" msgstr "Vyberte krajinu" -#: src/components/fairway/BottleneckDialogue.vue:604 +#: src/components/fairway/BottleneckDialogue.vue:654 msgid "Please enter correct coordinates in the format: Lat,Lon,Lat,Lon" msgstr "" @@ -1327,7 +1347,7 @@ msgid "Positive values are the upper limit for retries" msgstr "" -#: src/components/identify/Identify.vue:455 +#: src/components/identify/Identify.vue:457 msgid "Predictions not available" msgstr "" @@ -1339,11 +1359,11 @@ msgid "Press ESC to stop drawing." msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:683 +#: src/components/fairway/BottleneckDialogue.vue:734 msgid "Profile deleted!" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:629 +#: src/components/fairway/BottleneckDialogue.vue:680 msgid "Profile saved!" msgstr "" @@ -1351,7 +1371,7 @@ msgid "Projection" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:631 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:859 msgid "quarterly" msgstr "" @@ -1360,7 +1380,7 @@ msgid "Recency of Bottleneck Surveys" msgstr "Brody a úžiny" -#: src/components/Pdftool.vue:718 +#: src/components/Pdftool.vue:738 msgid "Ref gauge" msgstr "" @@ -1389,7 +1409,7 @@ msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:49 -#: src/components/systemconfiguration/DataAccuracy.vue:274 +#: src/components/systemconfiguration/DataAccuracy.vue:275 #: src/components/systemconfiguration/MapLayers.vue:58 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:101 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:211 @@ -1418,7 +1438,7 @@ msgid "Role" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:425 +#: src/components/fairway/BottleneckDialogue.vue:471 msgid "Rotate Maps" msgstr "" @@ -1435,7 +1455,7 @@ msgid "Save" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:153 +#: src/components/fairway/BottleneckDialogue.vue:183 msgid "Saved cross profiles" msgstr "" @@ -1443,7 +1463,7 @@ msgid "Saved import: #" msgstr "" -#: src/components/Pdftool.vue:475 +#: src/components/Pdftool.vue:495 msgid "Scale" msgstr "" @@ -1451,7 +1471,7 @@ msgid "Scale to 1:" msgstr "" -#: src/components/importconfiguration/Import.vue:261 +#: src/components/importconfiguration/Import.vue:260 #: src/components/importconfiguration/ScheduledImports.vue:217 msgid "Schedule" msgstr "" @@ -1468,7 +1488,7 @@ msgid "Sections" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:444 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:562 #: src/components/importconfiguration/types/Soundingresults.vue:400 #, fuzzy msgid "Select bottleneck" @@ -1478,20 +1498,20 @@ msgid "Select Bottleneck" msgstr "" -#: src/components/gauge/Gauges.vue:20 +#: src/components/gauge/Gauges.vue:21 msgid "Select Gauge" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:447 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:565 msgid "Select section" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:446 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:564 msgid "Select stretch" msgstr "" #: src/components/systemconfiguration/ColorSettings.vue:43 -#: src/components/systemconfiguration/DataAccuracy.vue:271 +#: src/components/systemconfiguration/DataAccuracy.vue:272 #: src/components/systemconfiguration/MapLayers.vue:55 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:95 #: src/components/systemconfiguration/MorphologyClassbreaks.vue:205 @@ -1511,23 +1531,23 @@ msgid "September" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:128 +#: src/components/fairway/BottleneckDialogue.vue:132 msgid "Show differences" msgstr "" -#: src/components/gauge/Gauges.vue:82 +#: src/components/gauge/Gauges.vue:87 msgid "Show Hydrological Conditions" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:125 +#: src/components/fairway/BottleneckDialogue.vue:129 msgid "Show survey" msgstr "" -#: src/components/gauge/Gauges.vue:62 +#: src/components/gauge/Gauges.vue:67 msgid "Show Waterlevels" msgstr "" -#: src/components/importoverview/ImportOverview.vue:193 +#: src/components/importoverview/ImportOverview.vue:197 msgid "Signer" msgstr "" @@ -1589,7 +1609,7 @@ msgid "Staging Area" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:199 +#: src/components/fairway/BottleneckDialogue.vue:229 msgid "Start" msgstr "" @@ -1609,7 +1629,19 @@ msgid "Starting import of section" msgstr "" -#: src/components/importoverview/ImportOverview.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:145 +msgid "Starting Month" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:162 +msgid "Starting Quarter" +msgstr "" + +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:182 +msgid "Starting Year" +msgstr "" + +#: src/components/importoverview/ImportOverview.vue:200 msgid "Status" msgstr "" @@ -1636,12 +1668,12 @@ msgid "Sunday" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:72 -#: src/components/fairway/BottleneckDialogue.vue:648 +#: src/components/fairway/BottleneckDialogue.vue:76 +#: src/components/fairway/BottleneckDialogue.vue:699 msgid "Survey" msgstr "" -#: src/components/Pdftool.vue:716 +#: src/components/Pdftool.vue:736 msgid "Survey date" msgstr "" @@ -1673,7 +1705,7 @@ msgid "Testmail sent" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:203 +#: src/components/systemconfiguration/DataAccuracy.vue:204 msgid "" "The highest confidence value is less than\n" " <b>%{gm24} cm</b>\n" @@ -1682,13 +1714,13 @@ " within last 72 hours." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:248 +#: src/components/systemconfiguration/DataAccuracy.vue:249 msgid "" "The highest confidence value within the last 24 hours is\n" " greater than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:226 +#: src/components/systemconfiguration/DataAccuracy.vue:227 msgid "" "The highest confidence value within the last 72 hours is\n" " greater than" @@ -1721,19 +1753,19 @@ " respective bottleneck." msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:177 +#: src/components/systemconfiguration/DataAccuracy.vue:178 msgid "" "The Nash-Sutcliffe coefficient for last 24 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:157 +#: src/components/systemconfiguration/DataAccuracy.vue:158 msgid "" "The Nash-Sutcliffe coefficient for last 72 hours is less\n" " than" msgstr "" -#: src/components/systemconfiguration/DataAccuracy.vue:132 +#: src/components/systemconfiguration/DataAccuracy.vue:133 msgid "" "The Nash-Sutcliffe coefficient is greater than\n" " <b>%{nsc24}</b>\n" @@ -1756,9 +1788,9 @@ #: src/components/fairway/AvailableFairwayDepth.vue:213 #: src/components/fairway/AvailableFairwayDepth.vue:233 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:212 -#: src/components/fairway/AvailableFairwayDepthLNWL.vue:223 -#: src/components/fairway/BottleneckDialogue.vue:428 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:213 +#: src/components/fairway/AvailableFairwayDepthLNWL.vue:224 +#: src/components/fairway/BottleneckDialogue.vue:474 #: src/components/importconfiguration/types/Soundingresults.vue:232 #: src/components/importconfiguration/types/Soundingresults.vue:251 #: src/components/layers/Layerselect.vue:68 @@ -1784,7 +1816,9 @@ msgid "times the revisiting time." msgstr "" -#: src/components/gauge/Gauges.vue:49 +#: src/components/Popup.vue:28 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:320 +#: src/components/gauge/Gauges.vue:54 msgid "To" msgstr "" @@ -1808,8 +1842,8 @@ msgid "Tuesday" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:112 -#: src/components/importconfiguration/Import.vue:255 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:114 +#: src/components/importconfiguration/Import.vue:254 #: src/components/systemconfiguration/PDFTemplates.vue:126 msgid "Type" msgstr "Typ" @@ -1894,17 +1928,17 @@ msgid "warning" msgstr "" -#: src/components/fairway/BottleneckDialogue.vue:41 -#: src/components/gauge/Waterlevel.vue:169 +#: src/components/fairway/BottleneckDialogue.vue:45 +#: src/components/gauge/Waterlevel.vue:170 msgid "Waterlevel" msgstr "" -#: src/components/gauge/HydrologicalConditions.vue:680 -#: src/components/gauge/Waterlevel.vue:634 +#: src/components/gauge/HydrologicalConditions.vue:679 +#: src/components/gauge/Waterlevel.vue:633 msgid "Waterlevel [m]" msgstr "" -#: src/components/gauge/Waterlevel.vue:180 +#: src/components/gauge/Waterlevel.vue:181 msgid "waterlevels" msgstr "" @@ -1962,11 +1996,11 @@ msgid "Weekly" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:196 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:285 msgid "Widthlimit 1 [m]" msgstr "" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:212 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:301 msgid "Widthlimit 2 [m]" msgstr "" @@ -1974,7 +2008,7 @@ msgid "year" msgstr "Rok" -#: src/components/fairway/AvailableFairwayDepthDialogue.vue:632 +#: src/components/fairway/AvailableFairwayDepthDialogue.vue:860 #, fuzzy msgid "yearly" msgstr "Rok" @@ -1984,7 +2018,7 @@ msgid "yes" msgstr "Vrstvy" -#: src/components/fairway/BottleneckDialogue.vue:630 +#: src/components/fairway/BottleneckDialogue.vue:681 msgid "" "You can now select these coordinates from the \"Saved cross profiles\" menu " "to restore this cross profile."
--- a/client/src/store/application.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/application.js Fri Oct 04 16:40:04 2019 +0200 @@ -41,8 +41,8 @@ showFairwayDepth: false, showFairwayDepthLNWL: false, contextBoxContent: null, // bottlenecks, imports, staging - expandToolbar: false, - countries: ["AT", "SK", "HU", "HR", "RS", "BiH", "BG", "RO", "UA"], + expandToolbar: true, + countries: ["AT", "SK", "HU", "HR", "RS", "BG", "RO"], searchQuery: "", version, tempRoute: "",
--- a/client/src/store/bottlenecks.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/bottlenecks.js Fri Oct 04 16:40:04 2019 +0200 @@ -24,7 +24,8 @@ selectedBottleneck: null, surveys: [], selectedSurvey: null, - surveysLoading: false + surveysLoading: false, + bottleneckForPrint: null }; }; @@ -63,6 +64,9 @@ } }, mutations: { + setBottleneckForPrint: (state, bottleneck) => { + state.bottleneckForPrint = bottleneck; + }, setBottlenecks: (state, bottlenecks) => { state.bottlenecks = bottlenecks; },
--- a/client/src/store/fairwayavailability.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/fairwayavailability.js Fri Oct 04 16:40:04 2019 +0200 @@ -17,7 +17,6 @@ import { HTTP } from "@/lib/http"; import { format, - subYears, startOfMonth, endOfMonth, startOfYear, @@ -43,10 +42,6 @@ YEARLY: "yearly" }; -const isoFormat = date => { - return format(date, "YYYY-MM-DD"); -}; - const getIntervallBorders = (start, end, frequency) => { switch (frequency) { case FREQUENCIES.MONTHLY: @@ -60,12 +55,16 @@ } }; +const isoFormat = date => { + return format(date, "YYYY-MM-DD"); +}; + const init = () => { return { type: TYPES.BOTTLENECK, selectedFairwayAvailabilityFeature: null, - to: isoFormat(new Date()), - from: isoFormat(subYears(new Date(), 1)), + to: null, + from: null, frequency: FREQUENCIES.MONTHLY, limitingFactor: null, depthlimit1: 230,
--- a/client/src/store/fairwayprofile.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/fairwayprofile.js Fri Oct 04 16:40:04 2019 +0200 @@ -35,7 +35,9 @@ previousCuts: [], profileLoading: false, selectedCut: null, - differencesLoading: false + differencesLoading: false, + depth: 2.5, + useCustomDepth: true }; }; @@ -55,6 +57,12 @@ } }, mutations: { + setDepth: (state, value) => { + state.depth = value; + }, + setUseCustomDepth: (state, flag) => { + state.useCustomDepth = flag; + }, additionalSurvey: (state, additionalSurvey) => { state.additionalSurvey = additionalSurvey; },
--- a/client/src/store/gauges.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/gauges.js Fri Oct 04 16:40:04 2019 +0200 @@ -131,6 +131,11 @@ }); }); }, + setSelectedGaugeISRS: ({ commit, state }, isrs) => { + if (state.selectedGaugeISRS !== isrs) { + commit("selectedGaugeISRS", isrs); + } + }, selectedGaugeISRS: ({ commit, dispatch, state }, isrs) => { if (state.selectedGaugeISRS !== isrs) { commit("selectedGaugeISRS", isrs);
--- a/client/src/store/map.js Fri Sep 20 17:48:47 2019 +0200 +++ b/client/src/store/map.js Fri Oct 04 16:40:04 2019 +0200 @@ -416,18 +416,6 @@ } } - // DEBUG output and example how to remove the GeometryName - /* - for (let feature of features) { - console.log("Identified:", feature.getId()); - for (let key of feature.getKeys()) { - if (key != feature.getGeometryName()) { - console.log(key, feature.get(key)); - } - } - } - */ - let currentResolution = map.getView().getResolution(); var waterwayAxisSource = map.getLayer("WATERWAYAXIS").getSource(); @@ -535,20 +523,6 @@ commit("addIdentifiedFeatures", features); }); } - // trying the GetFeatureInfo way for WMS - var iecdisSource = map.getLayer("INLANDECDIS").getSource(); - var iecdisUrl = iecdisSource.getGetFeatureInfoUrl( - event.coordinate, - currentResolution /* resolution */, - "EPSG:3857", - // { INFO_FORMAT: "application/vnd.ogc.gml" } // not allowed by d4d - { INFO_FORMAT: "text/plain" } - ); - - if (iecdisUrl) { - // cannot directly query here because of SOP - // console.log("GetFeatureInfo url:", iecdisUrl); - } }); }, refreshLayers({ state }) {
--- a/client/yarn.lock Fri Sep 20 17:48:47 2019 +0200 +++ b/client/yarn.lock Fri Oct 04 16:40:04 2019 +0200 @@ -7276,11 +7276,6 @@ lodash._basecreate "^3.0.0" lodash._isiterateecall "^3.0.0" -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= - lodash.defaultsdeep@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.3.2.tgz#6c1a586e6c5647b0e64e2d798141b8836158be8a" @@ -10082,6 +10077,13 @@ optionalDependencies: fsevents "^1.2.3" +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" @@ -11159,6 +11161,13 @@ dependencies: glob "^7.1.2" +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + tryer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" @@ -11389,6 +11398,11 @@ resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
--- a/docker/Dockerfile.backend Fri Sep 20 17:48:47 2019 +0200 +++ b/docker/Dockerfile.backend Fri Oct 04 16:40:04 2019 +0200 @@ -5,7 +5,8 @@ RUN sed -i 's/\(deb.*\)$/\1 universe/' /etc/apt/sources.list -RUN apt-get update &&\ +RUN add-apt-repository ppa:longsleep/golang-backports &&\ + apt-get update &&\ apt-get -y install --no-install-recommends libxml2-utils\ make git golang-go \ ca-certificates @@ -13,7 +14,8 @@ WORKDIR /opt/gemma # Copy only backend stuff -COPY 3rdpartylibs.sh ./ +COPY go.mod ./ +COPY go.sum ./ COPY pkg ./pkg/ COPY cmd ./cmd/ COPY Makefile ./
--- a/docs/DEVELOPMENT.md Fri Sep 20 17:48:47 2019 +0200 +++ b/docs/DEVELOPMENT.md Fri Oct 04 16:40:04 2019 +0200 @@ -20,7 +20,7 @@ ## Backend -You need a working [Go](https://golang.org/dl) build environment (1.10+). +You need a working [Go](https://golang.org/dl) build environment (1.13+). * Install dependencies @@ -51,7 +51,7 @@ `http://localhost:6060/pkg/gemma.intevation.de/?m=all` Hints: - * A parameter like `-goroot /usr/lib/go-1.12` may avoid warnings, if + * A parameter like `-goroot /usr/lib/go-1.13` may avoid warnings, if the goroot is somewhere else. * Clicking on a function declaration header will take you to the source code. (Or changing `?m=all` to `?m=src?`).
--- a/go.mod Fri Sep 20 17:48:47 2019 +0200 +++ b/go.mod Fri Oct 04 16:40:04 2019 +0200 @@ -10,19 +10,28 @@ github.com/gorilla/mux v1.7.3 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect github.com/jackc/pgx v3.6.0+incompatible - github.com/jonas-p/go-shp v0.1.1 + github.com/jonas-p/go-shp v0.1.2-0.20190401125246-9fd306ae10a6 github.com/lib/pq v1.2.0 // indirect + github.com/magiconair/properties v1.8.1 // indirect github.com/mitchellh/go-homedir v1.1.0 + github.com/pelletier/go-toml v1.4.0 // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/rs/cors v1.7.0 github.com/sergi/go-diff v1.0.0 github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337 // indirect + github.com/spf13/afero v1.2.2 // indirect github.com/spf13/cobra v0.0.5 + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.4.0 github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect - golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab + go.etcd.io/bbolt v1.3.3 // indirect + golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 // indirect + golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 + golang.org/x/text v0.3.2 // indirect + gonum.org/v1/gonum v0.0.0-20190922162417-bcfb93e04962 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/robfig/cron.v1 v1.2.0
--- a/go.sum Fri Sep 20 17:48:47 2019 +0200 +++ b/go.sum Fri Oct 04 16:40:04 2019 +0200 @@ -63,6 +63,8 @@ github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jonas-p/go-shp v0.1.1 h1:LY81nN67DBCz6VNFn2kS64CjmnDo9IP8rmSkTvhO9jE= github.com/jonas-p/go-shp v0.1.1/go.mod h1:MRIhyxDQ6VVp0oYeD7yPGr5RSTNScUFKCDsI5DR7PtI= +github.com/jonas-p/go-shp v0.1.2-0.20190401125246-9fd306ae10a6 h1:h5O7ee4tlSPVjdC75eSLX7jXZiHftthuHio/GtrhaSM= +github.com/jonas-p/go-shp v0.1.2-0.20190401125246-9fd306ae10a6/go.mod h1:MRIhyxDQ6VVp0oYeD7yPGr5RSTNScUFKCDsI5DR7PtI= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= @@ -79,6 +81,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -88,8 +92,12 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg= +github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -114,14 +122,20 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= @@ -139,6 +153,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -146,6 +162,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 h1:y102fOLFqhV41b+4GPiJoa0k/x+pJcEi2/HB1Y5T6fU= @@ -157,9 +175,10 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab h1:h5tBRKZ1aY/bo6GNqe/4zWC8GkaLOFQ5wPKIOQ0i2sA= -golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72 h1:PdU68SuVQNpTFEyGl0zoQOMysY+E0innv/QbAqV853w= +golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -173,17 +192,22 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 h1:iyiQMxGFo4ru94OFxK2QJuucYB9MYP9+M/dtFx5HmiE= -gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= +gonum.org/v1/gonum v0.0.0-20190922162417-bcfb93e04962 h1:yv+jAHS1K6hZokuZ/tcwpvx+89W5QJVy896P6BsxfNk= +gonum.org/v1/gonum v0.0.0-20190922162417-bcfb93e04962/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
--- a/package.json Fri Sep 20 17:48:47 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -{ - "dependencies": { - "sanitize-filename": "^1.6.3" - } -}
--- a/pkg/common/lang.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/common/lang.go Fri Oct 04 16:40:04 2019 +0200 @@ -23,4 +23,5 @@ "HR": "HR", "BG": "BG", "RO": "RO", + "RS": "SR", }
--- a/pkg/controllers/search.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/controllers/search.go Fri Oct 04 16:40:04 2019 +0200 @@ -45,8 +45,10 @@ s := mw.JSONInput(req).(*models.SearchRequest) if len(s.SearchString) == 0 { - err = mw.JSONError{http.StatusBadRequest, - "error: empty search string"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: empty search string", + } return }
--- a/pkg/controllers/system.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/controllers/system.go Fri Oct 04 16:40:04 2019 +0200 @@ -68,8 +68,10 @@ // able to inject a verbatim '/' via the middleware, but better be on // the safe site... if strings.Contains(fileName, "/") { - err = mw.JSONError{http.StatusBadRequest, - "error: no slashes allowed in file name"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: no slashes allowed in file name", + } return } @@ -79,8 +81,10 @@ case "apache2", "postgresql": path = "/var/log/" + serviceName + "/" + fileName default: - err = mw.JSONError{http.StatusBadRequest, - "error: invalid service: " + serviceName} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: invalid service: " + serviceName, + } return }
--- a/pkg/controllers/user.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/controllers/user.go Fri Oct 04 16:40:04 2019 +0200 @@ -103,13 +103,19 @@ user := mux.Vars(req)["user"] if !models.UserName(user).IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } session, _ := auth.GetSession(req) if session.User == user { - err = mw.JSONError{http.StatusBadRequest, "error: cannot delete yourself"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: cannot delete yourself", + } return } @@ -152,7 +158,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } @@ -189,7 +198,10 @@ } } else { if newUser.Extent == nil { - err = mw.JSONError{http.StatusBadRequest, "extent is mandatory"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "extent is mandatory", + } return } res, err = db.ExecContext( @@ -313,7 +325,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } @@ -349,7 +364,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return }
--- a/pkg/imports/fa.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/imports/fa.go Fri Oct 04 16:40:04 2019 +0200 @@ -68,7 +68,7 @@ insertFASQL = ` INSERT INTO waterway.fairway_availability ( - position_code, + position, bottleneck_id, surdat, critical, @@ -82,7 +82,7 @@ $5, $6 ) ON CONFLICT (bottleneck_id, surdat) DO UPDATE SET - position_code = EXCLUDED.position_code, + position = EXCLUDED.position, critical = EXCLUDED.critical, date_info = EXCLUDED.date_info, source_organization = EXCLUDED.source_organization
--- a/pkg/imports/gm.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/imports/gm.go Fri Oct 04 16:40:04 2019 +0200 @@ -161,11 +161,11 @@ client := nts.NewINtSMessageService(gm.URL, gm.Insecure, nil) mt := nts.Message_type_typeWRM - var dis []*nts.Date_pair - dis = append(dis, &nts.Date_pair{ - Date_start: nts.Date{Time: time.Now().Add(time.Duration(-24) * time.Hour)}, - Date_end: nts.Date{Time: time.Now()}, - }) + now := time.Now() + dis := []*nts.Date_pair{{ + Date_start: nts.Date{Time: now.AddDate(0, 0, -1)}, + Date_end: nts.Date{Time: now.AddDate(0, 0, +1)}, + }} req := &nts.Get_messages_query{ Message_type: &mt,
--- a/pkg/imports/stsh.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/imports/stsh.go Fri Oct 04 16:40:04 2019 +0200 @@ -341,7 +341,7 @@ From: lower, To: upper, ObjNam: objnam, - Date: models.Date{date}, + Date: models.Date{Time: date}, Countries: countries, }
--- a/pkg/imports/wg.go Fri Sep 20 17:48:47 2019 +0200 +++ b/pkg/imports/wg.go Fri Oct 04 16:40:04 2019 +0200 @@ -236,7 +236,7 @@ // We need a valid, non-empty time range to identify gauge versions if dr.Enddate != nil && dr.Startdate != nil && !time.Time(*dr.Enddate).After(time.Time(*dr.Startdate)) { - feedback.Warn("End date not after start date") + feedback.Error("End date not after start date") unchanged++ continue }
--- a/schema/gemma.sql Fri Sep 20 17:48:47 2019 +0200 +++ b/schema/gemma.sql Fri Oct 04 16:40:04 2019 +0200 @@ -734,7 +734,7 @@ -- CREATE TABLE fairway_availability ( id int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - position_code char(2) REFERENCES position_codes, + position varchar, bottleneck_id varchar NOT NULL, surdat date NOT NULL, UNIQUE (bottleneck_id, surdat),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1203/01.fa_fix_position_field.sql Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,20 @@ +-- 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) 2019 by via donau +-- – Österreichische Wasserstraßen-Gesellschaft mbH +-- Software engineering by Intevation GmbH + +-- Author(s): +-- * Sascha Wilde <sascha.wilde@intevation.de> + +ALTER TABLE waterway.fairway_availability + ADD COLUMN IF NOT EXISTS position varchar; + +UPDATE waterway.fairway_availability SET position = position_code; + +ALTER TABLE waterway.fairway_availability + DROP COLUMN IF EXISTS position_code;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/distance_marks_ashore_geoserver.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StyledLayerDescriptor version="1.0.0" + xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" + xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <NamedLayer> + <Name>distance_marks_ashore_geoserver</Name> + <UserStyle> + <FeatureTypeStyle> + <Rule> + <PointSymbolizer> + <Graphic> + <Mark> + <WellKnownName>circle</WellKnownName> + <Stroke> + <CssParameter name="stroke">{{ .distance_marks_ashore_stroke }}</CssParameter> + </Stroke> + <Fill> + <CssParameter name="fill">{{ .distance_marks_ashore_fill }}</CssParameter> + <CssParameter name="fill-opacity">{{ .distance_marks_ashore_fill_opacity }}</CssParameter> + </Fill> + </Mark> + <Size>10</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + </UserStyle> + </NamedLayer> +</StyledLayerDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/distance_marks_geoserver.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,450 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sld:StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:sld="http://www.opengis.net/sld" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" version="1.0.0"> + <sld:NamedLayer> + <sld:Name>distance_marks_geoserver</sld:Name> + <sld:UserStyle> + <sld:Name>distance_marks_geoserver</sld:Name> + <sld:FeatureTypeStyle> + <sld:Rule> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>1000</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>1000</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>8500000</sld:MinScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">#5555FF</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>500</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>500</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>1100000</sld:MinScaleDenominator> + <sld:MaxScaleDenominator>8500000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <sld:Name>100</sld:Name> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>100</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>100</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>800000</sld:MinScaleDenominator> + <sld:MaxScaleDenominator>1100000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <sld:Name>50</sld:Name> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>50</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>50</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>200000</sld:MinScaleDenominator> + <sld:MaxScaleDenominator>800000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <sld:Name>20</sld:Name> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>20</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>20</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>60000</sld:MinScaleDenominator> + <sld:MaxScaleDenominator>200000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <sld:Name>10</sld:Name> + <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc"> + <ogc:PropertyIsEqualTo> + <ogc:Sub> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Mul> + <ogc:Literal>10</ogc:Literal> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </ogc:Mul> + </ogc:Sub> + <ogc:Literal>0</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <sld:MinScaleDenominator>10000</sld:MinScaleDenominator> + <sld:MaxScaleDenominator>60000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Function name="round"> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </ogc:Function> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + <sld:Rule> + <sld:Name>1</sld:Name> + <sld:MaxScaleDenominator>10000</sld:MaxScaleDenominator> + <sld:TextSymbolizer> + <sld:Label> + <ogc:Div> + <ogc:PropertyName>hectometre</ogc:PropertyName> + <ogc:Literal>10</ogc:Literal> + </ogc:Div> + </sld:Label> + <sld:Font> + <sld:CssParameter name="font-family">Sans Serif</sld:CssParameter> + <sld:CssParameter name="font-size">10</sld:CssParameter> + <sld:CssParameter name="font-weight">bold</sld:CssParameter> + </sld:Font> + <sld:LabelPlacement> + <sld:PointPlacement> + <sld:AnchorPoint> + <sld:AnchorPointX>0</sld:AnchorPointX> + <sld:AnchorPointY>-0.5</sld:AnchorPointY> + </sld:AnchorPoint> + </sld:PointPlacement> + </sld:LabelPlacement> + <sld:Fill> + <sld:CssParameter name="fill">#000000</sld:CssParameter> + </sld:Fill> + <sld:Halo> + </sld:Halo> + </sld:TextSymbolizer> + <sld:PointSymbolizer> + <sld:Graphic> + <sld:Mark> + <sld:WellKnownName>circle</sld:WellKnownName> + <sld:Fill> + <sld:CssParameter name="fill">{{ .distance_marks_fill }}</sld:CssParameter> + <sld:CssParameter name="fill-opacity">{{ .distance_marks_fill_opacity }}</sld:CssParameter> + </sld:Fill> + <sld:Stroke> + <sld:CssParameter name="stroke">{{ .distance_marks_stroke }}</sld:CssParameter> + <sld:CssParameter name="stroke-width">1</sld:CssParameter> + </sld:Stroke> + </sld:Mark> + <sld:Size>10</sld:Size> + </sld:Graphic> + </sld:PointSymbolizer> + </sld:Rule> + </sld:FeatureTypeStyle> + </sld:UserStyle> + </sld:NamedLayer> +</sld:StyledLayerDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/sounding_differences.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StyledLayerDescriptor + xmlns="http://www.opengis.net/sld" + xmlns:se="http://www.opengis.net/se" + xmlns:ogc="http://www.opengis.net/ogc" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" + version="1.1.0"> + <NamedLayer> + <se:Name>sounding_differences</se:Name> + <UserStyle> + <se:Name>sounding_differences</se:Name> + <se:FeatureTypeStyle> + <se:Name>differences</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle defining colour classes for height attribute + </se:Abstract> + </se:Description> + {{ range . -}} + <se:Rule> + {{- if not .HasLow }} + <se:Name>≤ {{ printf "%g" .High }}</se:Name> + <ogc:Filter> + <ogc:PropertyIsLessThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsLessThanOrEqualTo> + </ogc:Filter> + {{- else if not .HasHigh }} + <se:Name>> {{ printf "%g" .Low }}</se:Name> + <ogc:Filter> + <ogc:PropertyIsGreaterThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal> + </ogc:PropertyIsGreaterThanOrEqualTo> + </ogc:Filter> + {{- else }} + <se:Name>≤ {{ printf "%g" .High }}</se:Name> + <ogc:Filter> + <ogc:And> + <ogc:PropertyIsGreaterThan> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal> + </ogc:PropertyIsGreaterThan> + <ogc:PropertyIsLessThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsLessThanOrEqualTo> + </ogc:And> + </ogc:Filter> + {{- end }} + <se:LineSymbolizer> + <se:Stroke> + <se:SvgParameter name="stroke">{{ .Color }}</se:SvgParameter> + <se:SvgParameter name="stroke-width">0.5</se:SvgParameter> + </se:Stroke> + </se:LineSymbolizer> + </se:Rule> + {{ end }} + </se:FeatureTypeStyle> + <se:FeatureTypeStyle> + <se:Name>contour_lines_emph</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle for emphasized contour lines + </se:Abstract> + </se:Description> + <se:Rule> + <se:LegendGraphic> + <se:Graphic> + </se:Graphic> + </se:LegendGraphic> + <ogc:Filter> + <ogc:Or> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:PropertyIsEqualTo> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsEqualTo> + {{ end -}} + {{ end }} + </ogc:Or> + </ogc:Filter> + <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator> + <se:LineSymbolizer> + <se:Stroke> + <se:SvgParameter name="stroke-width">1.5</se:SvgParameter> + <se:SvgParameter name="stroke"> + <ogc:Function name="Recode"> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + <ogc:Literal>{{ .Color }}</ogc:Literal> + {{ end -}} + {{ end }} + </ogc:Function> + </se:SvgParameter> + </se:Stroke> + </se:LineSymbolizer> + </se:Rule> + </se:FeatureTypeStyle> + <se:FeatureTypeStyle> + <se:Name>contour_lines_label</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle for labels at contour lines + </se:Abstract> + </se:Description> + <se:Rule> + <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator> + <se:TextSymbolizer> + <se:Label> + <ogc:Function name="Recode"> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:Literal> + {{- printf "%f" .High -}} + </ogc:Literal><ogc:Literal> + {{- printf "%g" .High -}} + </ogc:Literal> + {{ end -}} + {{ end }} + </ogc:Function> + </se:Label> + <se:Font> + <se:SvgParameter name="font-family">Avenir</se:SvgParameter> + <se:SvgParameter name="font-family">Helvetica</se:SvgParameter> + <se:SvgParameter name="font-family">Arial</se:SvgParameter> + <se:SvgParameter name="font-family">sans-serif</se:SvgParameter> + </se:Font> + <se:LabelPlacement> + <se:LinePlacement> + <se:PerpendicularOffset>5</se:PerpendicularOffset> + </se:LinePlacement> + </se:LabelPlacement> + <se:Fill> + <se:SvgParameter name="fill">#070707</se:SvgParameter> + </se:Fill> + </se:TextSymbolizer> + </se:Rule> + </se:FeatureTypeStyle> + </UserStyle> + </NamedLayer> +</StyledLayerDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/sounding_results_contour_lines_geoserver.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StyledLayerDescriptor + xmlns="http://www.opengis.net/sld" + xmlns:se="http://www.opengis.net/se" + xmlns:ogc="http://www.opengis.net/ogc" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" + version="1.1.0"> + <NamedLayer> + <se:Name>sounding_results_contour_lines</se:Name> + <UserStyle> + <se:Name>sounding_results_contour_lines</se:Name> + <se:FeatureTypeStyle> + <se:Name>contour_line_colours</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle defining colour classes for height attribute + </se:Abstract> + </se:Description> + {{ range . -}} + <se:Rule> + {{- if not .HasLow }} + <se:Name>≤ {{ printf "%g" .High }}</se:Name> + <ogc:Filter> + <ogc:PropertyIsLessThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsLessThanOrEqualTo> + </ogc:Filter> + {{- else if not .HasHigh }} + <se:Name>> {{ printf "%g" .Low }}</se:Name> + <ogc:Filter> + <ogc:PropertyIsGreaterThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal> + </ogc:PropertyIsGreaterThanOrEqualTo> + </ogc:Filter> + {{- else }} + <se:Name>≤ {{ printf "%g" .High }}</se:Name> + <ogc:Filter> + <ogc:And> + <ogc:PropertyIsGreaterThan> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .Low }}</ogc:Literal> + </ogc:PropertyIsGreaterThan> + <ogc:PropertyIsLessThanOrEqualTo> + <ogc:PropertyName>height</ogc:PropertyName> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsLessThanOrEqualTo> + </ogc:And> + </ogc:Filter> + {{- end }} + <se:LineSymbolizer> + <se:Stroke> + <se:SvgParameter name="stroke">{{ .Color }}</se:SvgParameter> + <se:SvgParameter name="stroke-width">0.5</se:SvgParameter> + </se:Stroke> + </se:LineSymbolizer> + </se:Rule> + {{ end }} + </se:FeatureTypeStyle> + <se:FeatureTypeStyle> + <se:Name>contour_lines_emph</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle for emphasized contour lines + </se:Abstract> + </se:Description> + <se:Rule> + <se:LegendGraphic> + <se:Graphic> + </se:Graphic> + </se:LegendGraphic> + <ogc:Filter> + <ogc:Or> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:PropertyIsEqualTo> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + </ogc:PropertyIsEqualTo> + {{ end -}} + {{ end }} + </ogc:Or> + </ogc:Filter> + <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator> + <se:LineSymbolizer> + <se:Stroke> + <se:SvgParameter name="stroke-width">1.5</se:SvgParameter> + <se:SvgParameter name="stroke"> + <ogc:Function name="Recode"> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:Literal>{{ printf "%f" .High }}</ogc:Literal> + <ogc:Literal>{{ .Color }}</ogc:Literal> + {{ end -}} + {{ end }} + </ogc:Function> + </se:SvgParameter> + </se:Stroke> + </se:LineSymbolizer> + </se:Rule> + </se:FeatureTypeStyle> + <se:FeatureTypeStyle> + <se:Name>contour_lines_label</se:Name> + <se:Description> + <se:Abstract> + FeatureTypeStyle for labels at contour lines + </se:Abstract> + </se:Description> + <se:Rule> + <se:MaxScaleDenominator>5e3</se:MaxScaleDenominator> + <se:TextSymbolizer> + <se:Label> + <ogc:Function name="Recode"> + <ogc:Function name="numberFormat"> + <ogc:Literal>0.000000</ogc:Literal> + <ogc:PropertyName>height</ogc:PropertyName> + </ogc:Function> + {{ range . -}} + {{ if .HasHigh -}} + <ogc:Literal> + {{- printf "%f" .High -}} + </ogc:Literal><ogc:Literal> + {{- printf "%g" .High -}} + </ogc:Literal> + {{ end -}} + {{ end }} + </ogc:Function> + </se:Label> + <se:Font> + <se:SvgParameter name="font-family">Avenir</se:SvgParameter> + <se:SvgParameter name="font-family">Helvetica</se:SvgParameter> + <se:SvgParameter name="font-family">Arial</se:SvgParameter> + <se:SvgParameter name="font-family">sans-serif</se:SvgParameter> + </se:Font> + <se:LabelPlacement> + <se:LinePlacement> + <se:PerpendicularOffset>5</se:PerpendicularOffset> + </se:LinePlacement> + </se:LabelPlacement> + <se:Fill> + <se:SvgParameter name="fill">#070707</se:SvgParameter> + </se:Fill> + </se:TextSymbolizer> + </se:Rule> + </se:FeatureTypeStyle> + </UserStyle> + </NamedLayer> +</StyledLayerDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/upload-styles.sh Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,119 @@ +#!/bin/bash -e +# +# 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) 2019 by via donau +# – Österreichische Wasserstraßen-Gesellschaft mbH +# Software engineering by Intevation GmbH +# +# Author(s): +# * Sascha Wilde <wilde@intevation.de> + +ME=`basename "$0"` +BASEDIR=`dirname "$0"` + +usage() +{ + cat <<EOF +$ME [OPTION]... + +Upload map styles to gemma. + +Options: + -P, --g_port=GPORT connect to gemma server at GPORT. Default 8000. + -g, --g_host=GHOST connect to gemma server on GHOST. Default "localhost". + -u, --g_user=GUSER login to gemma as user GUSER. Default "sophie". + --g_pw=GPW password for GUSER. Default "so2Phie4". + --help display this help and exit + +EOF +} + +fatal() +{ + echo >&2 "$1" + exit 23 +} + +# Defaults: + +g_port=8000 +g_host="localhost" +g_user="sophie" +g_pw="so2Phie4" + +# Parse options: + +OPTS=`getopt \ + -l help,g_port:,g_host:,g_user:,g_pw: \ + -o P:g:u: -n "$ME" -- "$@"` +[ $? -eq 0 ] || { usage ; exit 1 ; } + +eval set -- "$OPTS" + +while true ; do + case "$1" in + --g_port|-P) + g_port="$2" + shift 2 + ;; + --g_host|-g) + g_host="$2" + shift 2 + ;; + --g_user|-u) + g_user="$2" + shift 2 + ;; + --g_pw) + g_pw="$2" + shift 2 + ;; + --help) + { usage ; exit 0 ; } + ;; + --) + shift + break + ;; + esac +done + +if [ $# != 0 ] ; then + { usage ; exit 23 ; } +fi + +# Main ------------------------------------------------------------ + +# Login to gemma server +login=$(curl -f -s -S -X POST \ + -d "{\"user\":\"${g_user}\",\"password\":\"${g_pw}\"}" \ + "http://${g_host}:${g_port}/api/login") +token=$(jq -r '.token' <<<"$login") +if [ -z "$token" ] +then + echo "could not login to gemma server" >&2 + exit 1 +fi + +roles=$(jq -r '.roles' <<<"$login") + +basedir=$( dirname $( realpath "${BASH_SOURCE[0]}" )) +datadir="${basedir}/." + +if jq -e 'any(. == "sys_admin")' <<<"$roles" > /dev/null +then + echo "== Configuring geoserver styles" >&2 + for style in $(basename -s .sld-template $(ls $datadir/*.sld-template)) + do + curl -f -s -S -H "X-Gemma-Auth:${token}" -X POST \ + -F style=@"${datadir}/${style}.sld-template" \ + "http://${g_host}:${g_port}/api/geo/style/${style}" + done +else + echo >&2 'Not authorized as sys_admin' +fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/waterway_area.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StyledLayerDescriptor version="1.0.0" + xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" + xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <NamedLayer> + <Name>waterway_area</Name> + <UserStyle> + <Title>A yellow polygon style</Title> + <FeatureTypeStyle> + <Rule> + <Title>yellow polygon</Title> + <PolygonSymbolizer> + <Stroke> + <CssParameter name="stroke">{{ .waterway_area_stroke }}</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + </PolygonSymbolizer> + </Rule> + </FeatureTypeStyle> + </UserStyle> + </NamedLayer> +</StyledLayerDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/style-templates/waterway_axis.sld-template Fri Oct 04 16:40:04 2019 +0200 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<StyledLayerDescriptor version="1.0.0" + xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" + xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <NamedLayer> + <Name>waterway_axis</Name> + <UserStyle> + <Title>A cyan line style</Title> + <FeatureTypeStyle> + <Rule> + <Title>cyan line</Title> + <LineSymbolizer> + <Stroke> + <CssParameter name="stroke">{{ .waterway_axis_stroke }}</CssParameter> + <CssParameter name="stroke-dasharray">5 5</CssParameter> + <!--CssParameter name="stroke-opacity">0.5</CssParameter--> + </Stroke> + </LineSymbolizer> + </Rule> + </FeatureTypeStyle> + </UserStyle> + </NamedLayer> +</StyledLayerDescriptor>
--- a/yarn.lock Fri Sep 20 17:48:47 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= - dependencies: - utf8-byte-length "^1.0.1" - -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=