Skip to content

Commit

Permalink
Additional informations added to admin tab cards
Browse files Browse the repository at this point in the history
  • Loading branch information
@Homemade-Disaster
Homemade-Disaster committed Apr 18, 2022
1 parent 0514dc4 commit 5c00e52
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 186 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Mittels der Netatmo-Energy API werden die aktuellen Einstellungen abgeholt bzw.
Placeholder for the next version (at the beginning of the line):
### **WORK IN PROGRESS**
-->
### 1.3.1 (2022-04-18)
* (ioKlausi) Additional informations added to admin tab cards

### 1.3.0 (2022-04-17)
* (ioKlausi) Change thermostat mode functionality added to thermostat card

Expand Down
2 changes: 1 addition & 1 deletion admin/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ body > div:nth-child(2) {
/* */
.m .valve {
float: left;
height: 300px;
height: 280px;
padding: 5px;
width: 400px;
-webkit-perspective: 800px;
Expand Down
71 changes: 47 additions & 24 deletions admin/tab_m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ <h6 class="translate">${message.msgtxt}</h6>

let battery_state = valve.battery_state;
let battery_state_cls = getBatteryCls(battery_state);
let battery_level = valve.battery_level;

let heating_power_request = valve.heating_power_request;
let heating_power_request_cls = getHeaterCls(heating_power_request);
Expand Down Expand Up @@ -433,30 +434,7 @@ <h6 class="translate">${message.msgtxt}</h6>
<div style="height: 100%;">
${img_src.img != undefined && img_src.img!= null ? `
<img src="${img_src.img}" width="65px" onerror="this.onerror=null;this.src='img/noimage.png';">
` : ''}
${friendlyName != undefined && friendlyName!= null ? `
<div id="friendly_name" class="card-title truncate" style="margin-right: 5px;">${friendlyName}
</div>
` : ''}
${temp_act != undefined && temp_act!= null ? `
<ul style="margin: 0px;"><b class="translate">Actual temperature:</b> ${temp_act.toFixed(1)}</ul>
` : ''}
${temp_set != undefined && temp_set!= null ? `
<ul id="${mod_id_internal}_setTemp_TempValve" data_point="${temp_set.toFixed(1)}" data_folder="${setMode}" class="${id}_setTemp_Class ${valve.type}" style="margin: 0px;">
<b class="translate">Target temperature:</b> ${temp_set.toFixed(1)}
</ul>
` : ''}
${temp_set != undefined && temp_set!= null ? `
<input id="${id}_setTemp" data_point="${setTemp}" type="range" min="7" max="30" step="0.5" value="${temp_set}" class="myslider ${id}_slider_Class" onchange="setTempValve(this.value, this)">
` : ''}
${plug_connected_boiler != undefined && plug_connected_boiler!= null ? ((plug_connected_boiler.value > 0) ?
`<ul style="margin: 0px;"><b class="translate">Plug is connected to boiler</b></ul>`
:
`<ul style="margin: 0px;"><b class="translate">Plug is not connected to boiler</b></ul>`) : ''}
${boiler_cable != undefined && boiler_cable!= null ? ((boiler_cable.value == true) ?
`<ul style="margin: 0px;"><b class="translate">Boiler cable used</b></ul>`
:
`<ul style="margin: 0px;"><b class="translate">Boiler cable not used</b></ul>`) : ''}
` : ''}
</div>
<div class="info">
Expand Down Expand Up @@ -516,6 +494,37 @@ <h6 class="translate">${message.msgtxt}</h6>
</div>` : ''}
</div>
</div>
<div class="card-details">
${friendlyName != undefined && friendlyName!= null ? `
<div id="friendly_name" class="card-title truncate" style="margin-right: 5px;">${friendlyName}
</div>
` : ''}
${temp_act != undefined && temp_act!= null ? `
<ul style="margin: 0px;"><b class="translate">Actual temperature:</b> ${temp_act.toFixed(1)}</ul>
` : ''}
${temp_set != undefined && temp_set!= null ? `
<ul id="${mod_id_internal}_setTemp_TempValve" data_point="${temp_set.toFixed(1)}" data_folder="${setMode}" class="${id}_setTemp_Class ${valve.type}" style="margin: 0px;">
<b class="translate">Target temperature:</b> ${temp_set.toFixed(1)}
</ul>
` : ''}
${temp_set != undefined && temp_set!= null ? `
<input id="${id}_setTemp" data_point="${setTemp}" type="range" min="7" max="30" step="0.5" value="${temp_set}" class="myslider ${id}_slider_Class" onchange="setTempValve(this.value, this)">
` : ''}
${plan_active != undefined && plan_active!= null ? `
<ul style="margin: 0px;"><b class="translate">Heating Plan:</b> ${plan_active}</ul>
` : ''}
${thermmode_active != undefined && thermmode_active!= null ? `
<ul style="margin: 0px;"><b class="translate">Mode:</b> ${thermmode_active}</ul>
` : ''}
${plug_connected_boiler != undefined && plug_connected_boiler!= null ? ((plug_connected_boiler.value > 0) ?
`<ul style="margin: 0px;"><b class="translate">Plug is connected to boiler</b></ul>`
:
`<ul style="margin: 0px;"><b class="translate">Plug is not connected to boiler</b></ul>`) : ''}
${boiler_cable != undefined && boiler_cable!= null ? ((boiler_cable.value == true) ?
`<ul style="margin: 0px;"><b class="translate">Boiler cable used</b></ul>`
:
`<ul style="margin: 0px;"><b class="translate">Boiler cable not used</b></ul>`) : ''}
</div>
</div>
<div class="card-action">
<div style="margin-left: auto;">
Expand Down Expand Up @@ -561,6 +570,9 @@ <h6 class="translate">${message.msgtxt}</h6>
${wifi_strength != undefined && wifi_strength!= null ? `
<ul style="margin: 0px;"><b class="translate">Wifi strength:</b> ${wifi_strength}</ul>
` : ''}
${battery_level != undefined && battery_level!= null ? `
<ul style="margin: 0px;"><b class="translate">Battery voltage:</b> ${battery_level} V</ul>
` : ''}
</div>
</div>
<div class="card-footer">
Expand Down Expand Up @@ -625,6 +637,17 @@ <h6 class="translate">${message.msgtxt}</h6>
const id = $trigger.data('api-request');

sendTo(namespace, id, {id}, function (data) {});
var $sel = $('#messages');
let wait_html = '';
wait_html = `<div style="float: left">
<img src="img/check.png" width="65px" onerror="this.onerror=null;this.src='img/noimage.png';">
</div>
<div class="col">
<h6 class="translate">Request was sent to Netatmo Cloud</h6>
</div>`;
$sel.html(wait_html);
$('#netatmo_energy_close_all').show();
translateAll();
});

