h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 15:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

v4.3.3.27 Update NSPanel.ts

Browse Source 
- Fix Payload (pageItem.id -> placeId) by Function CreateEntity
- Fix Fallback PageItem.name by Function CreateEntity
This commit is contained in:
Thomas
2023-12-28 14:40:09 +01:00
parent f807406a97
commit 9082ed20f3
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ioBroker/NsPanelTs.ts
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.3.3.26 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne TypeScript v4.3.3.27 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.3.0 - abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.3.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -83,6 +83,8 @@ ReleaseNotes:
- 18.12.2023 - v4.3.3.24 Hotfix Update Message / Add Icon Colors to Entity Button - 18.12.2023 - v4.3.3.24 Hotfix Update Message / Add Icon Colors to Entity Button
- 21.12.2023 - v4.3.3.25 Add switch of cardQR by hidePassword: true - 21.12.2023 - v4.3.3.25 Add switch of cardQR by hidePassword: true
- 26.12.2023 - v4.3.3.26 Fix Log output payload -> Json.stringify - 26.12.2023 - v4.3.3.26 Fix Log output payload -> Json.stringify
- 28.12.2023 - v4.3.3.27 Fix Payload (pageItem.id -> placeId) by Function CreateEntity
- 28.12.2023 - v4.3.3.27 Fix Fallback PageItem.name by Function CreateEntity
Todo: Todo:
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined - XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
@@ -959,7 +961,7 @@ export const config = <Config> {
// _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________ // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
// _________________________________ EN: No more configuration from here _____________________________________ // _________________________________ EN: No more configuration from here _____________________________________
const scriptVersion: string = 'v4.3.3.26'; const scriptVersion: string = 'v4.3.3.27';
const tft_version: string = 'v4.3.3'; const tft_version: string = 'v4.3.3';
const desired_display_firmware_version = 53; const desired_display_firmware_version = 53;
const berry_driver_version = 9; const berry_driver_version = 9;
@@ -3279,16 +3281,26 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
} }
// Fallback if no name is given // Fallback if no name is given
name = pageItem.name !== undefined ? pageItem.name : o.common.name.de; // name = pageItem.name !== undefined ? pageItem.name : o.common.name.de;
name = pageItem.name !== undefined ? pageItem.name : o.common.name.de == undefined ? o.common.name : o.common.name.de;
let prefix = pageItem.prefixName !== undefined ? pageItem.prefixName : ''; let prefix = pageItem.prefixName !== undefined ? pageItem.prefixName : '';
let suffix = pageItem.suffixName !== undefined ? pageItem.suffixName : ''; let suffix = pageItem.suffixName !== undefined ? pageItem.suffixName : '';
// If name is used with changing values // If name is used with changing values
if ((name || '').indexOf('getState(') != -1) {
let dpName: string = name.slice(10, name.length -6);
name = getState(dpName).val;
RegisterEntityWatcher(dpName);
}
/*
// If name is used with changing values
if (name.indexOf('getState(') != -1) { if (name.indexOf('getState(') != -1) {
let dpName: string = name.slice(10, name.length -6); let dpName: string = name.slice(10, name.length -6);
name = getState(dpName).val; name = getState(dpName).val;
RegisterEntityWatcher(dpName); RegisterEntityWatcher(dpName);
} }
*/
name = prefix + name + suffix; name = prefix + name + suffix;
if (existsState(pageItem.id + '.GET')) { if (existsState(pageItem.id + '.GET')) {
@@ -5923,12 +5935,12 @@ function HandleButtonEvent(words: any): void {
if (!isNaN(id)) { if (!isNaN(id)) {
pageItemID = activePage.items[id].id; pageItemID = activePage.items[id].id;
if (Debug) {
log('HandleButtonEvent activePage: ' + activePage.items.length + ' id: ' + id + ' tempid: ' + tempid + ' pageItemId: ' + pageItemID); log('HandleButtonEvent activePage: ' + activePage.items.length + ' id: ' + id + ' tempid: ' + tempid + ' pageItemId: ' + pageItemID);
}
id = pageItemID id = pageItemID
}; };
if (Debug) { if (Debug) {
log('HandleButtonEvent übergebene Werte ' + words[0] + ' - ' + words[1] + ' - ' + words[2] + ' - ' + words[3] + ' - ' + words[4] + ' - PageId: ' + pageId, 'info'); log('HandleButtonEvent übergebene Werte ' + words[0] + ' - ' + words[1] + ' - ' + words[2] + ' - ' + words[3] + ' - ' + words[4] + ' - PageId: ' + pageId, 'info');
} }