From e6d38f453965e2853955113dd1676a8f5b14903f Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 4 Jan 2021 10:04:14 +0100 Subject: [PATCH] Fix incorrect date selection ranges for history and logbook (#8045) --- src/panels/history/ha-panel-history.ts | 28 ++++++++++---------------- src/panels/logbook/ha-panel-logbook.ts | 28 ++++++++++---------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts index 566aa3c0da..dcfa327285 100644 --- a/src/panels/history/ha-panel-history.ts +++ b/src/panels/history/ha-panel-history.ts @@ -119,27 +119,21 @@ class HaPanelHistory extends LitElement { todayEnd.setDate(todayEnd.getDate() + 1); todayEnd.setMilliseconds(todayEnd.getMilliseconds() - 1); - const todayCopy = new Date(today); - - const yesterday = new Date(todayCopy.setDate(today.getDate() - 1)); - const yesterdayEnd = new Date(yesterday); - yesterdayEnd.setDate(yesterdayEnd.getDate() + 1); + const yesterday = new Date(today); + yesterday.setDate(today.getDate() - 1); + const yesterdayEnd = new Date(today); yesterdayEnd.setMilliseconds(yesterdayEnd.getMilliseconds() - 1); - const thisWeekStart = new Date( - todayCopy.setDate(today.getDate() - today.getDay()) - ); - const thisWeekEnd = new Date( - todayCopy.setDate(thisWeekStart.getDate() + 7) - ); + const thisWeekStart = new Date(today); + thisWeekStart.setDate(today.getDate() - today.getDay()); + const thisWeekEnd = new Date(thisWeekStart); + thisWeekEnd.setDate(thisWeekStart.getDate() + 7); thisWeekEnd.setMilliseconds(thisWeekEnd.getMilliseconds() - 1); - const lastWeekStart = new Date( - todayCopy.setDate(today.getDate() - today.getDay() - 7) - ); - const lastWeekEnd = new Date( - todayCopy.setDate(lastWeekStart.getDate() + 7) - ); + const lastWeekStart = new Date(today); + lastWeekStart.setDate(today.getDate() - today.getDay() - 7); + const lastWeekEnd = new Date(lastWeekStart); + lastWeekEnd.setDate(lastWeekStart.getDate() + 7); lastWeekEnd.setMilliseconds(lastWeekEnd.getMilliseconds() - 1); this._ranges = { diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts index 87e1b1f519..f9054ff86e 100644 --- a/src/panels/logbook/ha-panel-logbook.ts +++ b/src/panels/logbook/ha-panel-logbook.ts @@ -147,27 +147,21 @@ export class HaPanelLogbook extends LitElement { todayEnd.setDate(todayEnd.getDate() + 1); todayEnd.setMilliseconds(todayEnd.getMilliseconds() - 1); - const todayCopy = new Date(today); - - const yesterday = new Date(todayCopy.setDate(today.getDate() - 1)); - const yesterdayEnd = new Date(yesterday); - yesterdayEnd.setDate(yesterdayEnd.getDate() + 1); + const yesterday = new Date(today); + yesterday.setDate(today.getDate() - 1); + const yesterdayEnd = new Date(today); yesterdayEnd.setMilliseconds(yesterdayEnd.getMilliseconds() - 1); - const thisWeekStart = new Date( - todayCopy.setDate(today.getDate() - today.getDay()) - ); - const thisWeekEnd = new Date( - todayCopy.setDate(thisWeekStart.getDate() + 7) - ); + const thisWeekStart = new Date(today); + thisWeekStart.setDate(today.getDate() - today.getDay()); + const thisWeekEnd = new Date(thisWeekStart); + thisWeekEnd.setDate(thisWeekStart.getDate() + 7); thisWeekEnd.setMilliseconds(thisWeekEnd.getMilliseconds() - 1); - const lastWeekStart = new Date( - todayCopy.setDate(today.getDate() - today.getDay() - 7) - ); - const lastWeekEnd = new Date( - todayCopy.setDate(lastWeekStart.getDate() + 7) - ); + const lastWeekStart = new Date(today); + lastWeekStart.setDate(today.getDate() - today.getDay() - 7); + const lastWeekEnd = new Date(lastWeekStart); + lastWeekEnd.setDate(lastWeekStart.getDate() + 7); lastWeekEnd.setMilliseconds(lastWeekEnd.getMilliseconds() - 1); this._ranges = {