diff options
| -rw-r--r-- | system/admin/admin.go | 2 | ||||
| -rw-r--r-- | system/api/analytics/init.go | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/system/admin/admin.go b/system/admin/admin.go index a0c2889..f6e7d20 100644 --- a/system/admin/admin.go +++ b/system/admin/admin.go @@ -383,7 +383,7 @@ var analyticsHTML = ` var chart = new Chart(target, { type: 'bar', data: { - labels: [{{ .dates }}], + labels: [{{ range $date := .dates }} "{{ $date }}", {{ end }}], datasets: [{ type: 'line', label: 'Unique Clients', diff --git a/system/api/analytics/init.go b/system/api/analytics/init.go index 3a78e90..3d7428e 100644 --- a/system/api/analytics/init.go +++ b/system/api/analytics/init.go @@ -109,9 +109,10 @@ func serve() { } // Week returns the map containing decoded javascript needed to chart a week of data by day -func Week() (map[string]string, error) { +func Week() (map[string]interface{}, error) { // set thresholds for today and the 6 days preceeding times := [7]time.Time{} + dates := [7]string{} now := time.Now() today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC) @@ -122,12 +123,7 @@ func Week() (map[string]string, error) { // day threshold is [...n-1-i, n-1, n] times[len(times)-1-i] = day - } - - dates := []string{} - for i := range times { - // format times[j] (time.Time) into a MM/DD format for dates - dates = append(dates, times[i].Format("01/02")) + dates[len(times)-1-i] = day.Format("01/02") } // get api request analytics from db @@ -223,10 +219,8 @@ CHECK_REQUEST: return nil, err } - jsDates := strings.Join(dates, ",") - - return map[string]string{ - "dates": jsDates, + return map[string]interface{}{ + "dates": dates, "unique": string(jsUnique), "total": string(jsTotal), }, nil |