Setup

Author: timmo001

src/common/datetime/check_time.ts

@@ -2,17 +2,7 @@ import { TZDate } from "@date-fns/tz";
 import { isBefore, isAfter, isWithinInterval } from "date-fns";
 import type { HomeAssistant } from "../../types";
 import { TimeZone } from "../../data/translation";
-import type { WeekdayShort } from "./weekday";
-
-const WEEKDAY_MAP: Record<number, WeekdayShort> = {
-  0: "sun",
-  1: "mon",
-  2: "tue",
-  3: "wed",
-  4: "thu",
-  5: "fri",
-  6: "sat",
-};
+import { WEEKDAY_MAP, type WeekdayShort } from "./weekday";
 
 /**
  * Parse a time string (HH:MM or HH:MM:SS) and set it on today's date in the given timezone

src/common/datetime/first_weekday.ts

@@ -1,19 +1,7 @@
 import { getWeekStartByLocale } from "weekstart";
 import type { FrontendLocaleData } from "../../data/translation";
 import { FirstWeekday } from "../../data/translation";
-import type { WeekdayLong } from "./weekday";
-
-export const weekdays: WeekdayLong[] = [
-  "sunday",
-  "monday",
-  "tuesday",
-  "wednesday",
-  "thursday",
-  "friday",
-  "saturday",
-] as const;
-
-type WeekdayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+import { WEEKDAYS_LONG, type WeekdayIndex } from "./weekday";
 
 export const firstWeekdayIndex = (locale: FrontendLocaleData): WeekdayIndex => {
   if (locale.first_weekday === FirstWeekday.language) {
@@ -24,12 +12,12 @@ export const firstWeekdayIndex = (locale: FrontendLocaleData): WeekdayIndex => {
     }
     return (getWeekStartByLocale(locale.language) % 7) as WeekdayIndex;
   }
-  return weekdays.includes(locale.first_weekday)
-    ? (weekdays.indexOf(locale.first_weekday) as WeekdayIndex)
+  return WEEKDAYS_LONG.includes(locale.first_weekday)
+    ? (WEEKDAYS_LONG.indexOf(locale.first_weekday) as WeekdayIndex)
     : 1;
 };
 
 export const firstWeekday = (locale: FrontendLocaleData) => {
   const index = firstWeekdayIndex(locale);
-  return weekdays[index];
+  return WEEKDAYS_LONG[index];
 };

src/common/datetime/weekday.ts

@@ -1,3 +1,5 @@
+export type WeekdayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+
 export type WeekdayShort =
   | "sun"
   | "mon"
@@ -15,3 +17,33 @@ export type WeekdayLong =
   | "thursday"
   | "friday"
   | "saturday";
+
+export const WEEKDAYS_SHORT: WeekdayShort[] = [
+  "sun",
+  "mon",
+  "tue",
+  "wed",
+  "thu",
+  "fri",
+  "sat",
+] as const;
+
+export const WEEKDAYS_LONG: WeekdayLong[] = [
+  "sunday",
+  "monday",
+  "tuesday",
+  "wednesday",
+  "thursday",
+  "friday",
+  "saturday",
+] as const;
+
+export const WEEKDAY_MAP: Record<WeekdayIndex, WeekdayShort> = {
+  0: "sun",
+  1: "mon",
+  2: "tue",
+  3: "wed",
+  4: "thu",
+  5: "fri",
+  6: "sat",
+};

src/panels/lovelace/common/validate-condition.ts

@@ -57,7 +57,7 @@ export interface TimeCondition extends BaseCondition {
   condition: "time";
   after?: string;
   before?: string;
-  weekday?: WeekdayShort[];
+  weekdays?: WeekdayShort[];
 }
 
 export interface UserCondition extends BaseCondition {
@@ -165,7 +165,7 @@ function checkTimeCondition(condition: TimeCondition, hass: HomeAssistant) {
     hass,
     condition.after,
     condition.before,
-    condition.weekday
+    condition.weekdays
   );
 }
 
@@ -292,8 +292,11 @@ function validateScreenCondition(condition: ScreenCondition) {
   return condition.media_query != null;
 }
 
-function validateTimeCondition(_condition: TimeCondition) {
-  return true;
+function validateTimeCondition(condition: TimeCondition) {
+  return (
+    (condition.after != null || condition.before != null) &&
+    condition.weekdays?.every((w: WeekdayShort) => WEEKDAYS_SHORT.includes(w))
+  );
 }
 
 function validateUserCondition(condition: UserCondition) {

src/panels/lovelace/editor/conditions/types/ha-card-condition-time.ts

@@ -1,7 +1,41 @@
-import { LitElement, nothing } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
+import {
+  literal,
+  array,
+  object,
+  optional,
+  string,
+  assert,
+  enums,
+} from "superstruct";
 import type { HomeAssistant } from "../../../../../types";
 import type { TimeCondition } from "../../../common/validate-condition";
+import { WEEKDAYS_SHORT } from "../../../../../common/datetime/weekday";
+import type { HaFormSchema } from "../../../../../components/ha-form/types";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+
+const timeConditionStruct = object({
+  condition: literal("time"),
+  after: optional(string()),
+  before: optional(string()),
+  weekdays: optional(array(enums(WEEKDAYS_SHORT))),
+});
+
+const SCHEMA = [
+  { name: "after", selector: { time: {} } },
+  { name: "before", selector: { time: {} } },
+  {
+    name: "weekdays",
+    selector: {
+      select: {
+        mode: "list",
+        multiple: true,
+        options: WEEKDAYS_SHORT,
+      },
+    },
+  },
+] as const satisfies HaFormSchema[];
 
 @customElement("ha-card-condition-time")
 export class HaCardConditionTime extends LitElement {
@@ -15,8 +49,26 @@ export class HaCardConditionTime extends LitElement {
     return { condition: "time" };
   }
 
+  protected static validateUIConfig(condition: TimeCondition) {
+    return assert(condition, timeConditionStruct);
+  }
+
   protected render() {
-    return nothing;
+    return html`
+      <ha-form
+        .hass=${this.hass}
+        .data=${this.condition}
+        .schema=${SCHEMA}
+        .disabled=${this.disabled}
+        @value-changed=${this._valueChanged}
+      ></ha-form>
+    `;
+  }
+
+  private _valueChanged(ev: CustomEvent) {
+    ev.stopPropagation();
+    const data = ev.detail.value as TimeCondition;
+    fireEvent(this, "value-changed", { value: data });
   }
 }
 

src/translations/en.json

@@ -7565,7 +7565,10 @@
                 "state_not_equal": "State is not equal to"
               },
               "time": {
-                "label": "Time"
+                "label": "Time",
+                "after": "After",
+                "before": "Before",
+                "weekdays": "Weekdays"
               },
               "location": {
                 "label": "Location",