# HG changeset patch # User Thomas Junk # Date 1552653769 -3600 # Node ID 39a05f8c34e6c67aa7e091ac7ed7f0a609f655f3 # Parent 4d460b2b439fc3f4b2b5b57f6ed157a6fcc3a6c7 import_overview: Refactoring of detailed information. When the entry is opened, a request is made to retrieve the detailed information for this entry. It contains the log protocol information as well as the executive summary. This is passed down to child components of the entry. diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/AdditionalDetail.vue --- a/client/src/components/importoverview/AdditionalDetail.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/AdditionalDetail.vue Fri Mar 15 13:42:49 2019 +0100 @@ -2,13 +2,19 @@
- +
@@ -29,7 +35,7 @@ export default { name: "additionaldetail", - props: ["entry"], + props: ["entry", "details"], components: { BottleneckDetail: () => import("./BottleneckDetail.vue"), ApprovedGaugeMeasurementDetail: () => diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/AdditionalLog.vue --- a/client/src/components/importoverview/AdditionalLog.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/AdditionalLog.vue Fri Mar 15 13:42:49 2019 +0100 @@ -49,37 +49,13 @@ * Author(s): * Thomas Junk */ -import { displayError } from "@/lib/errors.js"; -import { HTTP } from "@/lib/http.js"; - export default { name: "additionallogs", - props: ["entry"], + props: ["details"], data() { return { - logLines: [] + logLines: this.details.entries }; - }, - methods: { - loadEntries() { - HTTP.get("/imports/" + this.entry.id, { - headers: { "X-Gemma-Auth": localStorage.getItem("token") } - }) - .then(response => { - const { entries } = response.data; - this.logLines = entries; - }) - .catch(error => { - const { status, data } = error.response; - displayError({ - title: this.$gettext("Backend Error"), - message: `${status}: ${data.message || data}` - }); - }); - } - }, - mounted() { - this.loadEntries(); } }; diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue --- a/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Fri Mar 15 13:42:49 2019 +0100 @@ -1,6 +1,6 @@ @@ -84,7 +90,7 @@ export default { name: "logdetail", - props: ["entry"], + props: ["entry", "details"], components: { SoundingResultDetail: () => import("./SoundingResultDetail.vue"), StretchDetail: () => import("./StretchDetails.vue"), diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/LogEntry.vue --- a/client/src/components/importoverview/LogEntry.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/LogEntry.vue Fri Mar 15 13:42:49 2019 +0100 @@ -58,7 +58,11 @@
- +
@@ -79,10 +83,32 @@ */ import { mapState } from "vuex"; import { STATES } from "@/store/imports.js"; +import { displayError } from "@/lib/errors.js"; +import { HTTP } from "@/lib/http.js"; export default { name: "importlogentry", props: ["entry"], + data() { + return { + details: null + }; + }, + mounted() { + HTTP.get("/imports/" + this.entry.id, { + headers: { "X-Gemma-Auth": localStorage.getItem("token") } + }) + .then(response => { + this.details = response.data; + }) + .catch(error => { + const { status, data } = error.response; + displayError({ + title: this.$gettext("Backend Error"), + message: `${status}: ${data.message || data}` + }); + }); + }, components: { LogDetail: () => import("./LogDetail.vue") }, diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/SoundingResultDetail.vue --- a/client/src/components/importoverview/SoundingResultDetail.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/SoundingResultDetail.vue Fri Mar 15 13:42:49 2019 +0100 @@ -2,7 +2,7 @@
- {{ entry.summary.bottleneck }} + {{ details.summary.bottleneck }}
@@ -23,7 +23,7 @@ */ export default { name: "soundingresultdetails", - props: ["entry"], + props: ["entry", "details"], methods: { moveMap(coordinates) { this.$store.commit("map/moveMap", { @@ -33,7 +33,7 @@ }); }, zoomTo() { - const { lat, lon, bottleneck, date } = this.entry.summary; + const { lat, lon, bottleneck, date } = this.details.summary; const coordinates = [lat, lon]; this.moveMap(coordinates); this.$store diff -r 4d460b2b439f -r 39a05f8c34e6 client/src/components/importoverview/StretchDetails.vue --- a/client/src/components/importoverview/StretchDetails.vue Fri Mar 15 12:29:49 2019 +0100 +++ b/client/src/components/importoverview/StretchDetails.vue Fri Mar 15 13:42:49 2019 +0100 @@ -2,7 +2,7 @@
  {{ - entry.summary.stretch + details.summary.stretch }}
@@ -26,7 +26,7 @@ export default { name: "stretchdetails", - props: ["entry"], + props: ["entry", "details"], methods: { moveToExtent(feature) { this.$store.commit("map/moveToExtent", { @@ -36,7 +36,7 @@ }); }, zoomToStretch() { - const name = this.entry.summary.stretch; + const name = this.details.summary.stretch; this.$store.commit("map/setLayerVisible", LAYERS.STRETCHES); this.$store .dispatch("imports/loadStretch", name)