/* Open modal for device friendly name editing */
Expand Down
48 changes: 48 additions & 0 deletions admin/words.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2200,6 +2200,54 @@ const _systemDictionary = {
"es": "¡No se puede activar el modo de termostato!",
"pl": "Nie można uzyskać aktywnego trybu termostatu!",
"zh-cn": "无法获得主动恒温器模式！"
},
"Heating Plan:": {
"en": "Heating Plan:",
"de": "Heizplan:",
"ru": "План отопления:",
"pt": "Plano de aquecimento:",
"nl": "Verwarmingsplan:",
"fr": "Plan de chauffage :",
"it": "Piano di riscaldamento:",
"es": "Plan de calefacción:",
"pl": "Plan ogrzewania:",
"zh-cn": "供暖计划："
},
"Mode:": {
"en": "Mode:",
"de": "Modus:",
"ru": "Режим:",
"pt": "Modo:",
"nl": "Modus:",
"fr": "Mode:",
"it": "Modalità:",
"es": "Modo:",
"pl": "Tryb:",
"zh-cn": "模式："
},
"Request was sent to Netatmo Cloud": {
"en": "Request was sent to Netatmo Cloud",
"de": "Anfrage wurde an Netatmo Cloud gesendet",
"ru": "Запрос отправлен в облако Netatmo",
"pt": "A solicitação foi enviada para o Netatmo Cloud",
"nl": "Verzoek is verzonden naar Netatmo Cloud",
"fr": "La demande a été envoyée à Netatmo Cloud",
"it": "La richiesta è stata inviata a Netatmo Cloud",
"es": "La solicitud fue enviada a Netatmo Cloud",
"pl": "Żądanie zostało wysłane do Netatmo Cloud",
"zh-cn": "请求已发送到 Netatmo Cloud"
},
"Battery voltage:": {
"en": "Battery voltage:",
"de": "Batteriespannung:",
"ru": "Напряжение батареи:",
"pt": "Voltagem da bateria:",
"nl": "Batterij voltage:",
"fr": "Voltage de batterie:",
"it": "Voltaggio batteria:",
"es": "Voltaje de la batería:",
"pl": "Napięcie baterii:",
"zh-cn": "电池电压："
}
};

