Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-nlbwmon: fix traffic numbers display in pie chart tooltips

Browse source 
The pie chart tooltips used base 1000 to format traffic numbers while table
cell values were formatted using base 1024. Use base 1024 for both to report
the same values.

Fixes: #4759
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 77d6b28935)
This commit is contained in:
Jo-Philipp Wich 2021-03-01 10:27:30 +01:00
parent f644bd99b4
commit 628a1b8c8f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js
View file

@ -346,12 +346,12 @@ return view.extend({
trafData.push({
value: rec.rx_bytes + rec.tx_bytes,
label: ["%s: %%.2mB".format(key), cell]
label: ["%s: %%1024.2mB".format(key), cell]
});
connData.push({
value: rec.conns,
label: ["%s: %%.2m".format(key), cell]
label: ["%s: %%1000.2m".format(key), cell]
});
rx_total += rec.rx_bytes;
@ -404,12 +404,12 @@ return view.extend({
rxData.push({
value: rec.rx_bytes,
label: ["%s: %%.2mB".format(rec.layer7 || _('other')), cell]
label: ["%s: %%1024.2mB".format(rec.layer7 || _('other')), cell]
});
txData.push({
value: rec.tx_bytes,
label: ["%s: %%.2mB".format(rec.layer7 || _('other')), cell]
label: ["%s: %%1024.2mB".format(rec.layer7 || _('other')), cell]
});
if (rec.layer7) {
@ -533,14 +533,14 @@ return view.extend({
if (rx4_total > 0 || tx4_total > 0)
shareData.push({
value: rx4_total + tx4_total,
label: ["IPv4: %.2mB"],
label: ["IPv4: %1024.2mB"],
color: 'hsl(140, 100%, 50%)'
});
if (rx6_total > 0 || tx6_total > 0)
shareData.push({
value: rx6_total + tx6_total,
label: ["IPv6: %.2mB"],
label: ["IPv6: %1024.2mB"],
color: 'hsl(180, 100%, 50%)'
});