router.html: Move neighbor stats rearrangement to server code

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

ffmap/web/api.py

@@ -48,10 +48,15 @@ def load_neighbor_stats(dbid):
 	""",(dbid,))
 	mysql.close()
 
+	neighdata = {}
+
 	for ns in neighfetch:
 		ns["time"] = {"$date": int(mysql.utcawareint(ns["time"]).timestamp()*1000)}
+		if not ns["mac"] in neighdata:
+			neighdata[ns["mac"]] = []
+		neighdata[ns["mac"]].append(ns)
 
-	r = make_response(json.dumps(neighfetch))
+	r = make_response(json.dumps(neighdata))
 	r.mimetype = 'application/json'
 	return r
 

ffmap/web/application.py

@@ -223,22 +223,26 @@ def router_info(dbid):
 						desc = "Ethernet Multi-Port"
 				n["description"] = desc
 				n["color"] = color
-			
+
 			## Set color for neighbors AFTER json if clause
 			for n in router["neighbours"]:
 				n["color"] = neighbor_color(n["quality"],router["routing_protocol"])
-			
+
 			router["stats"] = mysql.fetchall("""SELECT * FROM router_stats WHERE router = %s""",(dbid,))
 			for s in router["stats"]:
 				s["time"] = mysql.utcawareint(s["time"])
-			
+
 			threshold_neighstats = (utcnow() - datetime.timedelta(hours=24)).timestamp()
 			neighfetch = mysql.fetchall("""
 				SELECT quality, mac, time FROM router_stats_neighbor WHERE router = %s AND time > %s
 			""",(dbid,threshold_neighstats,))
-			
+
+			neighdata = {}
 			for ns in neighfetch:
-				ns["time"] = mysql.utcawareint(ns["time"])
+				ns["time"] = {"$date": int(mysql.utcawareint(ns["time"]).timestamp()*1000)}
+				if not ns["mac"] in neighdata:
+					neighdata[ns["mac"]] = []
+				neighdata[ns["mac"]].append(ns)
 
 			gwfetch = mysql.fetchall("""
 				SELECT quality, mac, time FROM router_stats_gw WHERE router = %s
@@ -319,7 +323,7 @@ def router_info(dbid):
 			router = router,
 			mac = mac,
 			tileurls = tileurls,
-			neighstats = neighfetch,
+			neighstats = neighdata,
 			gwstats = gwfetch,
 			authuser = is_authorized(router["user"], session),
 			authadmin = session.get('admin')

ffmap/web/static/js/graph.js

@@ -102,30 +102,13 @@ function network_graph(netif) {
 function neighbour_graph(neighbours) {
 	var meshstat = $("#meshstat");
 	var pdata = [];
-	var data = {};
 	var len, i;
 	var mac;
 	
-	for (len=neigh_stats.length, i=0; i<len; i++) {
-		mac = neigh_stats[i].mac;
-		if(!(mac in data)) {
-			data[mac] = [];
-		}
-		try {
-			var quality = neigh_stats[i].quality;
-			var date_value = neigh_stats[i].time.$date;
-			if(quality == null) {
-				quality = 0;
-			}
-			data[mac].push([date_value, Math.abs(quality)]);
-		}
-		catch(TypeError) {
-			// pass
-		}
-	}
-	
-	for (var j in data) {
+	for (var j in neigh_stats) {
+		var dataset = neigh_stats[j];
 		var label = j;
+		var data = [];
 		for(n=0; n<neighbours.length; n++) {
 			if (neighbours[n].mac != j) { continue; }
 			label = neighbours[n].name;
@@ -137,7 +120,20 @@ function neighbour_graph(neighbours) {
 				}
 			}
 		}
-		pdata.push({"label": label, "data": data[j]});
+		for (len=dataset.length, i=0; i<len; i++) {
+			try {
+				var quality = dataset[i].quality;
+				var date_value = dataset[i].time.$date;
+				if(quality == null) {
+					quality = 0;
+				}
+				data.push([date_value, Math.abs(quality)]);
+			}
+			catch(TypeError) {
+				// pass
+			}
+		}
+		pdata.push({"label": label, "data": data});
 	}
 	if(pdata.length == 0) { pdata.push({"label": "empty", "data": []}); }
 	var plot = $.plot(meshstat, pdata, {

ffmap/web/templates/router.html

@@ -419,7 +419,7 @@
 	<script type="text/javascript">
 		var router_stats = {{ router.stats|statbson2json|safe }};
 		var netif_stats = null;
-		var neigh_stats = {{ neighstats|statbson2json|safe }};
+		var neigh_stats = {{ neighstats|safe }};
 		var gw_stats = {{ gwstats|statbson2json|safe }};
 		var neighbours = [
 		{%- for neighbour in router.neighbours %}