From 340fc351a5ea7bf80729411f24a3a6c66aac74e5 Mon Sep 17 00:00:00 2001 From: illuzn <57167030+illuzn@users.noreply.github.com> Date: Mon, 23 May 2022 13:34:01 +0930 Subject: [PATCH 1/3] Disable controls on gridEntities Other cover types now also have the ability to disable unused buttons in gridEntities. Code is copied from generate_shutter_detail_page() --- apps/nspanel-lovelace-ui/luibackend/pages.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 5ffb7b96..711720f1 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -156,11 +156,17 @@ class LuiPagesGen(object): icon_stop = get_action_id_ha(ha_type="cover", action="stop", device_class=device_class) icon_down = get_action_id_ha(ha_type="cover", action="close", device_class=device_class) - pos = int(entity.attributes.get("current_position", 50)) + pos = entity.attributes.get("current_position") if pos == 100: status = f"disable|enable|enable" elif pos == 0: status = f"enable|enable|disable" + elif pos == None: + pos_status = entity.state + if pos_status == "open": + status = f"disable|enable|enable" + elif pos_status == "closed": + status = f"enable|enable|disable" else: status = f"enable|enable|enable" return f"~shutter~{entityId}~{icon_id}~17299~{name}~{icon_up}|{icon_stop}|{icon_down}|{status}" From e627132f6542e3807a0aaec132b5f6c5c4ccf1bb Mon Sep 17 00:00:00 2001 From: illuzn <57167030+illuzn@users.noreply.github.com> Date: Mon, 23 May 2022 13:57:51 +0930 Subject: [PATCH 2/3] Now handles opening/ closing --- apps/nspanel-lovelace-ui/luibackend/pages.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 711720f1..7b9a1697 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -167,6 +167,8 @@ class LuiPagesGen(object): status = f"disable|enable|enable" elif pos_status == "closed": status = f"enable|enable|disable" + else: + status = f"enable|enable|enable" else: status = f"enable|enable|enable" return f"~shutter~{entityId}~{icon_id}~17299~{name}~{icon_up}|{icon_stop}|{icon_down}|{status}" From ce1f16ac18265d72b79e0479e8d11c57dbc30d67 Mon Sep 17 00:00:00 2001 From: illuzn <57167030+illuzn@users.noreply.github.com> Date: Mon, 23 May 2022 15:39:37 +0930 Subject: [PATCH 3/3] fixed unsafe code --- apps/nspanel-lovelace-ui/luibackend/pages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 7b9a1697..662eefa4 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -161,7 +161,7 @@ class LuiPagesGen(object): status = f"disable|enable|enable" elif pos == 0: status = f"enable|enable|disable" - elif pos == None: + elif pos is None: pos_status = entity.state if pos_status == "open": status = f"disable|enable|enable"