From 60340123ceade60a8f3589e9d66b51ec353c9eaa Mon Sep 17 00:00:00 2001
From: Johannes <johannes@braun-rheingau.de>
Date: Sat, 28 May 2022 10:23:14 +0200
Subject: [PATCH] disaplay state and hvac action

---
 .../luibackend/localization.py                | 113 ++++++++++++++++++
 apps/nspanel-lovelace-ui/luibackend/pages.py  |   4 +-
 2 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/apps/nspanel-lovelace-ui/luibackend/localization.py b/apps/nspanel-lovelace-ui/luibackend/localization.py
index 2a9399ca..9da19c62 100644
--- a/apps/nspanel-lovelace-ui/luibackend/localization.py
+++ b/apps/nspanel-lovelace-ui/luibackend/localization.py
@@ -2,6 +2,7 @@ translations = {
         'af': {
             'ACTIVATE': "Aktiveer",
             'aux_heat': "Aanvullende hitte",
+            'away_mode': "Wegmodus",
             'cooling': "Koel Af",
             'drying': "Droog Uit",
             'fan': "Waaier",
@@ -23,10 +24,12 @@ translations = {
             'state': "Toestand",
             'currently': "Tans",
             'operation': "Operasie",
+            'fan_mode': "Waaier modus",
         },
         'ar': {
             'ACTIVATE': "تفعيل",
             'aux_heat': "حرارة Aux",
+            'away_mode': "خارج المنزل",
             'cooling': "تبريد",
             'drying': "تجفيف",
             'fan': "مروحة",
@@ -48,10 +51,13 @@ translations = {
             'state': "الحالة",
             'currently': "حاليا",
             'operation': "الوضع",
+            'fan_mode': "وضع المروحة",
+            'heating': "إعادة تكوين الجهاز",
         },
         'bg': {
             'ACTIVATE': "Активирай",
             'aux_heat': "Помощен нагревател",
+            'away_mode': "Режим на отсъствие",
             'cooling': "Охлаждане",
             'drying': "Изсушаване",
             'fan': "Вентилатор",
@@ -74,11 +80,14 @@ translations = {
             'state': "Състояние",
             'currently': "В момента",
             'operation': "Режим",
+            'fan_mode': "Режим на вентилатора",
+            'heating': "Преконфигуриране на устройство",
         },
         'ca': {
             'PRESS': "Prem",
             'ACTIVATE': "Activar",
             'aux_heat': "Calefactor auxiliar",
+            'away_mode': "Mode absent",
             'cooling': "Refredant",
             'drying': "Assecant",
             'fan': "Ventilació",
@@ -101,11 +110,14 @@ translations = {
             'state': "Estat",
             'currently': "Actual",
             'operation': "Funcionament",
+            'fan_mode': "Velocitat ventilador",
+            'heating': "S'està reconfigurant el dispositiu",
         },
         'cs': {
             'PRESS': "Stisknutí",
             'ACTIVATE': "Aktivovat",
             'aux_heat': "Pomocné teplo",
+            'away_mode': "Úsporný režim",
             'cooling': "Chlazení",
             'drying': "Sušení",
             'fan': "Ventilátor",
@@ -128,11 +140,14 @@ translations = {
             'state': "Stav",
             'currently': "Aktuálně",
             'operation': "Provoz",
+            'fan_mode': "Režim ventilátoru",
+            'heating': "Znovunastavení zařízení",
         },
         'da': {
             'PRESS': "Tryk",
             'ACTIVATE': "Aktiver",
             'aux_heat': "Støtte-varme",
+            'away_mode': "Ude af huset-modus",
             'cooling': "Køling",
             'drying': "Tørring",
             'fan': "Blæser",
@@ -155,11 +170,14 @@ translations = {
             'state': "Tilstand",
             'currently': "Aktuelt",
             'operation': "Drifttype",
+            'fan_mode': "Blæsertilstand",
+            'heating': "Omkonfigurering af enhed",
         },
         'de': {
             'PRESS': "Drücken",
             'ACTIVATE': "Aktivieren",
             'aux_heat': "Hilfswärme",
+            'away_mode': "Abwesenheitsmodus",
             'cooling': "Kühlung",
             'drying': "Trocknen",
             'fan': "Ventilator",
@@ -182,11 +200,14 @@ translations = {
             'state': "Zustand",
             'currently': "Aktuell",
             'operation': "Aktion",
+            'fan_mode': "Ventilator-Modus",
+            'heating': "Gerät neu konfigurieren",
         },
         'el': {
             'PRESS': "Πατήστε",
             'ACTIVATE': "Ενεργοποίηση",
             'aux_heat': "Βοηθητική θέρμανση",
+            'away_mode': "Λειτουργία εκτός σπιτιού",
             'cooling': "Ψύξη",
             'drying': "Αφύγρανση",
             'fan': "Ανεμιστήρας",
@@ -209,11 +230,14 @@ translations = {
             'state': "Κατάσταση",
             'currently': "Αυτή τη στιγμή",
             'operation': "Λειτουργία",
+            'fan_mode': "Λειτουργία ανεμιστήρα",
+            'heating': "Επαναδιαμόρφωση της συσκευής",
         },
         'en': {
             'PRESS': "Press",
             'ACTIVATE': "Activate",
             'aux_heat': "Aux heat",
+            'away_mode': "Away mode",
             'cooling': "Cooling",
             'drying': "Drying",
             'fan': "Fan",
@@ -236,11 +260,14 @@ translations = {
             'state': "State",
             'currently': "Currently",
             'operation': "Operation",
+            'fan_mode': "Fan mode",
+            'heating': "Reconfiguring device",
         },
         'es': {
             'PRESS': "Pulsa",
             'ACTIVATE': "Activar",
             'aux_heat': "Calor auxiliar",
+            'away_mode': "Fuera de casa",
             'cooling': "Enfriando",
             'drying': "Secando",
             'fan': "Ventilador",
@@ -263,11 +290,14 @@ translations = {
             'state': "Estado",
             'currently': "Actualmente",
             'operation': "Modo",
+            'fan_mode': "Modo del ventilador",
+            'heating': "Reconfigurando el dispositivo",
         },
         'et': {
             'PRESS': "Vajuta nuppu",
             'ACTIVATE': "Aktiveeri",
             'aux_heat': "Abiküte",
+            'away_mode': "Eemal",
             'cooling': "Jahutamine",
             'drying': "Kuivatamine",
             'fan': "Ventilaator",
@@ -290,10 +320,13 @@ translations = {
             'state': "Olek",
             'currently': "Hetkel",
             'operation': "Töörežiim",
+            'fan_mode': "Ventilaatori režiim",
+            'heating': "Seadme sätete muutmine",
         },
         'fa': {
             'ACTIVATE': "فعال سازی",
             'aux_heat': "Aux گرما",
+            'away_mode': "حالت بیرون",
             'cooling': "خنک کننده",
             'drying': "خشك كردن",
             'fan': "فن",
@@ -315,11 +348,14 @@ translations = {
             'state': "حالت",
             'currently': "در حال حاضر",
             'operation': "عملیات",
+            'fan_mode': "حالت فن",
+            'heating': "پیکربندی مجدد دستگاه",
         },
         'fi': {
             'PRESS': "Paina",
             'ACTIVATE': "Aktivoi",
             'aux_heat': "Lisälämpö",
+            'away_mode': "Poissa kotoa -tila",
             'cooling': "Jäähdytys",
             'drying': "Kuivaus",
             'fan': "Tuuletin",
@@ -342,11 +378,14 @@ translations = {
             'state': "Tila",
             'currently': "Tällä hetkellä",
             'operation': "Toiminto",
+            'fan_mode': "Tuuletustila",
+            'heating': "Laitetta konfiguroidaan uudelleen",
         },
         'fr': {
             'PRESS': "Appui",
             'ACTIVATE': "Activer",
             'aux_heat': "Chauffage d'appoint",
+            'away_mode': "Mode "Absent"",
             'cooling': "Refroidissement",
             'drying': "Séchage",
             'fan': "Ventilateur",
@@ -369,11 +408,14 @@ translations = {
             'state': "État",
             'currently': "Actuellement",
             'operation': "Opération",
+            'fan_mode': "Mode de ventilation",
+            'heating': "Reconfigurer l'appareil",
         },
         'he': {
             'PRESS': "לחיצה",
             'ACTIVATE': "הפעל",
             'aux_heat': "מסייע חום",
+            'away_mode': "מצב לא בבית",
             'cooling': "קירור",
             'drying': "מייבש",
             'fan': "מאוורר",
@@ -396,10 +438,13 @@ translations = {
             'state': "מצב",
             'currently': "כעת",
             'operation': "פעולה",
+            'fan_mode': "מצב מאורר",
+            'heating': "קביעת תצורה מחדש של התקן",
         },
         'hr': {
             'ACTIVATE': "Aktivirati",
             'aux_heat': "Pomoćno grijanje",
+            'away_mode': "Način rada: Odsutan",
             'cooling': "Hlađenje",
             'drying': "Sušenje",
             'fan': "Ventilator",
@@ -421,11 +466,14 @@ translations = {
             'state': "Stanje",
             'currently': "Trenutno",
             'operation': "operacija",
+            'fan_mode': "Način rada s ventilatorom",
+            'heating': "Ponovno učitavanje konfiguracije",
         },
         'hu': {
             'PRESS': "Gombnyomás",
             'ACTIVATE': "Aktiválás",
             'aux_heat': "Külső hőforrás",
+            'away_mode': "Távol mód",
             'cooling': "Hűtés",
             'drying': "Párátlanítás",
             'fan': "Ventilátor",
@@ -448,10 +496,13 @@ translations = {
             'state': "Állapot",
             'currently': "Jelenleg",
             'operation': "Működés",
+            'fan_mode': "Ventilátor",
+            'heating': "Eszköz újrakonfigurálása",
         },
         'hy': {
             'ACTIVATE': "Ակտիվացնել",
             'aux_heat': "Aux ջերմությունը",
+            'away_mode': "հեռու ռեժիմ",
             'cooling': "հովացում",
             'drying': "Չորացում",
             'fan': "Երկրպագու",
@@ -472,11 +523,14 @@ translations = {
             'state': "Պետություն",
             'currently': "Ներկայումս",
             'operation': "Գործողություն",
+            'fan_mode': "Երկրպագուների ռեժիմ",
+            'heating': "Կարգավորման վերաբեռնում",
         },
         'id': {
             'PRESS': "Tekan",
             'ACTIVATE': "Aktifkan",
             'aux_heat': "Pemanasan tambahan",
+            'away_mode': "Mode keluar rumah",
             'cooling': "Mendinginkan",
             'drying': "Mengeringkan",
             'fan': "Kipas",
@@ -499,10 +553,13 @@ translations = {
             'state': "Status",
             'currently': "Saat ini",
             'operation': "Operasi",
+            'fan_mode': "Mode kipas",
+            'heating': "Mengonfigurasi ulang perangkat",
         },
         'is': {
             'PRESS': "Ýttu á",
             'ACTIVATE': "Virkja",
+            'away_mode': "Fjarverandi hamur",
             'cooling': "Kæling",
             'drying': "Þurrkun",
             'fan': "Vifta",
@@ -525,11 +582,14 @@ translations = {
             'state': "Staða",
             'currently': "Er núna",
             'operation': "Aðgerð",
+            'fan_mode': "Viftuhamur",
+            'heating': "Endurhleðsla stillinga",
         },
         'it': {
             'PRESS': "Premi",
             'ACTIVATE': "Attiva",
             'aux_heat': "Riscaldamento ausiliario",
+            'away_mode': "Modalità assente",
             'cooling': "Raffreddamento",
             'drying': "Deumidificazione",
             'fan': "Ventilatore",
@@ -552,10 +612,13 @@ translations = {
             'state': "Stato",
             'currently': "Attualmente",
             'operation': "Operazione",
+            'fan_mode': "Ventilazione",
+            'heating': "Riconfigurazione del dispositivo",
         },
         'lb': {
             'ACTIVATE': "Aktivéieren",
             'aux_heat': "Zousätzlech Heizung",
+            'away_mode': "Modus Keen Doheem",
             'cooling': "Ofkillen",
             'drying': "Dréchnen",
             'fan': "Ventilator",
@@ -577,9 +640,12 @@ translations = {
             'state': "Zoustand",
             'currently': "Momentan",
             'operation': "Aktioun",
+            'fan_mode': "Ventilatioun Modus",
+            'heating': "Apparat frësch konfiguréieren",
         },
         'lt': {
             'ACTIVATE': "Suaktyvinti",
+            'away_mode': "Išvykimo režimas",
             'cooling': "Aušinimas",
             'drying': "Džiovinimas",
             'fan': "Ventiliatorius",
@@ -601,10 +667,13 @@ translations = {
             'state': "Būsena",
             'currently': "Šiuo metu",
             'operation': "Operacija",
+            'fan_mode': "Ventiliatoriaus režimas",
+            'heating': "Serverio valdymas",
         },
         'lv': {
             'ACTIVATE': "Aktivizēt",
             'aux_heat': "Ārējais sildītājs",
+            'away_mode': "Prombūtnes režīms",
             'cooling': "Dzesēšana",
             'drying': "Žāvēšana",
             'fan': "Ventilators",
@@ -625,11 +694,14 @@ translations = {
             'state': "Stāvoklis",
             'currently': "Pašlaik",
             'operation': "Darbība",
+            'fan_mode': "Ventilatora režīms",
+            'heating': "YAML konfigurācijas pārlādēšana",
         },
         'nb': {
             'PRESS': "trykk",
             'ACTIVATE': "Aktiver",
             'aux_heat': "Aux varme",
+            'away_mode': "Bortemodus",
             'cooling': "Kjøling",
             'drying': "Tørking",
             'fan': "Vifte",
@@ -652,11 +724,14 @@ translations = {
             'state': "Tilstand",
             'currently': "Er nå",
             'operation': "Operasjon",
+            'fan_mode': "Viftemodus",
+            'heating': "Konfigurerer enheten på nytt",
         },
         'nl': {
             'PRESS': "Klik",
             'ACTIVATE': "Activeren",
             'aux_heat': "Extra warmte",
+            'away_mode': "Afwezigheidsmodus",
             'cooling': "Koelen",
             'drying': "Ontvochtigen",
             'fan': "Ventilator",
@@ -679,10 +754,13 @@ translations = {
             'state': "Staat",
             'currently': "Momenteel",
             'operation': "Werking",
+            'fan_mode': "Ventilatormodus",
+            'heating': "Apparaat opnieuw configureren",
         },
         'nn': {
             'ACTIVATE': "Aktiver",
             'aux_heat': "Aux-varme",
+            'away_mode': "Bortemodus",
             'cooling': "Nedkjøling",
             'drying': "Tørkar",
             'fan': "Vifte",
@@ -705,11 +783,14 @@ translations = {
             'state': "Tilstand",
             'currently': "Akkurat no",
             'operation': "Operasjon",
+            'fan_mode': "Viftemodus",
+            'heating': "Konfigurasjonsomlasting",
         },
         'pl': {
             'PRESS': "Naciśnij",
             'ACTIVATE': "Aktywuj",
             'aux_heat': "Zewnętrznie podłączone źródło",
+            'away_mode': "Tryb poza domem",
             'cooling': "chłodzenie",
             'drying': "osuszanie",
             'fan': "wentylator",
@@ -732,11 +813,14 @@ translations = {
             'state': "Stan",
             'currently': "Obecnie",
             'operation': "Tryb pracy",
+            'fan_mode': "Tryb nawiewu",
+            'heating': "Ponowne konfigurowanie urządzenia",
         },
         'pt': {
             'PRESS': "Pressione",
             'ACTIVATE': "Ativar",
             'aux_heat': "Calor auxiliar",
+            'away_mode': "Modo ausente",
             'cooling': "Resfriar",
             'drying': "Secagem",
             'fan': "Ventoinha",
@@ -758,10 +842,13 @@ translations = {
             'state': "Estado",
             'currently': "Atualmente",
             'operation': "Operação",
+            'fan_mode': "Modo ventilar",
+            'heating': "Reconfigurar dispositivo",
         },
         'ro': {
             'ACTIVATE': "Activați",
             'aux_heat': "Încălzire auxiliară",
+            'away_mode': "Mod plecat",
             'cooling': "Racește",
             'drying': "Usucă",
             'fan': "Ventilator",
@@ -784,11 +871,14 @@ translations = {
             'state': "Status",
             'currently': "În prezent",
             'operation': "Operație",
+            'fan_mode': "Mod ventilator",
+            'heating': "Reîncărcarea configurației YAML",
         },
         'ru': {
             'PRESS': "Нажать",
             'ACTIVATE': "Активировать",
             'aux_heat': "Дополнительный нагрев",
+            'away_mode': "Режим "не дома"",
             'cooling': "Охлаждение",
             'drying': "Осушение",
             'fan': "Вентиляция",
@@ -811,10 +901,13 @@ translations = {
             'state': "Состояние",
             'currently': "Сейчас",
             'operation': "Режим работы",
+            'fan_mode': "Режим вентиляции",
+            'heating': "Перенастройка устройства",
         },
         'sk': {
             'ACTIVATE': "Aktivovať",
             'aux_heat': "Prídavné kúrenie",
+            'away_mode': "Režim neprítomnosti",
             'cooling': "Chladenie",
             'drying': "Sušenie",
             'fan': "Ventilátor",
@@ -837,11 +930,14 @@ translations = {
             'state': "Stav",
             'currently': "Aktuálne",
             'operation': "Prevádzka",
+            'fan_mode': "Režim ventilátora",
+            'heating': "Načítavanie novej konfigurácie",
         },
         'sl': {
             'PRESS': "Pritisnite",
             'ACTIVATE': "Aktiviraj",
             'aux_heat': "Dodatna toplota",
+            'away_mode': "Način odsotnosti",
             'cooling': "Hlajenje",
             'drying': "Sušenje",
             'fan': "Ventilator",
@@ -863,11 +959,14 @@ translations = {
             'state': "Stanje",
             'currently': "Trenutno",
             'operation': "Delovanje",
+            'fan_mode': "Način ventilatorja",
+            'heating': "Ponovno konfiguriranje naprave",
         },
         'sv': {
             'PRESS': "Tryck",
             'ACTIVATE': "Aktivera",
             'aux_heat': "Underhållsvärme",
+            'away_mode': "Bortaläge",
             'cooling': "Kyler",
             'drying': "Avfuktar",
             'fan': "Fläkt",
@@ -890,11 +989,14 @@ translations = {
             'state': "Tillstånd",
             'currently': "Nuvarande",
             'operation': "Driftläge",
+            'fan_mode': "Fläktläge",
+            'heating': "Konfigurerar om enheten",
         },
         'th': {
             'PRESS': "กด",
             'ACTIVATE': "กระตุ้น",
             'aux_heat': "ความร้อน Aux",
+            'away_mode': "โหมดไม่อยู่บ้าน",
             'cooling': "โหมดเย็น",
             'drying': "โหมดแห้ง",
             'fan': "พัดลม",
@@ -915,11 +1017,14 @@ translations = {
             'state': "สถานะ",
             'currently': "ในขณะนี้",
             'operation': "การทำงาน",
+            'fan_mode': "โหมดของพัดลม",
+            'heating': "โหลดการกำหนดค่า YAML อีกครั้ง",
         },
         'tr': {
             'PRESS': "Basınız",
             'ACTIVATE': "Etkinleştir",
             'aux_heat': "Yardımcı ısı",
+            'away_mode': "Dışarıda modu",
             'cooling': "Soğutma",
             'drying': "Kurutma",
             'fan': "Fan",
@@ -942,11 +1047,14 @@ translations = {
             'state': "Durum",
             'currently': "Şu an",
             'operation': "İşlem",
+            'fan_mode': "Fan modu",
+            'heating': "Cihazı yeniden yapılandırma",
         },
         'uk': {
             'PRESS': "Натисніть",
             'ACTIVATE': "Активувати",
             'aux_heat': "Додатковий нагрів",
+            'away_mode': "Режим "Не вдома"",
             'cooling': "Охолодження",
             'drying': "Осушення",
             'fan': "Вентилятор",
@@ -968,10 +1076,13 @@ translations = {
             'state': "Статус",
             'currently': "В даний час",
             'operation': "Режим",
+            'fan_mode': "Режим вентиляції",
+            'heating': "Переналаштування пристрою",
         },
         'vi': {
             'ACTIVATE': "Kích hoạt",
             'aux_heat': "Nhiệt phụ trợ",
+            'away_mode': "Chế độ đi vắng",
             'cooling': "Làm mát",
             'drying': "Làm khô",
             'fan': "Quạt",
@@ -993,6 +1104,8 @@ translations = {
             'state': "Trạng thái",
             'currently': "Hiện tại",
             'operation': "Chế độ hoạt động",
+            'fan_mode': "Chế độ quạt",
+            'heating': "Đang tải lại cấu hình YAML",
         },
 }
 
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index ed4f8954..dde044b2 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -281,7 +281,7 @@ class LuiPagesGen(object):
             current_temp = get_attr_safe(entity, "current_temperature", "")
             dest_temp    = int(get_attr_safe(entity, "temperature", 0)*10)
             status       = get_attr_safe(entity, "hvac_action", "")
-            status       = get_translation(self._locale,status)
+            state_value  = f"{get_translation(self._locale,status)} ({get_translation(self._locale,entity.state)})"
             min_temp     = int(get_attr_safe(entity, "min_temp", 0)*10)
             max_temp     = int(get_attr_safe(entity, "max_temp", 0)*10)
             step_temp    = int(get_attr_safe(entity, "target_temp_step", 0.5)*10) 
@@ -321,7 +321,7 @@ class LuiPagesGen(object):
             state_translation = get_translation(self._locale, "state")
             action_translation = get_translation(self._locale, "operation")
 
-            command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}"
+            command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{state_value}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}"
         self._send_mqtt_msg(command)
 
     def generate_media_page(self, navigation, title, entity):