From 77d6b2893524df3c3a9e3df7c974ed054e0171ab Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 1 Mar 2021 10:27:30 +0100 Subject: luci-app-nlbwmon: fix traffic numbers display in pie chart tooltips 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 --- .../htdocs/luci-static/resources/view/nlbw/display.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'applications/luci-app-nlbwmon/htdocs/luci-static/resources') diff --git a/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js b/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js index 6d57c12c5c..ccef949fb0 100644 --- a/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js +++ b/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js @@ -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%)' }); -- cgit v1.2.3