From 3e33385afd5d8d2df03a954225961c30fcd7d6b4 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 31 Mar 2021 15:13:58 +0300 Subject: [PATCH] Fix 'last month' link option Fixes #898 --- assets/js/dashboard/date.js | 8 ++++++-- assets/js/dashboard/datepicker.js | 4 ++-- assets/js/dashboard/query.js | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/assets/js/dashboard/date.js b/assets/js/dashboard/date.js index 0470381c3..477307686 100644 --- a/assets/js/dashboard/date.js +++ b/assets/js/dashboard/date.js @@ -7,8 +7,12 @@ export function formatISO(date) { export function shiftMonths(date, months) { const newDate = new Date(date.getTime()) - newDate.setMonth(newDate.getMonth() + months) - return newDate + const d = newDate.getDate(); + newDate.setMonth(newDate.getMonth() + +months); + if (newDate.getDate() != d) { + newDate.setDate(0); + } + return newDate; } export function shiftDays(date, days) { diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index 8ba6bdf4f..2184ca8b7 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -294,7 +294,7 @@ class DatePicker extends React.Component { boldClass = query.period === period ? "font-bold" : ""; } - const date = opts.date ? formatISO(opts.date) : false; + opts.date = opts.date ? formatISO(opts.date) : false; const keybinds = { 'Today': 'D', @@ -308,7 +308,7 @@ class DatePicker extends React.Component { return (