From 520e555386fa86e7605d9e93e32bebcc4d1ecd24 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Wed, 22 Jan 2025 16:21:53 +0100 Subject: [PATCH 1/8] Include last 30 min and 2 hours --- src/components/ha-date-range-picker.ts | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index f207defb632b..45a86d15dc5b 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -4,11 +4,18 @@ import type { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; import "@material/mwc-list/mwc-list-item"; import { mdiCalendar } from "@mdi/js"; import { + addHours, addDays, + subMinutes, + subHours, + endOfMinute, + endOfHour, endOfDay, endOfMonth, endOfWeek, endOfYear, + startOfMinute, + startOfHour, startOfDay, startOfMonth, startOfWeek, @@ -102,6 +109,46 @@ export class HaDateRangePicker extends LitElement { ); this._ranges = { + [this.hass.localize("ui.components.date-range-picker.ranges.last_30_min")]: [ + calcDate( + subMinutes(today, 30), + startOfMinute, + this.hass.locale, + this.hass.config, + { + weekStartsOn, + } + ), + calcDate( + today, + endOfMinute, + this.hass.locale, + this.hass.config, + { + weekStartsOn, + } + ) + ], + [this.hass.localize("ui.components.date-range-picker.ranges.last_2_hours")]: [ + calcDate( + subHours(today, 2), + startOfHour, + this.hass.locale, + this.hass.config, + { + weekStartsOn, + } + ), + calcDate( + today, + endOfHour, + this.hass.locale, + this.hass.config, + { + weekStartsOn, + } + ) + ], [this.hass.localize("ui.components.date-range-picker.ranges.today")]: [ calcDate(today, startOfDay, this.hass.locale, this.hass.config, { weekStartsOn, From e992e24d5135ea968218514f672b33c0b0dd2881 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Wed, 22 Jan 2025 20:18:27 +0100 Subject: [PATCH 2/8] remove unused import --- src/components/ha-date-range-picker.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 45a86d15dc5b..42f7d41115d0 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -4,7 +4,6 @@ import type { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; import "@material/mwc-list/mwc-list-item"; import { mdiCalendar } from "@mdi/js"; import { - addHours, addDays, subMinutes, subHours, From b8fbc41ceb8392c477e61ced2f426659ac575c6b Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Wed, 22 Jan 2025 21:10:56 +0100 Subject: [PATCH 3/8] Add translation keys --- src/translations/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/translations/en.json b/src/translations/en.json index 47965f9abbec..a9f204c8e75f 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -806,6 +806,8 @@ "select": "Select", "select_date_range": "Select time period", "ranges": { + "last_30_minutes": "Last 30 minutes", + "last_2_hours": "Last 2 hours", "today": "Today", "yesterday": "Yesterday", "this_week": "This week", From a3c44824e2f50809ddcbdfa42ae5378d24d55db1 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Wed, 22 Jan 2025 21:11:26 +0100 Subject: [PATCH 4/8] Wording: Use minutes instead of mins --- src/components/ha-date-range-picker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 42f7d41115d0..cdd01348dba0 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -108,7 +108,7 @@ export class HaDateRangePicker extends LitElement { ); this._ranges = { - [this.hass.localize("ui.components.date-range-picker.ranges.last_30_min")]: [ + [this.hass.localize("ui.components.date-range-picker.ranges.last_30_minutes")]: [ calcDate( subMinutes(today, 30), startOfMinute, From de08dafe2c5aa9d8c1ec767bd0d62a4a64be88a1 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Thu, 23 Jan 2025 13:17:29 +0100 Subject: [PATCH 5/8] formatting --- src/components/ha-date-range-picker.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index cdd01348dba0..519b461ee645 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -108,11 +108,13 @@ export class HaDateRangePicker extends LitElement { ); this._ranges = { - [this.hass.localize("ui.components.date-range-picker.ranges.last_30_minutes")]: [ + [this.hass.localize( + "ui.components.date-range-picker.ranges.last_30_minutes" + )]: [ calcDate( subMinutes(today, 30), - startOfMinute, - this.hass.locale, + startOfMinute, + this.hass.locale, this.hass.config, { weekStartsOn, @@ -128,7 +130,9 @@ export class HaDateRangePicker extends LitElement { } ) ], - [this.hass.localize("ui.components.date-range-picker.ranges.last_2_hours")]: [ + [this.hass.localize( + "ui.components.date-range-picker.ranges.last_2_hours" + )]: [ calcDate( subHours(today, 2), startOfHour, From 979ad77ab31ad1fd4903131bbad12a417e5ed34d Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Thu, 23 Jan 2025 13:18:18 +0100 Subject: [PATCH 6/8] formatting --- src/components/ha-date-range-picker.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 519b461ee645..30d71ab7dcf2 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -135,8 +135,8 @@ export class HaDateRangePicker extends LitElement { )]: [ calcDate( subHours(today, 2), - startOfHour, - this.hass.locale, + startOfHour, + this.hass.locale, this.hass.config, { weekStartsOn, @@ -144,8 +144,8 @@ export class HaDateRangePicker extends LitElement { ), calcDate( today, - endOfHour, - this.hass.locale, + endOfHour, + this.hass.locale, this.hass.config, { weekStartsOn, From 75acc4d39ae057b41c9fa81d60fdda63a5733d60 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Thu, 23 Jan 2025 13:22:45 +0100 Subject: [PATCH 7/8] Update ha-date-range-picker.ts --- src/components/ha-date-range-picker.ts | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 30d71ab7dcf2..15564c04b0d2 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -120,15 +120,9 @@ export class HaDateRangePicker extends LitElement { weekStartsOn, } ), - calcDate( - today, - endOfMinute, - this.hass.locale, - this.hass.config, - { - weekStartsOn, - } - ) + calcDate(today, endOfMinute, this.hass.locale, this.hass.config, { + weekStartsOn, + }), ], [this.hass.localize( "ui.components.date-range-picker.ranges.last_2_hours" @@ -142,15 +136,9 @@ export class HaDateRangePicker extends LitElement { weekStartsOn, } ), - calcDate( - today, - endOfHour, - this.hass.locale, - this.hass.config, - { - weekStartsOn, - } - ) + calcDate(today, endOfHour, this.hass.locale, this.hass.config, { + weekStartsOn, + }), ], [this.hass.localize("ui.components.date-range-picker.ranges.today")]: [ calcDate(today, startOfDay, this.hass.locale, this.hass.config, { From 2d755efe0fc818d48189f1c59d9a66395575361d Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Thu, 23 Jan 2025 13:23:54 +0100 Subject: [PATCH 8/8] seems like I really struggle with formatting. Need to install ide support --- src/components/ha-date-range-picker.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ha-date-range-picker.ts b/src/components/ha-date-range-picker.ts index 15564c04b0d2..f4d65a375006 100644 --- a/src/components/ha-date-range-picker.ts +++ b/src/components/ha-date-range-picker.ts @@ -120,7 +120,7 @@ export class HaDateRangePicker extends LitElement { weekStartsOn, } ), - calcDate(today, endOfMinute, this.hass.locale, this.hass.config, { + calcDate(today, endOfMinute, this.hass.locale, this.hass.config, { weekStartsOn, }), ], @@ -136,7 +136,7 @@ export class HaDateRangePicker extends LitElement { weekStartsOn, } ), - calcDate(today, endOfHour, this.hass.locale, this.hass.config, { + calcDate(today, endOfHour, this.hass.locale, this.hass.config, { weekStartsOn, }), ],