# HG changeset patch
# User drewp@bigasterisk.com
# Date 1565826057 25200
# Node ID 5fd7aef3b2b22b78a0236f107205ca8884669651
# Parent 23ab244aa649b979af7618e815c7e4b45b7a339c
index page updates. include wifi badg data.
Ignore-this: e4cecff1c9886d17f64c281dd4f52c7b
diff -r 23ab244aa649 -r 5fd7aef3b2b2 service/wifi/index.html
--- a/service/wifi/index.html Mon Aug 12 16:46:52 2019 -0700
+++ b/service/wifi/index.html Wed Aug 14 16:40:57 2019 -0700
@@ -1,82 +1,74 @@
-
- wifi
-
-
-
-
-
-
-
-
- Devices on wifi
- go to dhcpleases
-
-
-
-
+
+
+ wifi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- | name |
- MAC |
- Connected |
-
-
-
- | {{item.deviceName}} |
- {{item.mac}} |
- {{item.connectedAgo}} |
-
-
-
-
-
-
-
-
-
+ sg.addEventListener('graph-changed', (ev) => {
+ dirty = true;
+ requestAnimationFrame(repaint);
+ });
+ repaint();
+ };
+ setTimeout(startPainting, 10);
+
+
+
+
+
diff -r 23ab244aa649 -r 5fd7aef3b2b2 service/wifi/requirements.txt
--- a/service/wifi/requirements.txt Mon Aug 12 16:46:52 2019 -0700
+++ b/service/wifi/requirements.txt Wed Aug 14 16:40:57 2019 -0700
@@ -12,5 +12,5 @@
cycloneerr
patchablegraph==0.5.0
rdfdb==0.8.0
-standardservice==0.4.0
+standardservice==0.6.0
diff -r 23ab244aa649 -r 5fd7aef3b2b2 service/wifi/scrape.py
--- a/service/wifi/scrape.py Mon Aug 12 16:46:52 2019 -0700
+++ b/service/wifi/scrape.py Wed Aug 14 16:40:57 2019 -0700
@@ -64,10 +64,11 @@
if row['contype'] in ['2.4G', '5G']:
orbi = macUri(row['conn_orbi_mac'])
- triples.add((orbi, ROOM['wifiBand'],
- ROOM['wifiBand/%s' % row['contype']]))
+ ct = ROOM['wifiBand/%s' % row['contype']]
triples.add((uri, ROOM['connectedToAp'], orbi))
+ triples.add((uri, ROOM['wifiBand'], ct))
triples.add((orbi, RDF.type, ROOM['AccessPoint']))
+ triples.add((orbi, ROOM['wifiBand'], ct))
triples.add((orbi, ROOM['macAddress'],
Literal(row['conn_orbi_mac'].lower())))
triples.add((orbi, RDFS.label, Literal(row['conn_orbi_name'])))