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

luci-app-nlbwmon: Fixed incorrect period parameter/display

Browse source 
Switch from using the unreliable string data constructor syntax to
a more explicit year / month / day variant and pass through the
period value as-is in order to ensure that the proper start date
is requested from the backend.

This should fix issues with prevent the display of older data
periods in the nlbwmon gui.

Ref: https://github.com/jow-/nlbwmon/issues/25
Ref: https://github.com/openwrt/luci/pull/2496
Suggested-by: Aktanusa <chanam.geo@yahoo.com>
[squashed commits, add a more thorough commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-02-01 13:54:32 -05:00
parent eda8f02dac
commit bd56c1aac6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,13 +226,15 @@ function renderPeriods()
var sel = document.getElementById('nlbw.period'); var sel = document.getElementById('nlbw.period');
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 ymd1 = e.split(/-/);
var d2, pd; var d1 = new Date(+ymd1[0], +ymd1[1] - 1, +ymd1[2]);
var ymd2, d2, pd;
if (i) { if (i) {
d2 = new Date(trafficPeriods[i - 1]); ymd2 = trafficPeriods[i - 1].split(/-/);
d2 = new Date(+ymd2[0], +ymd2[1] - 1, +ymd2[2]);
d2.setDate(d2.getDate() - 1); d2.setDate(d2.getDate() - 1);
pd = '%04d-%02d-%02d'.format(d1.getFullYear(), d1.getMonth() + 1, d1.getDate()); pd = e;
} }
else { else {
d2 = new Date(); d2 = new Date();