mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 15:34:26 +01:00
Fix power off state visualization
This commit is contained in:
@@ -3764,18 +3764,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
if (o.common.role == 'airCondition') {
|
if (o.common.role == 'airCondition') {
|
||||||
if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) {
|
if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) {
|
||||||
let Mode = getState(id + '.MODE').val
|
let Mode = getState(id + '.MODE').val
|
||||||
|
|
||||||
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
|
||||||
if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true
|
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
|
||||||
statusStr = 'ON';
|
|
||||||
} else {
|
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
|
||||||
statusStr = 'OFF';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let States = getObject(id + '.MODE').common.states;
|
let States = getObject(id + '.MODE').common.states;
|
||||||
|
|
||||||
let iconIndex: number = 1;
|
let iconIndex: number = 1;
|
||||||
for(const statekey in States) {
|
for(const statekey in States) {
|
||||||
let stateName: string = States[statekey];
|
let stateName: string = States[statekey];
|
||||||
@@ -3851,6 +3841,19 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
||||||
|
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
||||||
|
console.log(Mode);
|
||||||
|
console.log(States[Mode]);
|
||||||
|
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
||||||
|
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
||||||
|
statusStr = 'OFF';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3381,18 +3381,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
if (o.common.role == 'airCondition') {
|
if (o.common.role == 'airCondition') {
|
||||||
if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) {
|
if (existsState(id + '.MODE') && getState(id + '.MODE').val != null) {
|
||||||
let Mode = getState(id + '.MODE').val
|
let Mode = getState(id + '.MODE').val
|
||||||
|
|
||||||
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
|
||||||
if (Mode != 0 || getState(id + '.POWER').val) { //0=ON oder .POWER = true
|
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
|
||||||
statusStr = 'ON';
|
|
||||||
} else {
|
|
||||||
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
|
||||||
statusStr = 'OFF';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let States = getObject(id + '.MODE').common.states;
|
let States = getObject(id + '.MODE').common.states;
|
||||||
|
|
||||||
let iconIndex: number = 1;
|
let iconIndex: number = 1;
|
||||||
for(const statekey in States) {
|
for(const statekey in States) {
|
||||||
let stateName: string = States[statekey];
|
let stateName: string = States[statekey];
|
||||||
@@ -3468,6 +3458,19 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
|
|||||||
}
|
}
|
||||||
iconIndex++;
|
iconIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Power Icon zuletzt pruefen, damit der Mode ggf. mit OFF ueberschrieben werden kann
|
||||||
|
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
|
||||||
|
console.log(Mode);
|
||||||
|
console.log(States[Mode]);
|
||||||
|
if (States[Mode] == 'OFF' || !getState(id + '.POWER').val) {
|
||||||
|
bt[0] = Icons.GetIcon('power-standby') + '~35921~0~' + 'POWER' + '~';
|
||||||
|
statusStr = 'OFF';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
bt[0] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user