From 7a35f46370073321d9b1e745ac8e97963ac391a0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 16 Aug 2021 05:44:42 +0200 Subject: [PATCH] Set suggested min max to min and max (#9805) --- .../cards/energy/hui-energy-gas-graph-card.ts | 18 +++--------------- .../energy/hui-energy-solar-graph-card.ts | 18 +++--------------- .../energy/hui-energy-usage-graph-card.ts | 18 +++--------------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts index 89ed6d3a9e..94fd3e84c5 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts @@ -10,13 +10,7 @@ import { ChartOptions, ScatterDataPoint, } from "chart.js"; -import { - addHours, - differenceInDays, - endOfToday, - isToday, - startOfToday, -} from "date-fns"; +import { differenceInDays, endOfToday, isToday, startOfToday } from "date-fns"; import { HomeAssistant } from "../../../../types"; import { LovelaceCard } from "../../types"; import { EnergyGasGraphCardConfig } from "../types"; @@ -123,14 +117,8 @@ export class HuiEnergyGasGraphCard scales: { x: { type: "time", - suggestedMin: (dayDifference > 2 - ? addHours(start, -11) - : start - ).getTime(), - suggestedMax: (dayDifference > 2 - ? addHours(end, -11) - : end - ).getTime(), + suggestedMin: start.getTime(), + suggestedMax: end.getTime(), adapters: { date: { locale: locale, diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts index 8b0c3be7c0..4c818fdb69 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts @@ -10,13 +10,7 @@ import { ChartOptions, ScatterDataPoint, } from "chart.js"; -import { - addHours, - differenceInDays, - endOfToday, - isToday, - startOfToday, -} from "date-fns"; +import { differenceInDays, endOfToday, isToday, startOfToday } from "date-fns"; import { HomeAssistant } from "../../../../types"; import { LovelaceCard } from "../../types"; import { EnergySolarGraphCardConfig } from "../types"; @@ -128,14 +122,8 @@ export class HuiEnergySolarGraphCard scales: { x: { type: "time", - suggestedMin: (dayDifference > 2 - ? addHours(start, -11) - : start - ).getTime(), - suggestedMax: (dayDifference > 2 - ? addHours(end, -11) - : end - ).getTime(), + suggestedMin: start.getTime(), + suggestedMax: end.getTime(), adapters: { date: { locale: locale, diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts index a8fc4dc913..fc00fb7460 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts @@ -1,11 +1,5 @@ import { ChartData, ChartDataset, ChartOptions } from "chart.js"; -import { - startOfToday, - endOfToday, - isToday, - differenceInDays, - addHours, -} from "date-fns"; +import { startOfToday, endOfToday, isToday, differenceInDays } from "date-fns"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; @@ -115,14 +109,8 @@ export class HuiEnergyUsageGraphCard scales: { x: { type: "time", - suggestedMin: (dayDifference > 2 - ? addHours(start, -11) - : start - ).getTime(), - suggestedMax: (dayDifference > 2 - ? addHours(end, -11) - : end - ).getTime(), + suggestedMin: start.getTime(), + suggestedMax: end.getTime(), adapters: { date: { locale: locale,