luci-app-nlbwmon: always fetch latest data
authorJo-Philipp Wich <jo@mein.io>
Tue, 1 Aug 2017 11:51:45 +0000 (13:51 +0200)
committerJo-Philipp Wich <jo@mein.io>
Sat, 5 Aug 2017 12:27:27 +0000 (14:27 +0200)
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>
applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm

index 749b42116ddaf31d96913fad50e1027abffa4d2c..7e85acefb357b3d68f06688ad1c220dc7fb99950 100644 (file)
@@ -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);