Mercurial > gemma
changeset 1306:e496832d3ea1
merge
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Fri, 23 Nov 2018 11:19:56 +0100 |
parents | 6c0c204f6bce (current diff) a8d1f2897c42 (diff) |
children | 541a5488f0e7 |
files | |
diffstat | 16 files changed, 42 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/map/contextbox/ImportSoundingresults.vue Fri Nov 23 11:19:16 2018 +0100 +++ b/client/src/components/map/contextbox/ImportSoundingresults.vue Fri Nov 23 11:19:56 2018 +0100 @@ -45,6 +45,9 @@ >{{option}}</option> </select> </div> + <div class="text-left"> + <small v-for="(message, index) in messages" :key="index">{{message}}</small> + </div> </div> <div class="w-95 ml-auto mr-auto mt-4 mb-4"> <div v-if="uploadState" class="d-flex flex-row input-group mb-4"> @@ -114,7 +117,8 @@ uploadLabel: defaultLabel, uploadFile: null, disableUpload: false, - token: null + token: null, + messages: [] }; }, methods: { @@ -127,6 +131,7 @@ this.uploadFile = null; this.disableUpload = false; this.token = null; + this.messages = []; }, fileSelected(e) { const files = e.target.files || e.dataTransfer.files; @@ -176,6 +181,7 @@ this.depthReference = depthReference; this.importDate = new Date(date).toISOString().split("T")[0]; this.token = response.data.token; + this.messages = response.data.messages; }) .catch(error => { const { status, data } = error.response;
--- a/schema/auth.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/auth.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottried <tom@intevation.de> BEGIN;
--- a/schema/auth_tests.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/auth_tests.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- pgTAP test script for privileges and RLS policies
--- a/schema/default_sysconfig.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/default_sysconfig.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Wilde <wilde@intevation.de> +-- * Sascha Wilde <wilde@intevation.de> BEGIN;
--- a/schema/gemma.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/gemma.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> BEGIN;
--- a/schema/geonames.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/geonames.sql Fri Nov 23 11:19:56 2018 +0100 @@ -11,7 +11,6 @@ -- Author(s): -- * Sascha Wilde <wilde@intevation.de> - -- Tables for data from geonames database -- https://download.geonames.org/ -- used for searching cities and villages...
--- a/schema/install-db.sh Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/install-db.sh Fri Nov 23 11:19:56 2018 +0100 @@ -1,20 +1,16 @@ --- 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): --- * Wilde <wilde@intevation.d> - - #!/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) 2018 by via donau +# – Österreichische Wasserstraßen-Gesellschaft mbH +# Software engineering by Intevation GmbH +# # Author(s): -# Sascha Wilde <wilde@intevation.de> +# * Sascha Wilde <wilde@intevation.de> ME=`basename "$0"` BASEDIR=`dirname "$0"`
--- a/schema/isrs.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/isrs.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom Gottfried <tom.gottfried@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- Types and functions for ISRS location codes
--- a/schema/isrs_tests.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/isrs_tests.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- pgTAP test script for ISRS location code types and functions
--- a/schema/manage_users.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/manage_users.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- Functions encapsulating user management functionality and
--- a/schema/manage_users_tests.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/manage_users_tests.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- pgTAP test script for user management functions
--- a/schema/roles.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/roles.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- Primary GEMMA roles
--- a/schema/run_tests.sh Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/run_tests.sh Fri Nov 23 11:19:56 2018 +0100 @@ -1,17 +1,16 @@ --- 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): --- * Tom <tom@intevation.de> - #!/bin/sh -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) 2018 by via donau +# – Österreichische Wasserstraßen-Gesellschaft mbH +# Software engineering by Intevation GmbH +# +# Author(s): +# * Tom Gottfried <tom@intevation.de> dropdb --if-exists gemma_test
--- a/schema/search.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/search.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * wilde <wilde@intevation.de> +-- * Sascha Wilde <wilde@intevation.de> CREATE FUNCTION search_bottlenecks(search_string text) RETURNS jsonb LANGUAGE plpgsql
--- a/schema/std_login_roles.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/std_login_roles.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Wilde <wilde@intevation.de> +-- * Sascha Wilde <wilde@intevation.de> BEGIN;
--- a/schema/tap_tests_data.sql Fri Nov 23 11:19:16 2018 +0100 +++ b/schema/tap_tests_data.sql Fri Nov 23 11:19:56 2018 +0100 @@ -9,7 +9,7 @@ -- Software engineering by Intevation GmbH -- Author(s): --- * Tom <tom@intevation.de> +-- * Tom Gottfried <tom@intevation.de> -- -- Test data used in *_tests.sql scripts