h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-14 00:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix template None template call

Browse Source
This commit is contained in:
joBr99
2023-01-04 20:51:13 +01:00
parent 62c429d51e
commit c692c7fb56
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,6 @@ class LuiBackendConfig(object):
# parse cards # parse cards
for card in self.get("cards"): for card in self.get("cards"):
self._config_cards.append(Card(card)) self._config_cards.append(Card(card))
# setup prev and next uuids # setup prev and next uuids
top_level_cards = filter(lambda card: not card.hidden, self._config_cards) top_level_cards = filter(lambda card: not card.hidden, self._config_cards)
first_card = None first_card = None
@@ -178,14 +177,12 @@ class LuiBackendConfig(object):
if first_card and last_card: if first_card and last_card:
first_card.uuid_prev = last_card.uuid first_card.uuid_prev = last_card.uuid
last_card.uuid_next = first_card.uuid last_card.uuid_next = first_card.uuid
# parse screensaver # parse screensaver
self._config_screensaver = Card(self.get("screensaver")) self._config_screensaver = Card(self.get("screensaver"))
# parse hidden cards # parse hidden cards
for card in self.get("hiddenCards"): for card in self.get("hiddenCards"):
self._config_cards.append(Card(card, hidden=True)) self._config_cards.append(Card(card, hidden=True))
# all entites sorted by generated key, to be able to use short identifiers # all entites sorted by generated key, to be able to use short identifiers
self._config_entites_table = {x.uuid: x for x in self.get_all_entitys()} self._config_entites_table = {x.uuid: x for x in self.get_all_entitys()}
self._config_card_table = {x.uuid: x for x in self._config_cards} self._config_card_table = {x.uuid: x for x in self._config_cards}
@@ -218,7 +215,7 @@ class LuiBackendConfig(object):
entities.extend(card.get_entity_list()) entities.extend(card.get_entity_list())
return entities return entities
def searchCard(self, id): def search_card(self, id):
id = id.replace("navigate.", "") id = id.replace("navigate.", "")
if id.startswith("uuid"): if id.startswith("uuid"):
return self.get_card_by_uuid(id) return self.get_card_by_uuid(id)
@@ -238,11 +235,11 @@ class LuiBackendConfig(object):
def get_default_card(self): def get_default_card(self):
defaultCard = self._config.get("screensaver.defaultCard") defaultCard = self._config.get("screensaver.defaultCard")
defaultCard = apis.ha_api.render_template(defaultCard)
if defaultCard is not None: if defaultCard is not None:
defaultCard = apis.ha_api.render_template(defaultCard)
defaultCard = self.search_card(defaultCard) defaultCard = self.search_card(defaultCard)
if defaultCard is not None: if defaultCard is not None:
return defaultCard return defaultCard
else: else:
return self._config_cards[0] return self._config_cards[0]

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

@@ -11,10 +11,10 @@ class LuiController(object):
self._send_mqtt_msg = send_mqtt_msg self._send_mqtt_msg = send_mqtt_msg
self._current_card = self._config._config_screensaver self._current_card = self._config._config_screensaver
self._previous_cards = [] self._previous_cards = []
# first card (default, after startup) # first card (default, after startup)
self._previous_cards.append(self._config.get_default_card()) self._previous_cards.append(self._config.get_default_card())
self._pages_gen = LuiPagesGen(config, send_mqtt_msg) self._pages_gen = LuiPagesGen(config, send_mqtt_msg)
# send panel back to startup page on restart of this script # send panel back to startup page on restart of this script
@@ -23,10 +23,10 @@ class LuiController(object):
# calculate current brightness # calculate current brightness
self.current_screensaver_brightness = self.calc_current_brightness(self._config.get("sleepBrightness")) self.current_screensaver_brightness = self.calc_current_brightness(self._config.get("sleepBrightness"))
self.current_screen_brightness = self.calc_current_brightness(self._config.get("screenBrightness")) self.current_screen_brightness = self.calc_current_brightness(self._config.get("screenBrightness"))
# register callbacks # register callbacks
self.register_callbacks() self.register_callbacks()
def startup(self): def startup(self):
apis.ha_api.log(f"Startup Event") apis.ha_api.log(f"Startup Event")
# send time and date on startup # send time and date on startup
@@ -201,7 +201,7 @@ class LuiController(object):
if defaultCard is not None: if defaultCard is not None:
defaultCard = apis.ha_api.render_template(defaultCard) defaultCard = apis.ha_api.render_template(defaultCard)
apis.ha_api.log(f"Searching for the following page as defaultPage: {defaultCard}") apis.ha_api.log(f"Searching for the following page as defaultPage: {defaultCard}")
dstCard = self._config.searchCard(defaultCard) dstCard = self._config.search_card(defaultCard)
apis.ha_api.log(f"Result for the following page as defaultPage: {dstCard}") apis.ha_api.log(f"Result for the following page as defaultPage: {dstCard}")
if dstCard is not None: if dstCard is not None:
self._previous_cards = [] self._previous_cards = []
@@ -285,7 +285,7 @@ class LuiController(object):
dstCard = self._config.get_card_by_uuid(entity_id.replace('navigate.','')) dstCard = self._config.get_card_by_uuid(entity_id.replace('navigate.',''))
# internal for navigation to nested pages # internal for navigation to nested pages
else: else:
dstCard = self._config.searchCard(entity_id) dstCard = self._config.search_card(entity_id)
if dstCard is not None: if dstCard is not None:
if dstCard.hidden: if dstCard.hidden:
self._previous_cards.append(self._current_card) self._previous_cards.append(self._current_card)

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

@@ -236,7 +236,7 @@ class LuiPagesGen(object):
if entityType == "delete": if entityType == "delete":
return f"~{entityType}~~~~~" return f"~{entityType}~~~~~"
if entityType == "navigate": if entityType == "navigate":
page_search_res = self._config.searchCard(entityId) page_search_res = self._config.search_card(entityId)
if page_search_res is not None: if page_search_res is not None:
name = name if name is not None else page_search_res.title name = name if name is not None else page_search_res.title
text = get_translation(self._locale, "frontend.ui.card.button.press") text = get_translation(self._locale, "frontend.ui.card.button.press")