remove "Gateway-Feature"
This commit is contained in:
parent
ca8ce8392f
commit
c13e648cc6
|
@ -182,7 +182,6 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
|
||||||
attributes.classList.add("attributes")
|
attributes.classList.add("attributes")
|
||||||
|
|
||||||
attributeEntry(attributes, "Status", showStatus(d))
|
attributeEntry(attributes, "Status", showStatus(d))
|
||||||
attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null)
|
|
||||||
attributeEntry(attributes, "Koordinaten", showGeoURI(d))
|
attributeEntry(attributes, "Koordinaten", showGeoURI(d))
|
||||||
|
|
||||||
if (config.showContact)
|
if (config.showContact)
|
||||||
|
|
|
@ -11,9 +11,6 @@ define(function () {
|
||||||
var totalClients = sum(d.nodes.all.filter(online).map( function (d) {
|
var totalClients = sum(d.nodes.all.filter(online).map( function (d) {
|
||||||
return d.statistics.clients
|
return d.statistics.clients
|
||||||
}))
|
}))
|
||||||
var totalGateways = sum(d.nodes.all.filter(online).filter( function (d) {
|
|
||||||
return d.flags.gateway
|
|
||||||
}).map(one))
|
|
||||||
|
|
||||||
var nodetext = [{ count: totalOnlineNodes, label: "online" },
|
var nodetext = [{ count: totalOnlineNodes, label: "online" },
|
||||||
{ count: totalNewNodes, label: "neu" },
|
{ count: totalNewNodes, label: "neu" },
|
||||||
|
@ -23,9 +20,8 @@ define(function () {
|
||||||
.join(", ")
|
.join(", ")
|
||||||
|
|
||||||
stats.textContent = totalNodes + " Knoten " +
|
stats.textContent = totalNodes + " Knoten " +
|
||||||
"(" + nodetext + "), " +
|
"(" + nodetext + ") mit " +
|
||||||
totalClients + " Clients, " +
|
totalClients + " Clients"
|
||||||
totalGateways + " Gateways"
|
|
||||||
|
|
||||||
timestamp.textContent = "Diese Daten sind von " + d.timestamp.format("LLLL") + "."
|
timestamp.textContent = "Diese Daten sind von " + d.timestamp.format("LLLL") + "."
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,9 +20,6 @@ define(["chroma-js", "virtual-dom", "numeral-intl"],
|
||||||
var autoTable = document.createElement("table")
|
var autoTable = document.createElement("table")
|
||||||
autoTable.classList.add("proportion")
|
autoTable.classList.add("proportion")
|
||||||
|
|
||||||
var gwTable = document.createElement("table")
|
|
||||||
gwTable.classList.add("proportion")
|
|
||||||
|
|
||||||
function showStatGlobal(o) {
|
function showStatGlobal(o) {
|
||||||
var content, caption
|
var content, caption
|
||||||
|
|
||||||
|
@ -130,22 +127,11 @@ define(["chroma-js", "virtual-dom", "numeral-intl"],
|
||||||
return "(deaktiviert)"
|
return "(deaktiviert)"
|
||||||
})
|
})
|
||||||
|
|
||||||
var gwDict = count(onlineNodes, ["statistics", "gateway"], function (d) {
|
|
||||||
if (d === null)
|
|
||||||
return null
|
|
||||||
|
|
||||||
if (d in nodeDict)
|
|
||||||
return nodeDict[d].nodeinfo.hostname
|
|
||||||
|
|
||||||
return d
|
|
||||||
})
|
|
||||||
|
|
||||||
fillTable(statusTable, statusDict.sort(function (a, b) { return b[1] - a[1] }))
|
fillTable(statusTable, statusDict.sort(function (a, b) { return b[1] - a[1] }))
|
||||||
fillTable(fwTable, fwDict.sort(function (a, b) { return b[1] - a[1] }))
|
fillTable(fwTable, fwDict.sort(function (a, b) { return b[1] - a[1] }))
|
||||||
fillTable(hwTable, hwDict.sort(function (a, b) { return b[1] - a[1] }))
|
fillTable(hwTable, hwDict.sort(function (a, b) { return b[1] - a[1] }))
|
||||||
fillTable(geoTable, geoDict.sort(function (a, b) { return b[1] - a[1] }))
|
fillTable(geoTable, geoDict.sort(function (a, b) { return b[1] - a[1] }))
|
||||||
fillTable(autoTable, autoDict.sort(function (a, b) { return b[1] - a[1] }))
|
fillTable(autoTable, autoDict.sort(function (a, b) { return b[1] - a[1] }))
|
||||||
fillTable(gwTable, gwDict.sort(function (a, b) { return b[1] - a[1] }))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.render = function (el) {
|
self.render = function (el) {
|
||||||
|
@ -175,11 +161,6 @@ define(["chroma-js", "virtual-dom", "numeral-intl"],
|
||||||
el.appendChild(h2)
|
el.appendChild(h2)
|
||||||
el.appendChild(autoTable)
|
el.appendChild(autoTable)
|
||||||
|
|
||||||
h2 = document.createElement("h2")
|
|
||||||
h2.textContent = "Gewählter Gateway"
|
|
||||||
el.appendChild(h2)
|
|
||||||
el.appendChild(gwTable)
|
|
||||||
|
|
||||||
if (config.globalInfos)
|
if (config.globalInfos)
|
||||||
config.globalInfos.forEach( function (globalInfo) {
|
config.globalInfos.forEach( function (globalInfo) {
|
||||||
h2 = document.createElement("h2")
|
h2 = document.createElement("h2")
|
||||||
|
|
Loading…
Reference in a new issue