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

Refactorying Code for cardAlarm

Browse Source 
Multipanel-Mode
This commit is contained in:
Armilar
2022-09-04 17:45:29 +02:00
committed by GitHub
parent e53f240b7b
commit bc62c86ad0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ioBroker/NsPanelTs.ts
View File

@@ -1059,7 +1059,9 @@ function SendToPanel(val: Payload | Payload[]): void {
on({ id: NSPanel_Alarm_Path + 'Alarm.AlarmState', change: 'ne' }, async (obj) => { on({ id: NSPanel_Alarm_Path + 'Alarm.AlarmState', change: 'ne' }, async (obj) => {
if ((obj.state ? obj.state.val : '') == 'armed' || (obj.state ? obj.state.val : '') == 'disarmed' || (obj.state ? obj.state.val : '') == 'triggered') { if ((obj.state ? obj.state.val : '') == 'armed' || (obj.state ? obj.state.val : '') == 'disarmed' || (obj.state ? obj.state.val : '') == 'triggered') {
if (Debug) console.log(activePage); if (Debug) console.log(activePage);
GeneratePage(activePage); if (NSPanel_Path == getState(NSPanel_Alarm_Path + 'Alarm.PANEL').val) {
GeneratePage(activePage);
}
} }
}); });
@@ -1956,11 +1958,12 @@ function GenerateAlarmPage(page: PageAlarm): Payload[] {
out_msgs.push({ payload: 'pageType~cardAlarm' }); out_msgs.push({ payload: 'pageType~cardAlarm' });
var nsPath = NSPanel_Alarm_Path + 'Alarm.'; var nsPath = NSPanel_Alarm_Path + 'Alarm.';
if (existsState(nsPath + 'AlarmPin') == false || existsState(nsPath + 'AlarmState') == false || existsState(nsPath + 'AlarmType') == false || existsState(nsPath + 'PIN_Failed') == false) { if (existsState(nsPath + 'AlarmPin') == false || existsState(nsPath + 'AlarmState') == false || existsState(nsPath + 'AlarmType') == false || existsState(nsPath + 'PIN_Failed') == false || existsState(nsPath + 'PANEL') == false) {
createState(nsPath + 'AlarmPin', '0000', { type: 'string' }, function () { setState(nsPath + 'AlarmPin', '0000') }); createState(nsPath + 'AlarmPin', '0000', { type: 'string' }, function () { setState(nsPath + 'AlarmPin', '0000') });
createState(nsPath + 'AlarmState', 'disarmed', { type: 'string' }, function () { setState(nsPath + 'AlarmState', 'disarmed') }); createState(nsPath + 'AlarmState', 'disarmed', { type: 'string' }, function () { setState(nsPath + 'AlarmState', 'disarmed') });
createState(nsPath + 'AlarmType', '0', { type: 'string' }, function () { setState(nsPath + 'AlarmType', '0') }); createState(nsPath + 'AlarmType', 'D1', { type: 'string' }, function () { setState(nsPath + 'AlarmType', 'D1') });
createState(nsPath + 'PIN_Failed', 0, { type: 'number' }, function () { setState(nsPath + 'PIN_Failed', 0) }); createState(nsPath + 'PIN_Failed', 0, { type: 'number' }, function () { setState(nsPath + 'PIN_Failed', 0) });
createState(nsPath + 'PANEL', NSPanel_Path, { type: 'string' }, function () { setState(nsPath + 'PANEL', NSPanel_Path) });
} }
if (existsState(nsPath + 'AlarmPin') && existsState(nsPath + 'AlarmState') && existsState(nsPath + 'AlarmType')) { if (existsState(nsPath + 'AlarmPin') && existsState(nsPath + 'AlarmState') && existsState(nsPath + 'AlarmType')) {
@@ -2427,6 +2430,7 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.TYPE', 'A1'); setIfExists(id + '.TYPE', 'A1');
setIfExists(id + '.PIN', words[4]); setIfExists(id + '.PIN', words[4]);
setIfExists(id + '.ACTUAL', 'arming'); setIfExists(id + '.ACTUAL', 'arming');
setIfExists(id + '.PANEL', NSPanel_Path);
} }
setTimeout(function(){ setTimeout(function(){
GeneratePage(activePage); GeneratePage(activePage);
@@ -2437,6 +2441,7 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.TYPE', 'A2'); setIfExists(id + '.TYPE', 'A2');
setIfExists(id + '.PIN', words[4]); setIfExists(id + '.PIN', words[4]);
setIfExists(id + '.ACTUAL', 'arming'); setIfExists(id + '.ACTUAL', 'arming');
setIfExists(id + '.PANEL', NSPanel_Path);
} }
setTimeout(function(){ setTimeout(function(){
GeneratePage(activePage); GeneratePage(activePage);
@@ -2447,6 +2452,7 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.TYPE', 'A3'); setIfExists(id + '.TYPE', 'A3');
setIfExists(id + '.PIN', words[4]); setIfExists(id + '.PIN', words[4]);
setIfExists(id + '.ACTUAL', 'arming'); setIfExists(id + '.ACTUAL', 'arming');
setIfExists(id + '.PANEL', NSPanel_Path);
} }
setTimeout(function(){ setTimeout(function(){
GeneratePage(activePage); GeneratePage(activePage);
@@ -2457,6 +2463,7 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.TYPE', 'A4'); setIfExists(id + '.TYPE', 'A4');
setIfExists(id + '.PIN', words[4]); setIfExists(id + '.PIN', words[4]);
setIfExists(id + '.ACTUAL', 'arming'); setIfExists(id + '.ACTUAL', 'arming');
setIfExists(id + '.PANEL', NSPanel_Path);
} }
setTimeout(function(){ setTimeout(function(){
GeneratePage(activePage); GeneratePage(activePage);
@@ -2472,12 +2479,11 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.TYPE', 'D1'); setIfExists(id + '.TYPE', 'D1');
setIfExists(id + '.ACTUAL', 'pending'); setIfExists(id + '.ACTUAL', 'pending');
setIfExists(id + '.PIN_Failed', 0); setIfExists(id + '.PIN_Failed', 0);
console.log("Zweig 1");
} else { } else {
setIfExists(id + '.PIN_Failed', getState(id + '.PIN_Failed').val + 1); setIfExists(id + '.PIN_Failed', getState(id + '.PIN_Failed').val + 1);
setIfExists(id + '.ACTUAL', 'triggered'); setIfExists(id + '.ACTUAL', 'triggered');
console.log("Zweig 2");
} }
setIfExists(id + '.PANEL', NSPanel_Path);
setTimeout(function(){ setTimeout(function(){
GeneratePage(activePage); GeneratePage(activePage);
},500) },500)