Mercurial > gemma
changeset 1255:13abf612cd9d
moved morphtool components to fairway directory and renamed Morphtool to Surveys
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Wed, 21 Nov 2018 12:29:43 +0100 |
parents | 8ff6ff0e63a7 |
children | 3c84035b1f1b |
files | client/src/App.vue client/src/fairway/Infobar.vue client/src/fairway/Surveys.vue client/src/morphtool/Infobar.vue client/src/morphtool/Morphtool.vue |
diffstat | 5 files changed, 98 insertions(+), 98 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/App.vue Wed Nov 21 12:22:39 2018 +0100 +++ b/client/src/App.vue Wed Nov 21 12:29:43 2018 +0100 @@ -18,7 +18,7 @@ </div> <div class="flex-fill"></div> <div class="d-flex flex-row align-items-end"> - <Morphtool v-if="routeName == 'mainview'"></Morphtool> + <Surveys v-if="routeName == 'mainview'"></Surveys> <Infobar v-if="routeName == 'mainview'"></Infobar> </div> <Zoom v-if="routeName == 'mainview'"></Zoom> @@ -81,8 +81,8 @@ } }, components: { - Morphtool: () => import("./morphtool/Morphtool"), - Infobar: () => import("./morphtool/Infobar"), + Surveys: () => import("./fairway/Surveys"), + Infobar: () => import("./fairway/Infobar"), Pdftool: () => import("./pdftool/Pdftool"), Zoom: () => import("./zoom/zoom"), Identify: () => import("./identify/Identify"),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/fairway/Infobar.vue Wed Nov 21 12:29:43 2018 +0100 @@ -0,0 +1,45 @@ +<template> + <div v-if="selectedSurvey && !showSplitscreen" class="ui-element shadow infobar rounded bg-white ml-auto mb-3 mr-3"> + <div class="d-flex flex-row justify-content-between"> + <h6 class="my-auto px-2"> + {{ selectedBottleneck }} + ({{ selectedSurvey.date_info }}) + </h6> + <i class="fa fa-angle-up py-2 px-2 border-left" @click="$store.commit('application/showSplitscreen', true)" v-if="Object.keys(currentProfile).length"></i> + <i class="fa fa-close text-danger py-2 px-2 border-left" @click="$store.dispatch('fairwayprofile/clearSelection');"></i> + </div> + </div> +</template> + +<style lang="sass" scoped> +.infobar + height: $icon-width + z-index: 2 +</style> + +<script> +/* + * This is Free Software under GNU Affero General Public License v >= 3.0 + * without warranty, see README.md and license for details. + * + * SPDX-License-Identifier: AGPL-3.0-or-later + * License-Filename: LICENSES/AGPL-3.0.txt + * + * Copyright (C) 2018 by via donau + * – Österreichische Wasserstraßen-Gesellschaft mbH + * Software engineering by Intevation GmbH + * + * Author(s): + * Markus Kottländer <markus.kottlaender@intevation.de> + */ +import { mapState } from "vuex"; + +export default { + name: "infobar", + computed: { + ...mapState("application", ["showSplitscreen"]), + ...mapState("fairwayprofile", ["currentProfile"]), + ...mapState("bottlenecks", ["selectedBottleneck", "selectedSurvey"]) + } +}; +</script>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/fairway/Surveys.vue Wed Nov 21 12:29:43 2018 +0100 @@ -0,0 +1,50 @@ +<template> + <div class="box expanded ui-element rounded bg-white ml-auto mr-3 mb-3 text-nowrap" v-if="selectedBottleneck && surveys && !selectedSurvey"> + <div style="width: 15rem"> + <h5 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> + {{ selectedBottleneck }} + <i class="fa fa-times ml-auto" @click="$store.dispatch('fairwayprofile/clearSelection');"></i> + </h5> + <div class="p-3"> + <div + v-for="(survey, i) of surveys" + :key="survey.data_info" + :class="{ 'mt-1': i }" + @click.prevent="$store.commit('bottlenecks/setSelectedSurvey', survey)" + > + <a href="#" @click.prevent>{{ survey.date_info }}</a> + </div> + </div> + </div> + </div> +</template> + +<script> +/* + * This is Free Software under GNU Affero General Public License v >= 3.0 + * without warranty, see README.md and license for details. + * + * SPDX-License-Identifier: AGPL-3.0-or-later + * License-Filename: LICENSES/AGPL-3.0.txt + * + * Copyright (C) 2018 by via donau + * – Österreichische Wasserstraßen-Gesellschaft mbH + * Software engineering by Intevation GmbH + * + * Author(s): + * Thomas Junk <thomas.junk@intevation.de> + * Markus Kottländer <markus.kottlaender@intevation.de> + */ +import { mapState } from "vuex"; + +export default { + name: "surveys", + computed: { + ...mapState("bottlenecks", [ + "selectedBottleneck", + "surveys", + "selectedSurvey" + ]) + } +}; +</script>
--- a/client/src/morphtool/Infobar.vue Wed Nov 21 12:22:39 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -<template> - <div v-if="selectedSurvey && !showSplitscreen" class="ui-element shadow infobar rounded bg-white ml-auto mb-3 mr-3"> - <div class="d-flex flex-row justify-content-between"> - <h6 class="my-auto px-2"> - {{ selectedBottleneck }} - ({{ selectedSurvey.date_info }}) - </h6> - <i class="fa fa-angle-up py-2 px-2 border-left" @click="$store.commit('application/showSplitscreen', true)" v-if="Object.keys(currentProfile).length"></i> - <i class="fa fa-close text-danger py-2 px-2 border-left" @click="$store.dispatch('fairwayprofile/clearSelection');"></i> - </div> - </div> -</template> - -<style lang="sass" scoped> -.infobar - height: $icon-width - z-index: 2 -</style> - -<script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 - * without warranty, see README.md and license for details. - * - * SPDX-License-Identifier: AGPL-3.0-or-later - * License-Filename: LICENSES/AGPL-3.0.txt - * - * Copyright (C) 2018 by via donau - * – Österreichische Wasserstraßen-Gesellschaft mbH - * Software engineering by Intevation GmbH - * - * Author(s): - * Markus Kottländer <markus.kottlaender@intevation.de> - */ -import { mapState } from "vuex"; - -export default { - name: "infobar", - computed: { - ...mapState("application", ["showSplitscreen"]), - ...mapState("fairwayprofile", ["currentProfile"]), - ...mapState("bottlenecks", ["selectedBottleneck", "selectedSurvey"]) - } -}; -</script>
--- a/client/src/morphtool/Morphtool.vue Wed Nov 21 12:22:39 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -<template> - <div class="box expanded ui-element rounded bg-white ml-auto mr-3 mb-3 text-nowrap" v-if="selectedBottleneck && surveys && !selectedSurvey"> - <div style="width: 15rem"> - <h5 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> - {{ selectedBottleneck }} - <i class="fa fa-times ml-auto" @click="$store.dispatch('fairwayprofile/clearSelection');"></i> - </h5> - <div class="p-3"> - <div - v-for="(survey, i) of surveys" - :key="survey.data_info" - :class="{ 'mt-1': i }" - @click.prevent="$store.commit('bottlenecks/setSelectedSurvey', survey)" - > - <a href="#" @click.prevent>{{ survey.date_info }}</a> - </div> - </div> - </div> - </div> -</template> - -<script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 - * without warranty, see README.md and license for details. - * - * SPDX-License-Identifier: AGPL-3.0-or-later - * License-Filename: LICENSES/AGPL-3.0.txt - * - * Copyright (C) 2018 by via donau - * – Österreichische Wasserstraßen-Gesellschaft mbH - * Software engineering by Intevation GmbH - * - * Author(s): - * Thomas Junk <thomas.junk@intevation.de> - * Markus Kottländer <markus.kottlaender@intevation.de> - */ -import { mapState } from "vuex"; - -export default { - name: "morphtool", - computed: { - ...mapState("bottlenecks", [ - "selectedBottleneck", - "surveys", - "selectedSurvey" - ]) - } -}; -</script>