h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-30 03:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

implemented #228

Browse Source
This commit is contained in:
Johannes
2022-06-05 23:10:18 +02:00
parent 4ed2c9ebd7
commit b035cae539
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/nspanel-lovelace-ui/luibackend/config.py
View File

@@ -8,6 +8,7 @@ class Entity(object):
self.nameOverride = entity_input_config.get("name")
self.iconOverride = entity_input_config.get("icon")
self.colorOverride = entity_input_config.get("color")
self.status = entity_input_config.get("status")
self.condState = entity_input_config.get("state")
self.condStateNot = entity_input_config.get("state_not")
@@ -33,11 +34,16 @@ class Card(object):
entityIds = []
if self.entity is not None:
entityIds.append(self.entity.entityId)
if self.entity.status is not None:
entityIds.append(self.entity.status)
else:
for e in self.entities:
entityIds.append(e.entityId)
if e.status is not None:
entityIds.append(e.status)
# additional keys to check
add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4', 'statusIcon1', 'statusIcon2']
add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4', 'statusIcon1', 'statusIcon2', 'alarmControl']
for ent_key in add_ent_keys:
val = self.raw_config.get(ent_key)
if val is not None:

2
apps/nspanel-lovelace-ui/luibackend/icons.py
View File

@@ -109,6 +109,8 @@ def map_to_mdi_name(ha_type, state=None, device_class=None, cardType=None):
return sensor_mapping_off[device_class] if device_class in sensor_mapping_off else "alert-circle-outline"
else:
return sensor_mapping[device_class] if device_class in sensor_mapping else "alert-circle-outline"
elif ha_type == "alarm-arm-fail":
return "progress-alert"
else:
return "alert-circle-outline"

17
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -163,7 +163,11 @@ class LuiPagesGen(object):
name = name if name is not None else page_search_res.title
text = get_translation(self._locale, "frontend.ui.card.button.press")
icon_id = get_icon_id(icon) if icon is not None else get_icon_id("gesture-tap-button")
return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"
if item.status is not None and self._ha_api.entity_exists(item.status):
icon_color = self.get_entity_color(self._ha_api.get_entity(item.status))
else:
icon_color = 17299
return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}"
else:
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~page not found~"
if entityType == "iText":
@@ -427,9 +431,14 @@ class LuiPagesGen(object):
if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
add_btn=f"{get_icon_id('progress-alert')}~{rgb_dec565([243,179,0])}~opnSensorNotify"
if alarmBtn is not None and type(alarmBtn) is dict:
entity = alarmBtn.get("entity")
iconnav = alarmBtn.get("icon", "progress-alert")
add_btn=f"{get_icon_id(iconnav)}~{rgb_dec565([243,179,0])}~{entity}"
entity = alarmBtn.get("entity")
iconnav = get_icon_id_ha("alarm-arm-fail", overwrite=alarmBtn.get("icon"))
status = alarmBtn.get("status")
if status is not None and self._ha_api.entity_exists(status):
icon_color = self.get_entity_color(self._ha_api.get_entity(status))
else:
icon_color = rgb_dec565([243,179,0])
add_btn=f"{iconnav}~{icon_color}~{entity}"
# add padding to arm buttons
arm_buttons = ""