Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include last 30 min and 2 hours into history page #23848

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
+40 −0
Open

Include last 30 min and 2 hours into history page #23848

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
520e555
Include last 30 min and 2 hours
tasomaniac Jan 22, 2025
e992e24
remove unused import
tasomaniac Jan 22, 2025
a31a73f
Merge branch 'dev' into patch-1
tasomaniac Jan 22, 2025
b8fbc41
Add translation keys
tasomaniac Jan 22, 2025
a3c4482
Wording: Use minutes instead of mins
tasomaniac Jan 22, 2025
de08daf
formatting
tasomaniac Jan 23, 2025
979ad77
formatting
tasomaniac Jan 23, 2025
0d07485
Merge branch 'dev' into patch-1
tasomaniac Jan 23, 2025
75acc4d
Update ha-date-range-picker.ts
tasomaniac Jan 23, 2025
2d755ef
seems like I really struggle with formatting. Need to install ide sup…
tasomaniac Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/components/ha-date-range-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@
import "@material/mwc-list/mwc-list-item";
import { mdiCalendar } from "@mdi/js";
import {
addHours,

Check failure on line 7 in src/components/ha-date-range-picker.ts

View workflow job for this annotation

GitHub Actions / Lint and check format 

'addHours' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 7 in src/components/ha-date-range-picker.ts

View workflow job for this annotation

GitHub Actions / Lint and check format 

'addHours' is defined but never used
addDays,
subMinutes,
subHours,
endOfMinute,
endOfHour,
endOfDay,
endOfMonth,
endOfWeek,
endOfYear,
startOfMinute,
startOfHour,
startOfDay,
startOfMonth,
startOfWeek,
Expand Down Expand Up @@ -102,6 +109,46 @@
);

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,
Expand Down
Loading