From 2ff0cb58bc0ecc02f26b218beb7950ce097e6981 Mon Sep 17 00:00:00 2001 From: "libe.net" <36338790+boern99@users.noreply.github.com> Date: Fri, 27 Dec 2024 10:35:00 +0100 Subject: [PATCH] Fix Energy-Dashboard unexpected Period Calculation (#23458) * if not whole month, better use days for the period * fix Type undefined error * Update src/data/energy.ts Co-authored-by: Petar Petrov --------- Co-authored-by: Petar Petrov --- src/data/energy.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/data/energy.ts b/src/data/energy.ts index 5e082ac675..8cee433211 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -401,7 +401,13 @@ const getEnergyData = async ( const dayDifference = differenceInDays(end || new Date(), start); const period = - dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"; + isFirstDayOfMonth(start) && + (!end || isLastDayOfMonth(end)) && + dayDifference > 35 + ? "month" + : dayDifference > 2 + ? "day" + : "hour"; const lengthUnit = hass.config.unit_system.length || ""; const energyUnits: StatisticsUnitConfiguration = {