From 0668a23961d5df06ee981d70ecb2fbf5f3fcdb07 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Thu, 3 Nov 2016 23:19:08 -0700 Subject: fixing pointer to request for marshalling, updating analytics template --- system/admin/admin.go | 10 ++++------ system/api/analytics/init.go | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'system') diff --git a/system/admin/admin.go b/system/admin/admin.go index 0e690d5..37332ba 100644 --- a/system/admin/admin.go +++ b/system/admin/admin.go @@ -386,18 +386,16 @@ var analyticsHTML = ` labels: {{ .dates }}, datasets: [{ type: 'line', - label: '{{ .unique.label }}', - // data: [4435, 7231, 3555, 19121, 10876, 5009, 3564], - data: {{ .unique.data }}, + label: 'Unique Clients', + data: {{ .unique }}, backgroundColor: 'rgba(76, 175, 80, 0.2)', borderColor: 'rgba(76, 175, 80, 1)', borderWidth: 1 }, { type: 'bar', - label: '{{ .total.label }}', - // data: [12332, 19333, 13545, 51776, 22334, 13334, 9089], - data: {{ .total.data }}, + label: 'Total Requests', + data: {{ .total }}, backgroundColor: 'rgba(33, 150, 243, 0.2)', borderColor: 'rgba(33, 150, 243, 1)', borderWidth: 1 diff --git a/system/api/analytics/init.go b/system/api/analytics/init.go index e8416ea..d050d9d 100644 --- a/system/api/analytics/init.go +++ b/system/api/analytics/init.go @@ -131,7 +131,7 @@ func Week() (map[string]interface{}, error) { err := b.ForEach(func(k, v []byte) error { var r apiRequest - err := json.Unmarshal(v, r) + err := json.Unmarshal(v, &r) if err != nil { log.Println("Error decoding json from analytics db:", err) return nil -- cgit v1.2.3