ffhb/freifunkmanager
ffhb
/
freifunkmanager
mirror of https://github.com/FreifunkBremen/freifunkmanager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tables ready

This commit is contained in:
Martin Geno 2016-07-03 09:59:03 +02:00
parent 87ecc51d2d
commit 81fa43a3af
5 changed files with 143 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build

@ -1 +1 @@
Subproject commit 76b5f55df89b655710e8607f0029895b7a41abe0
Subproject commit 6a506361fded91e48a5282a63fa0b195084a0f2a

6
css/main.css
View File

@ -45,3 +45,9 @@ button,input{
i.icon{
font: normal normal normal 12px/1 FontAwesome;
}
i.icon.online{
color: green;
}
i.icon.offline{
color: red;
}

5
js/controller/aliases.js
View File

@ -12,7 +12,6 @@ define(["tablesort", "tablesort.numeric"],function(){
table.classList.add("table");
thead.innerHTML = "<tr><th>Node</th><th class=\"no-sort\">Freq</th><th>Channel</th><th>Power</th><th>Location</th></tr>";
console.log(Tablesort);
var toChangeIcon = function(el){
var icon = document.createElement("i");
@ -28,10 +27,10 @@ define(["tablesort", "tablesort.numeric"],function(){
//Node
td = document.createElement("td");
td.classList.add("text");
if(alias.hostname && alias.hostname != node.nodeinfo.hostname){
if(alias && alias.hostname && node.nodeinfo && alias.hostname != node.nodeinfo.hostname){
toChangeIcon(td);
}
td.appendChild(document.createTextNode((alias.hostname)?alias.hostname:node.nodeinfo.hostname));
td.appendChild(document.createTextNode((alias && alias.hostname)?alias.hostname:node.nodeinfo.hostname));
text = document.createElement("small");
text.textContent = nodeid;
td.appendChild(text);

136
js/controller/nodes.js
View File

@ -1,12 +1,142 @@
define(function(){
define(["moment","tablesort", "tablesort.numeric"],function(moment){
var data;
return function(el){
return function(el,map){
var title = document.createElement("h1"),
table = document.createElement("table"),
thead = document.createElement("thead"),
tbody = document.createElement("tbody"),
sort;
title.textContent = "Nodes";
table.appendChild(thead);
table.appendChild(tbody);
table.classList.add("table");
thead.innerHTML = "<tr><th>Last</th><th>Node</th><th>First</th><th class=\"no-sort\">Freq</th><th>Clients</th><th>Channel</th><th>Power</th><th>Location</th></tr>";
var toChangeIcon = function(el){
var icon = document.createElement("i");
icon.classList.add("icon");
icon.textContent = "\uf096";
el.appendChild(icon);
};
var row = function(nodeid,node,alias){
var icon,td,split1,split2,text,
tr = document.createElement("tr");
td = document.createElement("td");
td.classList.add("text");
icon = document.createElement("i");
icon.classList.add("icon");
icon.classList.add((node.flags && node.flags.online)?"online":"offline");
icon.textContent = "\uf111";
td.appendChild(icon);
text = document.createElement("small");
text.textContent = moment(node.lastseen).fromNow(true);
td.setAttribute("data-sort",node.lastseen);
td.appendChild(text);
tr.appendChild(td);
//Node
td = document.createElement("td");
td.classList.add("text");
td.appendChild(document.createTextNode((alias && alias.hostname)?alias.hostname:node.nodeinfo.hostname));
text = document.createElement("small");
text.textContent = nodeid;
td.appendChild(text);
tr.appendChild(td);
td = document.createElement("td");
td.classList.add("text");
text = document.createElement("small");
text.textContent = moment(node.firstseen).fromNow(true);
td.setAttribute("data-sort",node.firstseen);
td.appendChild(text);
tr.appendChild(td);
td = document.createElement("td");
td.classList.add("split");
var freq24 = document.createElement("span");
freq24.textContent = "2.4 Ghz";
var freq5 = document.createElement("span");
freq5.textContent = "5 Ghz";
td.appendChild(freq24);
td.appendChild(freq5);
tr.appendChild(td);
td = document.createElement("td");
td.classList.add("split");
split1 = document.createElement("span");
var wifi24 =(node.statistics && node.statistics.clients.wifi24)?node.statistics.clients.wifi24:0;
split1.textContent = wifi24;
split2 = document.createElement("span");
var wifi5 = (node.statistics && node.statistics.clients.wifi5)?node.statistics.clients.wifi5:0;
split2.textContent = wifi5;
td.setAttribute("data-sort",wifi24+wifi5);
td.appendChild(split1);
td.appendChild(split2);
tr.appendChild(td);
td = document.createElement("td");
td.classList.add("split");
split1 = document.createElement("span");
split2 = document.createElement("span");
text = document.createTextNode((alias && alias.wireless !== undefined && alias.wireless.channel24)?alias.wireless.channel24:((node.nodeinfo.wireless && node.nodeinfo.wireless.channel24)?node.nodeinfo.wireless.channel24:'-'));
split1.appendChild(text);
text = document.createTextNode((alias && alias.wireless !== undefined && alias.wireless.channel5)?alias.wireless.channel5:((node.nodeinfo.wireless && node.nodeinfo.wireless.channel5)?node.nodeinfo.wireless.channel5:'-'));
split2.appendChild(text);
td.appendChild(split1);
td.appendChild(split2);
tr.appendChild(td);
td = document.createElement("td");
td.classList.add("split");
split1 = document.createElement("span");
split2 = document.createElement("span");
text = document.createTextNode((alias && alias.wireless !== undefined && alias.wireless.txpower24)?alias.wireless.txpower24:((node.nodeinfo.wireless && node.nodeinfo.wireless.txpower24)?node.nodeinfo.wireless.txpower24:'-'));
split1.appendChild(text);
text = document.createTextNode((alias && alias.wireless !== undefined && alias.wireless.txpower5)?alias.wireless.txpower5:((node.nodeinfo.wireless && node.nodeinfo.wireless.txpower5)?node.nodeinfo.wireless.txpower5:'-'));
split2.appendChild(text);
td.appendChild(split1);
td.appendChild(split2);
tr.appendChild(td);
//Location
td = document.createElement("td");
icon = document.createElement("i");
icon.classList.add("icon");
icon.textContent = "\uf124";
icon.onclick = function () {
window.location.href = "#map/"+nodeid;
map.render(nodeid);
};
td.appendChild(icon);
tr.appendChild(td);
tbody.appendChild(tr);
if(sort === undefined)
sort = new Tablesort(table);
sort.refresh();
};
var render = function() {
tbody.textContent = "";
if(data !== undefined)
Object.keys(data.nodes).map(function(key){
row(key,data.nodes[key],data.aliases[key]);
});
};
return {
storageNotify: function(d){
data = d;
render();
},
controller: function(){
el.textContent = "Not implemented";
el.textContent = "";
el.appendChild(title);
el.appendChild(table);
render();
}
};
};

2
js/main.js
View File

@ -23,7 +23,7 @@ function (Router, storage, menu, popup, controllerNodes, controllerAliases, cont
var popupInstance = popup(document.body,map);
store.addNotifyNew(popupInstance);
var nodes = controllerNodes(el);
var nodes = controllerNodes(el,map);
store.addNotify(nodes);
Router.config({