Mercurial > gemma
changeset 1511:53fdbe1d9678
fix: staging select according soundingresult
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Wed, 05 Dec 2018 15:51:26 +0100 |
parents | 56734ea87f9e |
children | aaa56ecdb573 |
files | client/src/components/map/contextbox/Staging.vue client/src/store/bottlenecks.js |
diffstat | 2 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/map/contextbox/Staging.vue Wed Dec 05 14:18:04 2018 +0100 +++ b/client/src/components/map/contextbox/Staging.vue Wed Dec 05 15:51:26 2018 +0100 @@ -188,8 +188,11 @@ zoom: 17, preventZoomOut: true }); - this.$store.dispatch("bottlenecks/setSelectedBottleneck", bottleneck); - this.$store.commit("bottlenecks/selectedSurvey", date); + this.$store.dispatch( + "bottlenecks/setSelectedBottleneck", + bottleneck, + date + ); }, toggleApproval(id, newStatus) { this.$store.commit("imports/toggleApproval", {
--- a/client/src/store/bottlenecks.js Wed Dec 05 14:18:04 2018 +0100 +++ b/client/src/store/bottlenecks.js Wed Dec 05 15:51:26 2018 +0100 @@ -51,7 +51,8 @@ actions: { setSelectedBottleneck( { state, commit, dispatch, rootState, rootGetters }, - name + name, + date ) { if (name !== state.selectedBottleneck) { commit("selectedSurvey", null); @@ -64,7 +65,7 @@ commit("application/showProfiles", true, { root: true }); } commit("setSelectedBottleneck", name); - dispatch("querySurveys", name); + dispatch("querySurveys", name, date); }, loadBottlenecks({ commit }) { var bottleneckFeatureCollectionRequest = new WFS().writeGetFeature({ @@ -90,7 +91,7 @@ commit("setBottlenecks", response.data.features); }); }, - querySurveys({ commit }, name) { + querySurveys({ commit }, name, date) { if (name) { commit("surveysLoading", true); HTTP.get("/surveys/" + name, { @@ -103,7 +104,13 @@ const surveys = response.data.surveys.sort((a, b) => a.date_info < b.date_info ? 1 : -1 ); - commit("selectedSurvey", surveys[0]); + if (date) { + const survey = surveys.filter(x => x.date_info === date)[0]; + commit("selectedSurvey", survey); + } else { + commit("selectedSurvey", surveys[0]); + } + commit("setSurveys", surveys); }) .catch(error => {