Mercurial > gemma
changeset 2131:c6a4990a1d93
Merged
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 06 Feb 2019 15:47:03 +0100 |
| parents | f3aabc05f9b2 (current diff) 8f6345ad5f13 (diff) |
| children | 7a2eedc182f7 |
| files | |
| diffstat | 2 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/surveys.go Wed Feb 06 15:42:32 2019 +0100 +++ b/pkg/controllers/surveys.go Wed Feb 06 15:47:03 2019 +0100 @@ -4,13 +4,14 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // -// Copyright (C) 2018 by via donau +// Copyright (C) 2018, 2019 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // // Author(s): // * Sascha Wilde <sascha.wilde@intevation.de> // * Sascha L. Teichmann <sascha.teichmann@intevation.de> +// * Bernhard Reiter <bernhard.reiter@intevation.de> package controllers @@ -26,10 +27,15 @@ listSurveysSQL = ` SELECT s.bottleneck_id, - s.date_info::text -FROM waterway.bottlenecks b JOIN waterway.sounding_results s -ON b.id = s.bottleneck_id -WHERE b.objnam=$1` + s.date_info::text, + bg.objname AS gauge_objname +FROM + ( SELECT * FROM waterway.bottlenecks AS b, waterway.gauges AS g + WHERE b.fk_g_fid = g.location + ) AS bg + JOIN waterway.sounding_results AS s +ON bg.id = s.bottleneck_id +WHERE bg.objnam=$1` ) func listSurveys( @@ -55,6 +61,7 @@ if err = rows.Scan( &survey.BottleneckID, &survey.DateInfo, + &survey.ReferenceGauge, ); err != nil { return }
--- a/pkg/models/surveys.go Wed Feb 06 15:42:32 2019 +0100 +++ b/pkg/models/surveys.go Wed Feb 06 15:47:03 2019 +0100 @@ -4,7 +4,7 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // License-Filename: LICENSES/AGPL-3.0.txt // -// Copyright (C) 2018 by via donau +// Copyright (C) 2018, 2019 by via donau // – Österreichische Wasserstraßen-Gesellschaft mbH // Software engineering by Intevation GmbH // @@ -15,7 +15,8 @@ type ( Survey struct { - BottleneckID string `json:"bottleneck_id"` - DateInfo string `json:"date_info"` + BottleneckID string `json:"bottleneck_id"` + DateInfo string `json:"date_info"` + ReferenceGauge string `json:"gauge_objname"` } )