From f8b148ad76ee5a1f8c441077f61ca6535c3c089e Mon Sep 17 00:00:00 2001 From: cdce8p <30130371+cdce8p@users.noreply.github.com> Date: Thu, 16 Apr 2020 16:25:50 +0200 Subject: [PATCH 1/3] Add secondary option for cover entities --- src/panels/lovelace/cards/types.ts | 7 ++++++- .../lovelace/components/hui-generic-entity-row.ts | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts index 8fb6bfeb7e0a..233cc65e3aa5 100644 --- a/src/panels/lovelace/cards/types.ts +++ b/src/panels/lovelace/cards/types.ts @@ -29,7 +29,12 @@ export interface EntityCardConfig extends LovelaceCardConfig { export interface EntitiesCardEntityConfig extends EntityConfig { type?: string; - secondary_info?: "entity-id" | "last-changed"; + secondary_info?: + | "entity-id" + | "last-changed" + | "last-triggered" + | "position" + | "tilt-position"; action_name?: string; service?: string; service_data?: object; diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index abc946bbce3c..e09ed7b87d5d 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -112,6 +112,16 @@ class HuiGenericEntityRow extends LitElement { : this.hass.localize( "ui.panel.lovelace.cards.entities.never_triggered" ) + : this.config.secondary_info === "position" && + stateObj.attributes.current_position + ? this.hass.localize("ui.card.cover.position") + + ": " + + stateObj.attributes.current_position + : this.config.secondary_info === "tilt-position" && + stateObj.attributes.current_tilt_position + ? this.hass.localize("ui.card.cover.tilt_position") + + ": " + + stateObj.attributes.current_tilt_position : "")} ` From a23370a23a5e34c433d4a0d404f4fed69ff0ebf9 Mon Sep 17 00:00:00 2001 From: cdce8p <30130371+cdce8p@users.noreply.github.com> Date: Mon, 20 Apr 2020 13:01:20 +0200 Subject: [PATCH 2/3] Replace string concatenation --- .../lovelace/components/hui-generic-entity-row.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index e09ed7b87d5d..5b5a81e7cf47 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -114,14 +114,14 @@ class HuiGenericEntityRow extends LitElement { ) : this.config.secondary_info === "position" && stateObj.attributes.current_position - ? this.hass.localize("ui.card.cover.position") + - ": " + - stateObj.attributes.current_position + ? `${this.hass.localize("ui.card.cover.position")}: ${ + stateObj.attributes.current_position + }` : this.config.secondary_info === "tilt-position" && stateObj.attributes.current_tilt_position - ? this.hass.localize("ui.card.cover.tilt_position") + - ": " + - stateObj.attributes.current_tilt_position + ? `${this.hass.localize("ui.card.cover.tilt_position")}: ${ + stateObj.attributes.current_tilt_position + }` : "")} ` From 40b7dead32ec15fd9bd6e8a7f715a01b218fa334 Mon Sep 17 00:00:00 2001 From: cdce8p <30130371+cdce8p@users.noreply.github.com> Date: Tue, 21 Apr 2020 22:05:14 +0200 Subject: [PATCH 3/3] Check for undefined --- src/panels/lovelace/components/hui-generic-entity-row.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index 5b5a81e7cf47..fe154e0775d6 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -113,12 +113,12 @@ class HuiGenericEntityRow extends LitElement { "ui.panel.lovelace.cards.entities.never_triggered" ) : this.config.secondary_info === "position" && - stateObj.attributes.current_position + stateObj.attributes.current_position !== undefined ? `${this.hass.localize("ui.card.cover.position")}: ${ stateObj.attributes.current_position }` : this.config.secondary_info === "tilt-position" && - stateObj.attributes.current_tilt_position + stateObj.attributes.current_tilt_position !== undefined ? `${this.hass.localize("ui.card.cover.tilt_position")}: ${ stateObj.attributes.current_tilt_position }`