Mercurial > gemma
changeset 5405:5e7fca6ef935 marking-single-beam
When listing surveys tell survey type as well.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 06 Jul 2021 14:18:54 +0200 |
| parents | 47b12e8308bf |
| children | 6d73836bc2fb |
| files | pkg/controllers/surveys.go pkg/models/surveys.go |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/surveys.go Tue Jul 06 12:35:57 2021 +0200 +++ b/pkg/controllers/surveys.go Tue Jul 06 14:18:54 2021 +0200 @@ -33,7 +33,8 @@ s.date_info::text, s.depth_reference, COALESCE(g.objname, 'ERROR: MISSING GAUGE') AS gauge_objname, - r.value AS waterlevel_value + r.value AS waterlevel_value, + COALESCE(s.surtype, 'ERROR: MISSING SURVEY TYPE) AS surtype FROM waterway.bottlenecks AS b JOIN waterway.sounding_results AS s ON b.bottleneck_id = s.bottleneck_id LEFT JOIN waterway.gauges AS g @@ -63,6 +64,7 @@ // (like done in controllers/search.go) for rows.Next() { var survey models.Survey + var surType string var level sql.NullInt64 if err = rows.Scan( &survey.BottleneckID, @@ -70,12 +72,14 @@ &survey.DepthReference, &survey.ReferenceGauge, &level, + &surType, ); err != nil { return } if level.Valid { survey.WaterLevelValue = &level.Int64 } + survey.SurveyType = models.SurveyType(surType) surveys = append(surveys, &survey) }
--- a/pkg/models/surveys.go Tue Jul 06 12:35:57 2021 +0200 +++ b/pkg/models/surveys.go Tue Jul 06 14:18:54 2021 +0200 @@ -15,10 +15,11 @@ type ( Survey struct { - BottleneckID string `json:"bottleneck_id"` - DateInfo string `json:"date_info"` - DepthReference string `json:"depth_reference"` - ReferenceGauge string `json:"gauge_objname"` - WaterLevelValue *int64 `json:"waterlevel_value,omitempty"` + BottleneckID string `json:"bottleneck_id"` + DateInfo string `json:"date_info"` + DepthReference string `json:"depth_reference"` + ReferenceGauge string `json:"gauge_objname"` + SurveyType SurveyType `json:"survey_type"` + WaterLevelValue *int64 `json:"waterlevel_value,omitempty"` } )