From 65c4d024524f5a06d08987e8fcc5b1a331802e4b Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 4 Apr 2022 21:54:35 -0700 Subject: [PATCH] Fix Safari dates (#12222) --- .../statistics/dialog-statistics-adjust-sum.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts index bae0576f9e..70df1e54ec 100644 --- a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts +++ b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts @@ -1,6 +1,7 @@ import "@material/mwc-button/mwc-button"; import "@material/mwc-list/mwc-list-item"; import { mdiChevronRight } from "@mdi/js"; +import formatISO9075 from "date-fns/formatISO9075"; import { css, CSSResultGroup, @@ -69,12 +70,11 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement { public showDialog(params: DialogStatisticsAdjustSumParams): void { this._params = params; + // moment is in format YYYY-MM-DD HH:mm:ss because of selector + // Here we create a date with minutes set to %5 const now = new Date(); - this._moment = `${now.getFullYear()}-${ - now.getMonth() + 1 - }-${now.getDate()} ${now.getHours()}:${ - now.getMinutes() - (now.getMinutes() % 5) - }:00`; + now.setMinutes(now.getMinutes() - (now.getMinutes() % 5), 0); + this._moment = formatISO9075(now); this._fetchStats(); } @@ -250,7 +250,10 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement { this._stats5min = undefined; this._statsHour = undefined; const statId = this._params!.statistic.statistic_id; - const moment = new Date(this._moment!); + + // moment is in format YYYY-MM-DD HH:mm:ss because of selector + // Here we convert it to an ISO string. + const moment = new Date(this._moment!.replace(" ", "T")); // Search 3 hours before and 3 hours after chosen time const hourStatStart = new Date(moment.getTime());