freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

statistics.html: Don't include orphans in gateway overview (2) 

Also remove non-selected orphans.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2018-02-04 23:29:48 +01:00
parent 0c77907d92
commit 3cc07acf87
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffmap/stattools.py
View File

@ -188,11 +188,9 @@ def hoods_gws(mysql):
def gws(mysql,selecthood=None):
if selecthood:
where = " AND hood=%s"
wherewhere = "WHERE hood=%s"
tup = (selecthood,)
else:
where = ""
wherewhere = ""
tup = ()
macs = mysql.fetchall("""
@ -201,22 +199,22 @@ def gws(mysql,selecthood=None):
INNER JOIN router_gw ON router.id = router_gw.router
LEFT JOIN (gw_netif INNER JOIN gw ON gw_netif.gw = gw.id)
ON router_gw.mac = gw_netif.mac
{}
WHERE router.status <> 'orphaned' {}
GROUP BY router_gw.mac
ORDER BY ISNULL(gw.name), gw.name ASC, gw_netif.netif ASC, router_gw.mac ASC
""".format(wherewhere),tup)
""".format(where),tup)
selected = mysql.fetchall("""
SELECT router_gw.mac, router.status, COUNT(router_gw.router) AS count
FROM router
INNER JOIN router_gw ON router.id = router_gw.router
WHERE router_gw.selected = TRUE {}
WHERE router_gw.selected = TRUE AND router.status <> 'orphaned' {}
GROUP BY router_gw.mac, router.status
""".format(where),tup)
others = mysql.fetchall("""
SELECT router_gw.mac, router.status, COUNT(router_gw.router) AS count
FROM router
INNER JOIN router_gw ON router.id = router_gw.router
WHERE router_gw.selected = FALSE {}
WHERE router_gw.selected = FALSE AND router.status <> 'orphaned' {}
GROUP BY router_gw.mac, router.status
""".format(where),tup)