From ad56296a83c2e82768adc13cdca6a8558c541e36 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Thu, 26 Mar 2015 01:31:46 +0100 Subject: [PATCH] add nodelist --- lib/main.js | 9 +++-- lib/nodelist.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 lib/nodelist.js diff --git a/lib/main.js b/lib/main.js index 74dd30b..4a54eb3 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,9 +1,9 @@ -require(["router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "simplenodelist", "infobox/main"], -function (Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, SimpleNodelist, Infobox) { +require(["router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main"], +function (Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, Nodelist, SimpleNodelist, Infobox) { getJSON("config.json").then(main) function main(config) { - var linklist, lostnodeslist, map, meshstats, newnodeslist, router + var linklist, lostnodeslist, map, meshstats, newnodeslist, nodelist, router function createGUI() { moment.locale("de") @@ -22,6 +22,7 @@ function (Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, SimpleNode meshstats = new Meshstats() newnodeslist = new SimpleNodelist(config, "firstseen", router, "Neue Knoten") lostnodeslist = new SimpleNodelist(config, "lastseen", router, "Verschwundene Knoten") + nodelist = new Nodelist(router) linklist = new Linklist(linkScale, router) sidebar.add(meshstats) @@ -29,6 +30,7 @@ function (Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, SimpleNode newlost.add(newnodeslist) newlost.add(lostnodeslist) tabs.add("Neu & Verschwunden", newlost) + tabs.add("Alle Knoten", nodelist) tabs.add("Verbindungen", linklist) router.addTarget(infobox) @@ -111,6 +113,7 @@ function (Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, SimpleNode map.setData(now, newnodes, lostnodes, onlinenodes, links) meshstats.setData(nodes) + nodelist.setData(now, nodes) linklist.setData(links) newnodeslist.setData(newnodes) lostnodeslist.setData(lostnodes) diff --git a/lib/nodelist.js b/lib/nodelist.js new file mode 100644 index 0000000..f1d1399 --- /dev/null +++ b/lib/nodelist.js @@ -0,0 +1,99 @@ +define(function () { + return function(router) { + var self = this + var el + + self.render = function (d) { + el = document.createElement("div") + d.appendChild(el) + } + + self.setData = function (now, nodes) { + if (nodes.length == 0) + return + + var h2 = document.createElement("h2") + h2.textContent = "Knoten" + el.appendChild(h2) + + var table = document.createElement("table") + var thead = document.createElement("thead") + + var tr = document.createElement("tr") + var th1 = document.createElement("th") + th1.textContent = "Knoten" + tr.appendChild(th1) + + var th2 = document.createElement("th") + th2.textContent = "Firmware" + tr.appendChild(th2) + + var th3 = document.createElement("th") + th3.textContent = "Uptime" + tr.appendChild(th3) + + thead.appendChild(tr) + + table.appendChild(thead) + + var tbody = document.createElement("tbody") + + nodes.forEach( function (d) { + var row = document.createElement("tr") + + var td1 = document.createElement("td") + var a = document.createElement("a") + a.textContent = d.nodeinfo.hostname + a.href = "#" + a.onclick = router.node(d) + a.classList.add("hostname") + a.classList.add(d.flags.online ? "online" : "offline") + td1.appendChild(a) + row.appendChild(td1) + + if (has_location(d)) { + var span = document.createElement("span") + span.classList.add("icon") + span.classList.add("ion-location") + td1.appendChild(span) + } + + var td2 = document.createElement("td") + td2.textContent = "software" in d.nodeinfo ? d.nodeinfo.software.firmware.release : "" + row.appendChild(td2) + + var td3 = document.createElement("td") + showUptime(td3, d) + row.appendChild(td3) + + tbody.appendChild(row) + }) + + table.appendChild(tbody) + + new Tablesort(table) + + el.appendChild(table) + + function showUptime(el, d) { + var uptime + if (d.flags.online && "uptime" in d.statistics) + uptime = Math.round(d.statistics.uptime / 3600) + else if (!d.flags.online && "lastseen" in d) + uptime = Math.round(-(now - d.lastseen) / 3600000) + + var s = "" + + if (uptime !== undefined) { + if (Math.abs(uptime) >= 24) + s = Math.round(uptime/24) + "d" + else + s = uptime + "h" + } + + el.textContent = s + el.setAttribute("data-sort", uptime !== undefined ? -uptime : 0) + } + } + } +})