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

luci-app-nlbwmon: always fetch latest data

Browse source 
When displaying the most current accounting period, pass an empty timestamp
to the backend in order to query the current in-memory data instead of the
latest committed values.

This ensures that the dashboard always renders the most current data in its
default view.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-08-01 13:51:45 +02:00
parent 7387bf619f
commit e276df2051
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm
View file

@ -430,19 +430,21 @@ function renderPeriods()
for (var e, i = trafficPeriods.length - 1; e = trafficPeriods[i]; i--) { for (var e, i = trafficPeriods.length - 1; e = trafficPeriods[i]; i--) {
var d1 = new Date(e); var d1 = new Date(e);
var d2; var d2, pd;
if (i) { if (i) {
d2 = new Date(trafficPeriods[i - 1]); d2 = new Date(trafficPeriods[i - 1]);
d2.setDate(d2.getDate() - 1); d2.setDate(d2.getDate() - 1);
pd = '%04d-%02d-%02d'.format(d1.getFullYear(), d1.getMonth() + 1, d1.getDate());
} }
else { else {
d2 = new Date(); d2 = new Date();
pd = '';
} }
var opt = document.createElement('option'); var opt = document.createElement('option');
opt.setAttribute('data-duration', (d2.getTime() - d1.getTime()) / 1000); opt.setAttribute('data-duration', (d2.getTime() - d1.getTime()) / 1000);
opt.value = '%04d-%02d-%02d'.format(d1.getFullYear(), d1.getMonth() + 1, d1.getDate()); opt.value = pd;
opt.text = '%04d-%02d-%02d - %04d-%02d-%02d'.format( opt.text = '%04d-%02d-%02d - %04d-%02d-%02d'.format(
d1.getFullYear(), d1.getMonth() + 1, d1.getDate(), d1.getFullYear(), d1.getMonth() + 1, d1.getDate(),
d2.getFullYear(), d2.getMonth() + 1, d2.getDate()); d2.getFullYear(), d2.getMonth() + 1, d2.getDate());
@ -1040,7 +1042,7 @@ function bubbleDismiss()
if (res !== null && typeof(res) === 'object' && (res.length % 3) === 0) if (res !== null && typeof(res) === 'object' && (res.length % 3) === 0)
ouiData = res; ouiData = res;
fetchData(trafficPeriods[0]); fetchData('');
} }
}; };
xhr.send(null); xhr.send(null);