From 16873cbf75acf050f5a553f6736590c952cd9ca8 Mon Sep 17 00:00:00 2001 From: BroodjeAap Date: Sun, 9 Oct 2022 12:23:53 +0000 Subject: [PATCH] working watch view page, with graph --- main.go | 14 +++++++++++++- templates/watch/view.html | 30 +++++++++++++++++++++++++----- todo.md | 6 ++++-- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index eb651bf..1d5ff72 100644 --- a/main.go +++ b/main.go @@ -173,16 +173,28 @@ func (web *Web) watchView(c *gin.Context) { watch.CronEntry = &entry var values []FilterOutput - web.db.Model(&FilterOutput{}).Where("watch_id = ?", watch.ID).Find(&values) + web.db.Model(&FilterOutput{}).Order("time asc").Where("watch_id = ?", watch.ID).Find(&values) valueMap := make(map[string][]FilterOutput, len(values)) + names := make(map[string]bool, 5) for _, value := range values { + names[value.Name] = true valueMap[value.Name] = append(valueMap[value.Name], value) } + colorMap := make(map[string]int, len(names)) + index := 0 + for name, _ := range names { + colorMap[name] = index % 16 // only 16 colors + index += 1 + } + + //data := make([]map[string]string, len(valueMap)) + c.HTML(http.StatusOK, "watchView", gin.H{ "Watch": watch, "ValueMap": valueMap, + "colorMap": colorMap, }) } diff --git a/templates/watch/view.html b/templates/watch/view.html index 640b759..cec45be 100644 --- a/templates/watch/view.html +++ b/templates/watch/view.html @@ -35,25 +35,45 @@