From 9894fac8ea2cea78d0b0365594c36548b951e581 Mon Sep 17 00:00:00 2001 From: BroodjeAap Date: Sun, 5 Mar 2023 14:36:07 +0000 Subject: [PATCH] fixed categorical values view --- web/templates/watch/view.html | 42 +++++++++++++++++++---------------- web/web.go | 5 ++++- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/web/templates/watch/view.html b/web/templates/watch/view.html index 9fcca92..c1f0525 100644 --- a/web/templates/watch/view.html +++ b/web/templates/watch/view.html @@ -38,34 +38,38 @@ GoWatch {{ .Watch.Name }} {{ end }} +{{ $first := true }} {{ if .categoricalMap }}
+ {{ $first = true }} {{ range $name, $values := .categoricalMap }} -
- - - - - - - - - {{ range $value := $values }} - - - - - {{ end }} - -
WhenValue
{{ $value.Time.Format "2006-01-02 15:04:05" }}{{ $value.Value }}
-
+
+ + + + + + + + + {{ range $value := $values }} + + + + + {{ end }} + +
WhenValue
{{ $value.Time.Format "2006-01-02 15:04:05" }}{{ $value.Value }}
+
+ {{ $first = false }} {{ end }}
{{ end }} diff --git a/web/web.go b/web/web.go index 9d8c2fd..3047703 100644 --- a/web/web.go +++ b/web/web.go @@ -714,7 +714,10 @@ func (web *Web) watchView(c *gin.Context) { numericalMap[value.Name] = append(numericalMap[value.Name], value) } else { // probably very inefficient to prepend, but want newest values at the top - categoricalMap[value.Name] = append([]*FilterOutput{value}, categoricalMap[value.Name]...) + valueName := strings.ReplaceAll(value.Name, " ", "_") + valueName = strings.ToLower(valueName) + categoricalMap[valueName] = append([]*FilterOutput{value}, categoricalMap[valueName]...) + log.Println(categoricalMap) } }