Fix calculation of the network stats.

diff --git a/www/templates/stasy-stats-network.html b/www/templates/stasy-stats-network.html
index 83aa46fd648469bbd535c617045787595d869882..9d389cfa3f4c96fb13102d096c60026f66e65672 100644 (file)
--- a/www/templates/stasy-stats-network.html
+++ b/www/templates/stasy-stats-network.html
@@ -7,6 +7,6 @@
        <p>
                This chart shows us which is the most favourite network configuration.
        </p>
-       {{ modules.StasyTable(network_zones, sortby="percentage") }}´
+       {{ modules.StasyTable(network_zones, sortby="percentage", percentage=True) }}
 {% end block %}
 

diff --git a/www/webapp/backend/stasy.py b/www/webapp/backend/stasy.py
index a9ce4dd2f3ee26cc68255450ec1364fe3430db82..6050163e34816dbb3e7450627911112e9dad4b5b 100644 (file)
--- a/www/webapp/backend/stasy.py
+++ b/www/webapp/backend/stasy.py
@@ -632,10 +632,12 @@ class Stasy(object):
        def get_network_zones_map(self):
                zones = { "green" : 0, "blue" : 0, "orange" : 0, "red" : 0 }
 
+               all = self.query({ "profile.network" : { "$exists" : True }})
+
                for zone in zones.keys():
                        zones[zone] = self.query({
                                "profile.network.%s" % zone : True,
-                       }).count()
+                       }).count() / all.count()
 
                return zones
 

diff --git a/www/webapp/ui_modules.py b/www/webapp/ui_modules.py
index 2105385df566ef8d868dc39ce590b7f95abda8bc..a9d6aa92dfbffb787d278f2328d79508aa1fe6ad 100644 (file)
--- a/www/webapp/ui_modules.py
+++ b/www/webapp/ui_modules.py
@@ -141,7 +141,7 @@ class TrackerPeerListModule(UIModule):
 
 
 class StasyTableModule(UIModule):
-       def render(self, items, sortby="key", reverse=False):
+       def render(self, items, sortby="key", reverse=False, percentage=False):
                hundred_percent = 0
                for v in items.values():
                        hundred_percent += v
@@ -159,7 +159,10 @@ class StasyTableModule(UIModule):
                if hundred_percent:
                        _items = []
                        for k in keys:
-                               v = items[k] * 100 / hundred_percent
+                               if not percentage:
+                                       v = items[k] * 100 / hundred_percent
+                               else:
+                                       v = items[k] * 100
                                _items.append((k, v))
                        items = _items