Expand Down
172 changes: 14 additions & 158 deletions io-package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
"common": {
"name": "netatmo-energy",
"version": "1.3.0",
"version": "1.3.1",
"news": {
"1.3.1": {
"en": "Additional informations added to admin tab cards",
"de": "Zusätzliche Informationen zu Admin-Tab Registerkarten hinzugefügt",
"ru": "Добавлена дополнительная информация на карточки вкладок администратора",
"pt": "Informações adicionais adicionadas aos cartões da guia do administrador",
"nl": "Aanvullende informatie toegevoegd aan beheerderstabbladen",
"fr": "Informations supplémentaires ajoutées aux onglets d'administration",
"it": "Informazioni aggiuntive aggiunte alle schede della scheda amministratore",
"es": "Información adicional agregada a las tarjetas de pestañas de administración",
"pl": "Dodatkowe informacje dodane do kart admina",
"zh-cn": "添加到管理选项卡的附加信息"
},
"1.3.0": {
"en": "Change thermostat mode functionality added to thermostat card",
"de": "Funktion zum Ändern des Thermostatmodus zur Thermostatkarte hinzugefügt",
Expand Down Expand Up @@ -86,163 +98,7 @@
"es": "Cerrar funcionalidad de mensaje agregada en la pestaña de administración",
"pl": "Dodano funkcję zamykania wiadomości na karcie administratora",
"zh-cn": "在管理选项卡上添加了关闭消息功能"
},
"1.1.7": {
"en": "Bridge assignment added to each card",
"de": "Bridge Zuordnung zu jeder Karte hinzugefügt",
"ru": "Назначение моста добавлено к каждой карте",
"pt": "Atribuição de ponte adicionada a cada cartão",
"nl": "Brugopdracht toegevoegd aan elke kaart",
"fr": "Affectation de pont ajoutée à chaque carte",
"it": "Assegnazione bridge aggiunta a ciascuna carta",
"es": "Asignación de puente añadida a cada tarjeta",
"pl": "Przypisanie pomostu dodane do każdej karty",
"zh-cn": "每张卡片都添加了桥牌分配"
},
"1.1.6": {
"en": "Rework README.MD",
"de": "README.MD überarbeiten",
"ru": "Переработка README.MD",
"pt": "Retrabalhar README.MD",
"nl": "Herwerk README.MD",
"fr": "Retravailler README.MD",
"it": "Rielabora README.MD",
"es": "Reelaborar README.MD",
"pl": "Przerób README.MD",
"zh-cn": "返工 README.MD"
},
"1.1.5": {
"en": "Refresh functionality added to admin tab",
"de": "Aktualisierungsfunktion zum Admin-Tab hinzugefügt",
"ru": "Функция обновления добавлена на вкладку администратора",
"pt": "Atualize a funcionalidade adicionada à guia de administração",
"nl": "Vernieuwingsfunctionaliteit toegevoegd aan beheerderstabblad",
"fr": "Fonctionnalité d'actualisation ajoutée à l'onglet admin",
"it": "Funzionalità di aggiornamento aggiunta alla scheda amministratore",
"es": "Funcionalidad de actualización agregada a la pestaña de administración",
"pl": "Dodano funkcję odświeżania do karty administratora",
"zh-cn": "刷新功能添加到管理选项卡"
},
"1.1.4": {
"en": "Bridge added to admin tab",
"de": "Bridge zum Admin-Tab hinzugefügt",
"ru": "Мост добавлен на вкладку администратора",
"pt": "Bridge adicionado à guia de administração",
"nl": "Bridge toegevoegd aan beheerderstabblad",
"fr": "Pont ajouté à l'onglet admin",
"it": "Bridge aggiunto alla scheda amministratore",
"es": "Bridge agregado a la pestaña de administración",
"pl": "Bridge dodany do karty administratora",
"zh-cn": "桥添加到管理选项卡"
},
"1.1.3": {
"en": "Admin tab for valves added",
"de": "Admin-Tab für Ventile hinzugefügt",
"ru": "Добавлена вкладка администратора для клапанов",
"pt": "Aba de administração para válvulas adicionadas",
"nl": "Admin-tabblad voor kleppen toegevoegd",
"fr": "Onglet Admin pour les vannes ajoutées",
"it": "Aggiunta la scheda Admin per le valvole",
"es": "Pestaña de administración para válvulas añadidas",
"pl": "Dodano zakładkę Admin dla zaworów",
"zh-cn": "添加了阀门的管理选项卡"
},
"1.1.2": {
"en": "Bugfix Easy Admin",
"de": "Fehlerbehebung Easy Admin",
"ru": "Исправление ошибки Easy Admin",
"pt": "Correção de bugs fácil de administração",
"nl": "Bugfix Eenvoudige Admin",
"fr": "Correction de bugs Administrateur facile",
"it": "Bugfix Easy Admin",
"es": "Fácil administración de corrección de errores",
"pl": "Łatwy administrator naprawiania błędów",
"zh-cn": "错误修复 轻松管理"
},
"1.1.1": {
"en": "Bugfix: setroomthermpoint",
"de": "Bugfix: Raumthermopunkt setzen",
"ru": "Исправление: setroomthermpoint",
"pt": "Correção de bug: setroomthermpoint",
"nl": "Bugfix: setroomthermpoint",
"fr": "Correctif : setroomthermpoint",
"it": "Bugfix: setroomthermpoint",
"es": "Corrección de errores: setroomthermpoint",
"pl": "Poprawka: setroomthermpoint",
"zh-cn": "错误修正：setroomthermpoint"
},
"1.1.0": {
"en": "Trigger for valve-mode implemented",
"de": "Trigger für Ventilmodus implementiert",
"ru": "Реализован триггер для режима клапана",
"pt": "Gatilho para modo de válvula implementado",
"nl": "Trigger voor klepmodus geïmplementeerd",
"fr": "Déclencheur pour le mode valve implémenté",
"it": "Attivato il trigger per la modalità valvola",
"es": "Disparador para modo de válvula implementado",
"pl": "Wdrożony wyzwalacz dla trybu zaworu",
"zh-cn": "已实现阀门模式的触发器"
},
"1.0.4": {
"en": "Bugfix: Send message",
"de": "Bugfix: Nachricht senden",
"ru": "Исправлено: отправить сообщение",
"pt": "Correção de bug: Enviar mensagem",
"nl": "Bugfix: bericht verzenden",
"fr": "Correction de bug : Envoyer un message",
"it": "Bugfix: Invia messaggio",
"es": "Corrección de errores: Enviar mensaje",
"pl": "Bugfix: Wyślij wiadomość",
"zh-cn": "错误修正：发送消息"
},
"1.0.3": {
"en": "Transfered Customizing-UI to json",
"de": "Customizing-UI nach json übertragen",
"ru": "Переведен Customizing-UI в json",
"pt": "Customizing-UI transferido para json",
"nl": "Customizing-UI overgezet naar json",
"fr": "Transfert de l'interface utilisateur de personnalisation vers json",
"it": "Trasferito Customizing-UI in json",
"es": "Transferencia de Customizing-UI a json",
"pl": "Przeniesiono dostosowywanie-UI do json",
"zh-cn": "将定制 UI 转移到 json"
},
"1.0.2": {
"en": "Redesign coding",
"de": "Codierung neu gestalten",
"ru": "Редизайн кодирования",
"pt": "Redesign de codificação",
"nl": "Codering opnieuw ontwerpen",
"fr": "Refonte du codage",
"it": "Riprogettare la codifica",
"es": "Codificación de rediseño",
"pl": "Przeprojektuj kodowanie",
"zh-cn": "重新设计编码"
},
"1.0.1": {
"en": "Redesign coding",
"de": "Codierung neu gestalten",
"ru": "Редизайн кодирования",
"pt": "Redesign de codificação",
"nl": "Codering opnieuw ontwerpen",
"fr": "Refonte du codage",
"it": "Riprogettare la codifica",
"es": "Codificación de rediseño",
"pl": "Przeprojektuj kodowanie",
"zh-cn": "重新设计编码"
},
"1.0.0": {
"en": "Create major version",
"de": "Hauptversion erstellen",
"ru": "Создать основную версию",
"pt": "Criar versão principal",
"nl": "Hoofdversie maken",
"fr": "Créer une version majeure",
"it": "Crea la versione principale",
"es": "Crear versión principal",
"pl": "Utwórz wersję główną",
"zh-cn": "创建主要版本"
}
}
},
"title": "Netatmo Energy",
"titleLang": {
Expand Down
Loading

0 comments on commit 5c00e52

Please sign in to comment.