From a5b06d62c63cf75e0a5e5c3abd372464bb584617 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 17 Jan 2018 00:52:52 +0100
Subject: [PATCH] statistics.html: Make hood and GW tables sortable

This causes some adjustments in the underlying select queries.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 ffmap/stattools.py                  |  6 +--
 ffmap/web/templates/statistics.html | 73 ++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/ffmap/stattools.py b/ffmap/stattools.py
index 0334d37..fbbbc1f 100644
--- a/ffmap/stattools.py
+++ b/ffmap/stattools.py
@@ -190,7 +190,7 @@ def gws(mysql,selecthood=None):
 		tup = ()
 	
 	macs = mysql.fetchall("""
-		SELECT router_gw.mac
+		SELECT router_gw.mac, CONCAT(ISNULL(gw.name),'-',IF(NOT ISNULL(gw.name),CONCAT(gw.name,'-',gw_netif.netif),router_gw.mac)) AS sort
 		FROM router
 		INNER JOIN router_gw ON router.id = router_gw.router
 		LEFT JOIN (gw_netif INNER JOIN gw ON gw_netif.gw = gw.id)
@@ -198,7 +198,7 @@ def gws(mysql,selecthood=None):
 		{}
 		GROUP BY router_gw.mac
 		ORDER BY ISNULL(gw.name), gw.name ASC, gw_netif.netif ASC, router_gw.mac ASC
-	""".format(wherewhere),tup,"mac")
+	""".format(wherewhere),tup)
 	selected = mysql.fetchall("""
 		SELECT router_gw.mac, router.status, COUNT(router_gw.router) AS count
 		FROM router
@@ -216,7 +216,7 @@ def gws(mysql,selecthood=None):
 	
 	result = OrderedDict()
 	for m in macs:
-		result[m] = {"selected":{},"others":{}}
+		result[m["mac"]] = {"selected":{},"others":{},"sort":m["sort"]}
 	for rs in selected:
 		result[rs["mac"]]["selected"][rs["status"]] = rs["count"]
 	for rs in others:
diff --git a/ffmap/web/templates/statistics.html b/ffmap/web/templates/statistics.html
index 6a516aa..4f7778e 100644
--- a/ffmap/web/templates/statistics.html
+++ b/ffmap/web/templates/statistics.html
@@ -12,6 +12,9 @@
 	<script src="{{ url_for('static', filename='js/graph/jquery.flot.pie.js') }}"></script>
 	<script src="{{ url_for('static', filename='js/graph/jquery.flot.tooltip.js') }}"></script>
 	<script src="{{ url_for('static', filename='js/graph.js') }}"></script>
