diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-02-01 13:54:32 -0500 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-02-15 12:21:51 +0100 |
| commit | c87900c6a00fad9735427e80dfa17d419df3ff9c (patch) | |
| tree | 2298b595b3277805d77e6616bb89d0fb4c565cc7 | |
| parent | e1e3e238b05a99dd6033aa3d922f62c15f9c21dc (diff) | |
luci-app-nlbwmon: Fixed incorrect period parameter/display
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>
(backported from commit bd56c1aac650c9d60d9f66bb0c923b0346f3fa41)
(cherry picked from commit 30d9bc02b2a8194e93abb0943082f6630fb1acf6)
| -rw-r--r-- | applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm index 932c8849a7..73e58b1112 100644 --- a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm +++ b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm @@ -429,13 +429,15 @@ function renderPeriods() var sel = document.getElementById('nlbw.period'); for (var e, i = trafficPeriods.length - 1; e = trafficPeriods[i]; i--) { - var d1 = new Date(e); - var d2, pd; + var ymd1 = e.split(/-/); + var d1 = new Date(+ymd1[0], +ymd1[1] - 1, +ymd1[2]); + var ymd2, d2, pd; 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); - pd = '%04d-%02d-%02d'.format(d1.getFullYear(), d1.getMonth() + 1, d1.getDate()); + pd = e; } else { d2 = new Date(); |