From df70c0d3288d5dcf40b99b5db7f860dc318533ce Mon Sep 17 00:00:00 2001 From: Ayushman Tripathi Date: Sun, 29 Oct 2023 17:14:05 +0530 Subject: luci-app-olsr: change menu order and improve etx display for neighbours status view. Signed-off-by: Ayushman Tripathi --- .../resources/view/olsr/status-olsr/neighbors.js | 96 +++++++++++----------- .../share/luci/menu.d/luci-app-olsr-frontend.json | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'applications/luci-app-olsr') diff --git a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js index bc14915814..694e0a8eb8 100644 --- a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js +++ b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js @@ -161,26 +161,26 @@ return view.extend({ }); await Promise.all(networkPromises); - var res = ''; + var res = ''; var self = this; - await (async function() { - try { - res = await self.callGetHosts(); - } - catch (e) { - console.error(e); - } - })(); + await (async function () { + try { + res = await self.callGetHosts(); + } + catch (e) { + console.error(e); + } + })(); function matchHostnames(ip) { var lines = res.hosts.split('\n'); for (var i = 0; i < lines.length; i++) { var ipandhostname = lines[i].trim().split(/\s+/); if (ipandhostname[0] === ip) { - return ipandhostname[1]; + return ipandhostname[1]; } - } - return null; + } + return null; } var modifiedData = await Promise.all( data.map(async function (v) { @@ -197,7 +197,7 @@ return view.extend({ v.hostname = hostname; } } - var hosthints = await network.getHostHints(); + var hosthints = await network.getHostHints(); var interfac = await network.getStatusByAddress(v.localIP); var lmac = await hosthints.getMACAddrByIPAddr(v.localIP); var rmac = await hosthints.getMACAddrByIPAddr(v.remoteIP); @@ -281,7 +281,7 @@ return view.extend({ var rv = []; for (var k = 0; k < neigh_res.length; k++) { var link = neigh_res[k]; - link.linkCost = parseInt(link.linkCost) || 0; + link.linkCost = (link.linkCost).toFixed(3) || 0; if (link.linkCost === 4194304) { link.linkCost = 0; } @@ -299,7 +299,7 @@ return view.extend({ ifn: link.interface, lq: link.linkQuality.toFixed(3), nlq: link.neighborLinkQuality.toFixed(3), - cost: link.linkCost.toFixed(3), + cost: link.linkCost, snr: link.snr, signal: link.signal, noise: link.noise, @@ -365,7 +365,7 @@ return view.extend({ '
' + - (neigh?.ifn?.interface ?? '?') + + (neigh?.ifn?.interface ?? '?') + '
' + '