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

Merge pull request #813 from fre4242/ScreensaverIconFix

Browse Source 
Fixed advanced screensaver boolean icon logic; improved code readability
This commit is contained in:
Armilar
2023-03-10 14:49:36 +01:00
committed by GitHub
parent 3ff6522eeb 27d21391b8
commit 37363f9034
2 changed files with 196 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
ioBroker/NsPanelTs.ts
View File

@@ -6853,32 +6853,27 @@ function HandleScreensaverUpdate(): void {
if (config.leftScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.leftScreensaverEntity[i].ScreensaverEntity)
}
RegisterScreensaverEntityWatcher(config.leftScreensaverEntity[i].ScreensaverEntity)
if (checkpoint) {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
if (typeof(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.leftScreensaverEntity[i].ScreensaverEntity).val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
}
if (typeof(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.leftScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
if (val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
if (typeof getState(config.leftScreensaverEntity[i].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
if (!isNaN(Date.parse(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val), config.leftScreensaverEntity[i].ScreensaverEntityDateFormat);
} else {
val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
if (!isNaN(Date.parse(val))) {
val = formatDate(getDateObject(val), config.leftScreensaverEntity[i].ScreensaverEntityDateFormat);
}
}
@@ -6892,9 +6887,6 @@ function HandleScreensaverUpdate(): void {
iconColor + '~' +
config.leftScreensaverEntity[i].ScreensaverEntityText + '~' +
val + '~';
} else {
console.log('Only ' + i+1 + ' leftScreensaverEntities defined');
}
}
if (checkpoint == false) {
for (let j = i; j < 3; j++) {
@@ -7005,15 +6997,14 @@ function HandleScreensaverUpdate(): void {
if (getState(NSPanel_Path + 'Config.Screensaver.alternativeScreensaverLayout').val) {
let val = getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
if (typeof(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val) == 'number') {
val = (getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val * config.bottomScreensaverEntity[4].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[4].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[4].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[4].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[4].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[4].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
}
if (typeof(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
}
if (typeof getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
if (!isNaN(Date.parse(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val), config.bottomScreensaverEntity[4].ScreensaverEntityDateFormat);
@@ -7039,31 +7030,27 @@ function HandleScreensaverUpdate(): void {
if (config.bottomScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.bottomScreensaverEntity[i].ScreensaverEntity)
}
if (checkpoint) {
RegisterScreensaverEntityWatcher(config.bottomScreensaverEntity[i].ScreensaverEntity)
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
if (typeof(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
}
if (typeof(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
if (val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
if (typeof getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
if (!isNaN(Date.parse(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val), config.bottomScreensaverEntity[i].ScreensaverEntityDateFormat);
} else {
val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
if (!isNaN(Date.parse(val))) {
val = formatDate(getDateObject(val), config.bottomScreensaverEntity[i].ScreensaverEntityDateFormat);
}
}
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconColor)) {
@@ -7079,7 +7066,6 @@ function HandleScreensaverUpdate(): void {
config.bottomScreensaverEntity[i].ScreensaverEntityText + '~' +
val
}
}
if (checkpoint == false) {
for (let j = i; j < maxEntities - 1; j++) {
payloadString += '~~~~~~';
@@ -7094,11 +7080,9 @@ function HandleScreensaverUpdate(): void {
if (config.indicatorScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.indicatorScreensaverEntity[i].ScreensaverEntity)
}
RegisterScreensaverEntityWatcher(config.indicatorScreensaverEntity[i].ScreensaverEntity)
if (checkpoint) {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
@@ -7110,14 +7094,13 @@ function HandleScreensaverUpdate(): void {
icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val * config.indicatorScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.indicatorScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.indicatorScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.indicatorScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.indicatorScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.indicatorScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.indicatorScreensaverEntity[i]);
}
if (typeof(getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.indicatorScreensaverEntity[i]);
if (val && config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
@@ -7132,7 +7115,6 @@ function HandleScreensaverUpdate(): void {
val + '~';
}
}
}
if (Debug) console.log('weatherUpdate~' + payloadString);
SendToPanel(<Payload>{ payload: 'weatherUpdate~' + payloadString });

70
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -6341,32 +6341,27 @@ function HandleScreensaverUpdate(): void {
if (config.leftScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.leftScreensaverEntity[i].ScreensaverEntity)
}
RegisterScreensaverEntityWatcher(config.leftScreensaverEntity[i].ScreensaverEntity)
if (checkpoint) {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
if (typeof(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.leftScreensaverEntity[i].ScreensaverEntity).val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
}
if (typeof(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.leftScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
if (val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
if (typeof getState(config.leftScreensaverEntity[i].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.leftScreensaverEntity[i]);
if (!isNaN(Date.parse(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.leftScreensaverEntity[i].ScreensaverEntity).val), config.leftScreensaverEntity[i].ScreensaverEntityDateFormat);
} else {
val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
if (!isNaN(Date.parse(val))) {
val = formatDate(getDateObject(val), config.leftScreensaverEntity[i].ScreensaverEntityDateFormat);
}
}
@@ -6380,9 +6375,6 @@ function HandleScreensaverUpdate(): void {
iconColor + '~' +
config.leftScreensaverEntity[i].ScreensaverEntityText + '~' +
val + '~';
} else {
console.log('Only ' + i+1 + ' leftScreensaverEntities defined');
}
}
if (checkpoint == false) {
for (let j = i; j < 3; j++) {
@@ -6493,15 +6485,14 @@ function HandleScreensaverUpdate(): void {
if (getState(NSPanel_Path + 'Config.Screensaver.alternativeScreensaverLayout').val) {
let val = getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
if (typeof(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val) == 'number') {
val = (getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val * config.bottomScreensaverEntity[4].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[4].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[4].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[4].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[4].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[4].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
}
if (typeof(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
}
if (typeof getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[4]);
if (!isNaN(Date.parse(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.bottomScreensaverEntity[4].ScreensaverEntity).val), config.bottomScreensaverEntity[4].ScreensaverEntityDateFormat);
@@ -6527,31 +6518,27 @@ function HandleScreensaverUpdate(): void {
if (config.bottomScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.bottomScreensaverEntity[i].ScreensaverEntity)
}
if (checkpoint) {
RegisterScreensaverEntityWatcher(config.bottomScreensaverEntity[i].ScreensaverEntity)
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
if (typeof(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
}
if (typeof(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
if (val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.bottomScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
if (typeof getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val == 'string') {
else if (typeof(val) == 'string') {
iconColor = GetScreenSaverEntityColor(config.bottomScreensaverEntity[i]);
if (!isNaN(Date.parse(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val))) {
val = formatDate(getDateObject(getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val), config.bottomScreensaverEntity[i].ScreensaverEntityDateFormat);
} else {
val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
if (!isNaN(Date.parse(val))) {
val = formatDate(getDateObject(val), config.bottomScreensaverEntity[i].ScreensaverEntityDateFormat);
}
}
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconColor)) {
@@ -6567,7 +6554,6 @@ function HandleScreensaverUpdate(): void {
config.bottomScreensaverEntity[i].ScreensaverEntityText + '~' +
val
}
}
if (checkpoint == false) {
for (let j = i; j < maxEntities - 1; j++) {
payloadString += '~~~~~~';
@@ -6582,11 +6568,9 @@ function HandleScreensaverUpdate(): void {
if (config.indicatorScreensaverEntity[i] == null) {
checkpoint = false;
break;
} else {
RegisterScreensaverEntityWatcher(config.indicatorScreensaverEntity[i].ScreensaverEntity)
}
RegisterScreensaverEntityWatcher(config.indicatorScreensaverEntity[i].ScreensaverEntity)
if (checkpoint) {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
@@ -6598,14 +6582,13 @@ function HandleScreensaverUpdate(): void {
icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val) == 'number') {
val = (getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val * config.indicatorScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.indicatorScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.indicatorScreensaverEntity[i].ScreensaverEntityUnitText;
if (typeof(val) == 'number') {
val = (val * config.indicatorScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.indicatorScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.indicatorScreensaverEntity[i].ScreensaverEntityUnitText;
iconColor = GetScreenSaverEntityColor(config.indicatorScreensaverEntity[i]);
}
if (typeof(getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val) == 'boolean') {
val = (getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val);
else if (typeof(val) == 'boolean') {
iconColor = GetScreenSaverEntityColor(config.indicatorScreensaverEntity[i]);
if (val && config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff != null) {
if (!val && config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff != null) {
icon = Icons.GetIcon(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOff)
}
}
@@ -6620,7 +6603,6 @@ function HandleScreensaverUpdate(): void {
val + '~';
}
}
}
if (Debug) console.log('weatherUpdate~' + payloadString);
SendToPanel(<Payload>{ payload: 'weatherUpdate~' + payloadString });