# HG changeset patch # User Markus Kottlaender # Date 1551711680 -3600 # Node ID 9d9c6425db823b5f5fc28ca6a464773f65fb6403 # Parent 7247eb03e7c08057e8d1cf23acf474fb5d599666# Parent 8cc3cd1b27f2824240908f33852d8a9bc2dae20f merged default into critical-bottlenecks branch diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/assets/application.scss --- a/client/src/assets/application.scss Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/assets/application.scss Mon Mar 04 16:01:20 2019 +0100 @@ -145,3 +145,22 @@ .btn.disabled { opacity: 0.4; } + +.snotifyToast { + text-align: left; + border-radius: 0.25rem; + box-shadow: 0 0.1rem 0.5rem rgba(0, 0, 0, 0.2); + border-left: 0 !important; + &.snotify-info { + border-top: 4px solid $color-info; + .snotify-icon--info { + background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20version=%221.1%22%20x=%220px%22%20y=%220px%22%20viewBox=%220%200%20512%20512%22%20fill=%22%2317a2b8%22%3E%3Cg%3E%3Cpath%20d=%22M256,0C114.84,0,0,114.84,0,256S114.84,512,256,512,512,397.16,512,256,397.15,0,256,0Zm0,478.43C133.35,478.43,33.57,378.64,33.57,256S133.35,33.58,256,33.58,478.42,133.36,478.42,256,378.64,478.43,256,478.43Z%22/%3E%3Cpath%20d=%22M251.26,161.24a22.39,22.39,0,1,0-22.38-22.39A22.39,22.39,0,0,0,251.26,161.24Z%22/%3E%3Cpath%20d=%22M286.84,357.87h-14v-160A16.79,16.79,0,0,0,256,181.05H225.17a16.79,16.79,0,0,0,0,33.58h14.05V357.87H225.17a16.79,16.79,0,0,0,0,33.57h61.67a16.79,16.79,0,1,0,0-33.57Z%22/%3E%3C/g%3E%3C/svg%3E"); + } + } + &.snotify-error { + border-top: 4px solid #f44336; + } + .snotifyToast__title { + font-size: 1.2rem; + } +} diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/components/Bottlenecks.vue --- a/client/src/components/Bottlenecks.vue Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/components/Bottlenecks.vue Mon Mar 04 16:01:20 2019 +0100 @@ -5,123 +5,109 @@ title="Bottlenecks" :closeCallback="$parent.close" /> -
-
- - Name - - + + +
+ {{ + bottleneck.properties.name + }}
-
- - Latest
- Measurement - - +
+ {{ formatSurveyDate(bottleneck.properties.current) }} +
+
+ {{ + displayCurrentChainage( + bottleneck.properties.from, + bottleneck.properties.to + ) + }}
-
- - Chainage +
+ + + + -
-
-
-
-
- {{ - bottleneck.properties.name - }} -
-
- {{ formatSurveyDate(bottleneck.properties.current) }} -
-
- {{ - displayCurrentChainage( - bottleneck.properties.from, - bottleneck.properties.to - ) - }} -
-
- - - - - -
-
- {{ formatSurveyDate(survey.date_info) }} -
+ {{ formatSurveyDate(survey.date_info) }} +
-
-
- No results. -
+
+ + - - diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/components/ImportStretches.vue --- a/client/src/components/ImportStretches.vue Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/components/ImportStretches.vue Mon Mar 04 16:01:20 2019 +0100 @@ -5,60 +5,52 @@ title="Define Stretches" :closeCallback="$parent.close" /> -
- - - - - - - - - - - - - - - - - -
NameDatumSource organization
- - {{ stretch.properties.name - }}review - - {{ - stretch.properties.name - }} - - {{ formatSurveyDate(stretch.properties["date_info"]) }} - {{ stretch.properties["source_organization"] }} - - -
-
- No results. -
+
+ + +
+ + {{ stretch.properties.name + }}review + + {{ + stretch.properties.name + }} +
+
+ {{ formatSurveyDate(stretch.properties["date_info"]) }} +
+
+ {{ stretch.properties["source_organization"] }} +
+
+ + +
+
@@ -337,8 +329,8 @@ }); }); }, - editStretch(index) { - const properties = this.stretches[index].properties; + editStretch(stretch) { + const properties = stretch.properties; this.date_info = properties.date_info.split("T")[0]; this.id = properties.name; this.nobjbn = properties.nobjnam; @@ -376,10 +368,10 @@ } }); }, - moveMapToStretch(index) { + moveMapToStretch(stretch) { this.$store.commit("map/setLayerVisible", LAYERS.STRETCHES); this.$store.commit("map/moveToExtent", { - feature: this.stretches[index], + feature: stretch, zoom: 17, preventZoomOut: true }); diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/components/fairway/Fairwayprofile.vue --- a/client/src/components/fairway/Fairwayprofile.vue Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/components/fairway/Fairwayprofile.vue Mon Mar 04 16:01:20 2019 +0100 @@ -1,12 +1,22 @@ @@ -91,16 +70,14 @@ * Markus Kottländer */ import { HTTP } from "@/lib/http"; -import { displayError } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors.js"; export default { name: "pdftemplates", data() { return { templates: [], - uploading: false, - templateToUpload: "", - showSuccessUploadMsg: false + uploading: false }; }, methods: { @@ -135,8 +112,10 @@ ) .then(() => { this.loadTemplates(); - this.templateToUpload = template; - this.showSuccessUploadMsg = true; + displayInfo({ + message: + template.name + " " + this.$gettext("uploaded successfully") + }); }) .catch(e => { const { status, data } = e.response; @@ -204,6 +183,10 @@ ); if (removeIndex !== -1) { this.templates.splice(removeIndex, 1); + displayInfo({ + message: + template.name + " " + this.$gettext("deleted successfully") + }); } }); } diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/components/ui/UITableBody.vue --- a/client/src/components/ui/UITableBody.vue Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/components/ui/UITableBody.vue Mon Mar 04 16:01:20 2019 +0100 @@ -8,7 +8,7 @@ >
@@ -46,6 +46,11 @@ active: { type: [Object, Array] } + }, + methods: { + key(index) { + return index; + } } }; diff -r 7247eb03e7c0 -r 9d9c6425db82 client/src/components/usermanagement/Usermanagement.vue --- a/client/src/components/usermanagement/Usermanagement.vue Mon Mar 04 08:32:05 2019 +0100 +++ b/client/src/components/usermanagement/Usermanagement.vue Mon Mar 04 16:01:20 2019 +0100 @@ -5,82 +5,55 @@
-
- - - - - - - - - - - - - - - - - - - -
- Role  - - - - Username  - - - - Country  - - - - Email  - - -
- - {{ user.user }}{{ user.country }}{{ user.email }} - - -
-
+ + +
+ +
+
+ {{ user.user }} +
+
+ {{ user.country }} +
+
+ {{ user.email }} +
+
+ + +
+