+	<script src="{{ url_for('static', filename='js/datatables/jquery.dataTables.min.js') }}"></script>
+	<script src="{{ url_for('static', filename='js/datatables/dataTables.bootstrap.min.js') }}"></script>
+	<link rel="stylesheet" href="{{ url_for('static', filename='css/datatables/dataTables.bootstrap.min.css') }}">
 	<style type="text/css">
 		.table-condensed {
 			margin-bottom: 0;
@@ -51,29 +54,34 @@
 			<div class="panel panel-default">
 				<div class="panel-heading">Hoods</div>
 				<div class="panel-body">
-					<table class="table table-condensed table-hoods">
+					<table id="hoodlist" class="table table-condensed table-hoods">
+					<thead>
 						<tr>
 							<th class="firstrow">Hood</th>
-							<th class="stats" title="Gateways">GW</th>
+							<th class="stats" title="Gateways">G</th>
 							<th class="success" title="Online Routers">On</th>
 							<th class="danger" title="Offline Routers">Off</th>
-							<th class="warning" title="Unknown Routers">Unkn.</th>
+							<th class="warning" title="Unknown Routers">Unk.</th>
 							<th class="active" title="Total Routers">Sum</th>
-							<th class="info">Clients</th>
-							<th class="stats">Stats</th>
+							<th class="info">User</th>
+							<th class="stats">Stat</th>
 						</tr>
+					</thead>
+					<tbody>
 						{%- for hood, value in hoods|dictsort %}
 						<tr>
 							<td class="firstrow"><a href="{{ url_for('router_list', q='hood:^%s$' % hood.replace(' ','_')) }}">{{ hood }}</a></td>
 							<td class="stats">{{ hoods_gws[hood] or "-" }}</td>
 							<td class="success">{{ value["online"] or 0 }}</td>
-							<td class="danger">{{ value["offline"] or 0 }}{%- if value["orphaned"] %} ({{ value["orphaned"] or 0 }}){%- endif %}</td>
+							<td class="danger" data-order="{{ value["offline"] or 0 }}">{{ value["offline"] or 0 }}{%- if value["orphaned"] %} ({{ value["orphaned"] or 0 }}){%- endif %}</td>
 							<td class="warning">{{ value["unknown"] or 0 }}</td>
 							<td class="active">{{ hoods_sum[hood]["routers"] }}</td>
 							<td class="info">{{ hoods_sum[hood]["clients"] }}</td>
 							<td class="stats"><a href="{{ url_for('global_hoodstatistics', selecthood='%s' % hood) }}">Stats</a></td> 
 						</tr>
 						{%- endfor %}
+					</tbody>
+					<tfoot>
 						<tr>
 							<th class="firstrow">Sum</th>
 							<td class="stats">&nbsp;</td>
@@ -84,6 +92,7 @@
 							<td class="info">{{ clients }}</td>
 							<td class="stats"><a href="{{ url_for('global_statistics') }}">Global</a></td> 
 						</tr>
+					</tfoot>
 					</table>
 				</div>
 			</div>
@@ -129,18 +138,21 @@
 			<div class="panel panel-default">
 				<div class="panel-heading">Gateways (selected / others){%- if selecthood %} @ {{ selecthood }}{%- endif -%}</div>
 				<div class="panel-body">
-					<table class="table table-condensed table-hoods">
+					<table id="gwlist" class="table table-condensed table-hoods">
+					<thead>
 						<tr>
 							<th class="firstrow">Gateway</th>
-							<th class="success" title="Online Routers">Online</th>
-							<th class="danger" title="Offline Routers">Offline</th>
-							<th class="warning" title="Unknown Routers">Unkn.</th>
-							<th class="active" title="Total Routers">Total</th>
-							<th class="stats">Stats</th>
+							<th class="success" title="Online Routers">On</th>
+							<th class="danger" title="Offline Routers">Off</th>
+							<th class="warning" title="Unknown Routers">Unk.</th>
+							<th class="active" title="Total Routers">Sum</th>
+							<th class="stats">Stat</th>
 						</tr>
+					</thead>
+					<tbody>
 						{%- for mac, value in gws.items() %}
 						<tr>
-							<td class="firstrow"><p style="margin:0"><a href="{{ url_for('router_list', q='selected:^%s$' % mac) }}">{{ gws_info[mac]["label"] }}</a></p>
+							<td class="firstrow" data-order="{{ value["sort"] }}"><p style="margin:0"><a href="{{ url_for('router_list', q='selected:^%s$' % mac) }}">{{ gws_info[mac]["label"] }}</a></p>
 							{%- if gws_info[mac]["gw"] %}
 							<p style="margin:0;font-size:12px">{{ mac }}
 							{%- if gws_info[mac]["batmac"] %}
@@ -149,13 +161,14 @@
 							</p>
 							{%- endif %}
 							</td>
-							<td class="success"><span style="font-weight:bold">{{ value["selected"]["online"] or 0 }}</span> / {{ value["others"]["online"] or 0 }}</td>
-							<td class="danger"><span style="font-weight:bold">{{ value["selected"]["offline"] or 0 }}</span> / {{ value["others"]["offline"] or 0 }}</td>
-							<td class="warning"><span style="font-weight:bold">{{ value["selected"]["unknown"] or 0 }}</span> / {{ value["others"]["unknown"] or 0 }}</td>
-							<td class="active"><span style="font-weight:bold">{{ gws_sum[mac]["routers"] if gws_sum[mac] else 0 }}</span> / {{ value["others"]|sumdict if value["others"] else 0 }}</td>
+							<td class="success" data-order="{{ (value["selected"]["online"] or 0) + (value["others"]["online"] or 0) }}"><span style="font-weight:bold">{{ value["selected"]["online"] or 0 }}</span> / {{ value["others"]["online"] or 0 }}</td>
+							<td class="danger" data-order="{{ (value["selected"]["offline"] or 0) + (value["others"]["offline"] or 0) }}"><span style="font-weight:bold">{{ value["selected"]["offline"] or 0 }}</span> / {{ value["others"]["offline"] or 0 }}</td>
+							<td class="warning" data-order="{{ (value["selected"]["unknown"] or 0) + (value["others"]["unknown"] or 0) }}"><span style="font-weight:bold">{{ value["selected"]["unknown"] or 0 }}</span> / {{ value["others"]["unknown"] or 0 }}</td>
+							<td class="active" data-order="{{ (value["selected"]|sumdict if value["selected"] else 0) + (value["others"]|sumdict if value["others"] else 0) }}"><span style="font-weight:bold">{{ gws_sum[mac]["routers"] if gws_sum[mac] else 0 }}</span> / {{ value["others"]|sumdict if value["others"] else 0 }}</td>
 							<td class="stats"><a href="{{ url_for('global_gwstatistics', selectgw='%s' % mac) }}">Stats</a></td>
 						</tr>
 						{%- endfor %}
+					</tbody>
 					</table>
 				</div>
 			</div>
@@ -210,6 +223,32 @@
 			global_router_graph();
 			global_router_firmwares_graph();
 			global_router_models_graph();
+			
+			$("#hoodlist").DataTable({
+				"order": [],
+				"paging": false,
+				"info": false,
+				"searching": false,
+				/*"responsive": {
+					"details": false
+				},*/
+				"columnDefs": [
+					{"orderable": false, "targets": -1},
+				]
+			});
+			
+			$("#gwlist").DataTable({
+				"order": [],
+				"paging": false,
+				"info": false,
+				"searching": false,
+				/*"responsive": {
+					"details": false
+				},*/
+				"columnDefs": [
+					{"orderable": false, "targets": -1},
+				]
+			});
 		});
 	</script>
 {% endblock %}