From 004cdfc25c39e9689fe0fb42a6e0f65ae6151c5a Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sun, 19 Nov 2017 14:44:02 +0100 Subject: [PATCH] Fixed statistics page --- pages/statistics/statistics.go | 18 ++++++++++++++++++ pages/statistics/statistics.scarlet | 1 + 2 files changed, 19 insertions(+) diff --git a/pages/statistics/statistics.go b/pages/statistics/statistics.go index 649deb63..23609371 100644 --- a/pages/statistics/statistics.go +++ b/pages/statistics/statistics.go @@ -28,6 +28,9 @@ func getUserStats() []*arn.PieChart { avatar := stats{} ip := stats{} pro := stats{} + connectionType := stats{} + roundTripTime := stats{} + downLink := stats{} for info := range arn.StreamAnalytics() { user, err := arn.GetUser(info.UserID) @@ -41,6 +44,18 @@ func getUserStats() []*arn.PieChart { size := arn.ToString(info.Screen.Width) + " x " + arn.ToString(info.Screen.Height) screenSize[size]++ + + if info.Connection.EffectiveType != "" { + connectionType[info.Connection.EffectiveType]++ + } + + if info.Connection.DownLink != 0 { + downLink[fmt.Sprintf("%.0f Mb/s", info.Connection.DownLink)]++ + } + + if info.Connection.RoundTripTime != 0 { + roundTripTime[fmt.Sprintf("%.0f ms", info.Connection.RoundTripTime)]++ + } } for user := range arn.StreamUsers() { @@ -102,6 +117,9 @@ func getUserStats() []*arn.PieChart { arn.NewPieChart("Notifications", notifications), arn.NewPieChart("Gender", gender), arn.NewPieChart("Pixel ratio", pixelRatio), + arn.NewPieChart("Connection", connectionType), + arn.NewPieChart("Ping", roundTripTime), + arn.NewPieChart("Download speed", downLink), arn.NewPieChart("IP version", ip), arn.NewPieChart("PRO accounts", pro), } diff --git a/pages/statistics/statistics.scarlet b/pages/statistics/statistics.scarlet index c14c60f6..67adaabb 100644 --- a/pages/statistics/statistics.scarlet +++ b/pages/statistics/statistics.scarlet @@ -4,6 +4,7 @@ text-align center .widget + flex-basis 300px max-width 300px .pie-chart