From e276df205163425d43f7be04bd513569b26ad5b9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 1 Aug 2017 13:51:45 +0200 Subject: [PATCH] luci-app-nlbwmon: always fetch latest data 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 --- applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm index 749b42116..7e85acefb 100644 --- a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm +++ b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm @@ -430,19 +430,21 @@ function renderPeriods() for (var e, i = trafficPeriods.length - 1; e = trafficPeriods[i]; i--) { var d1 = new Date(e); - var d2; + var d2, pd; if (i) { d2 = new Date(trafficPeriods[i - 1]); d2.setDate(d2.getDate() - 1); + pd = '%04d-%02d-%02d'.format(d1.getFullYear(), d1.getMonth() + 1, d1.getDate()); } else { d2 = new Date(); + pd = ''; } var opt = document.createElement('option'); 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( d1.getFullYear(), d1.getMonth() + 1, d1.getDate(), d2.getFullYear(), d2.getMonth() + 1, d2.getDate()); @@ -1040,7 +1042,7 @@ function bubbleDismiss() if (res !== null && typeof(res) === 'object' && (res.length % 3) === 0) ouiData = res; - fetchData(trafficPeriods[0]); + fetchData(''); } }; xhr.send(null); -- 2.11.0