From 30d9bc02b2a8194e93abb0943082f6630fb1acf6 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 1 Feb 2019 13:54:32 -0500 Subject: [PATCH] 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 [squashed commits, add a more thorough commit message] Signed-off-by: Jo-Philipp Wich (backported from commit bd56c1aac650c9d60d9f66bb0c923b0346f3fa41) --- .../luci-app-nlbwmon/luasrc/view/nlbw/display.htm | 10 ++++++---- 1 file 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 616bcc52a..2262737cb 100644 --- a/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm +++ b/applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm @@ -428,13 +428,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(); -- 2.25.1