christian/openhab-js-automation-old
Archived
1
0
Fork 0
Code Activity

Complete alertDelay and alertRepeat

Browse Source
This commit is contained in:
Christian Weimann
2023-08-15 17:17:21 +02:00
parent 949eb8e9a6
commit 8032e1cd83
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/watch.js
View File

@@ -190,17 +190,25 @@ class Watch {
initialAlertFunc = this.#watchObjects[watchUUID].initialAlertFunc; initialAlertFunc = this.#watchObjects[watchUUID].initialAlertFunc;
} }
let alertDelay = this.#watchObjects[watchUUID].alertDelay;
let alertRepeat = this.#watchObjects[watchUUID].alertRepeat;
let alertDelayAbsolute = 0;
// Set alert state // Set alert state
this.#watchObjects[watchUUID].alert = true; this.#watchObjects[watchUUID].alert = true;
// Execute initial alert function or create timer to run initial alert rule if required // Execute initial alert function or create timer to run initial alert rule if required
if (this.#watchObjects[watchUUID].alertDelay == '') { if (alertDelay == '') {
console.log(`Run initial alert function for watchObject ${watchUUID}`); console.log(`Run initial alert function for watchObject ${watchUUID}`);
initialAlertFunc(); initialAlertFunc();
} else { } else {
console.log(`Run initial alert function for watchObject ${watchUUID} with delay setting ${this.#watchObjects[watchUUID].alertDelay}`); console.log(`Shedule initial alert function for watchObject ${watchUUID} with delay setting ${alertDelay}`);
let alertDelayZDT = time.toZDT(alertDelay);
alertDelayAbsolute = (alertDelayZDT.getMillisFromNow() / 1000);
this.#watchObjects[watchUUID].startAlertTimer = actions.ScriptExecution.createTimer('startAlert ' + watchUUID, this.#watchObjects[watchUUID].startAlertTimer = actions.ScriptExecution.createTimer('startAlert ' + watchUUID,
time.toZDT(this.#watchObjects[watchUUID].alertDelay), alertDelayZDT,
() => { () => {
console.log('Run initial alert function for watchObject ' + watchUUID); console.log('Run initial alert function for watchObject ' + watchUUID);
initialAlertFunc(); initialAlertFunc();
@@ -209,13 +217,14 @@ class Watch {
} }
// Create timer to run repeat alert rule if required // Create timer to run repeat alert rule if required
if (this.#watchObjects[watchUUID].alertRepeat != '') { if (alertRepeat != '') {
console.log(`Shedule repeat alert function for watchObject ${watchUUID} with repeat setting ${alertRepeat}`);
this.#watchObjects[watchUUID].repeatAlertTimer = actions.ScriptExecution.createTimer('repeatAlarm ' + watchUUID, this.#watchObjects[watchUUID].repeatAlertTimer = actions.ScriptExecution.createTimer('repeatAlarm ' + watchUUID,
time.toZDT(this.#watchObjects[watchUUID].alertDelay + this.#watchObjects[watchUUID].alertRepeat), time.toZDT(alertRepeat).plusSeconds(alertDelayAbsolute),
() => { () => {
console.log('Run repeat alert function for watchObject ' + watchUUID); console.log('Run repeat alert function for watchObject ' + watchUUID);
this.#watchObjects[watchUUID].alertFunc(); this.#watchObjects[watchUUID].alertFunc();
this.#watchObjects[watchUUID].repeatAlertTimer.reschedule(time.ZonedDateTime.now().plusSeconds(this.#watchObjects[watchUUID].alertRepeat)); this.#watchObjects[watchUUID].repeatAlertTimer.reschedule(time.toZDT(alertRepeat));
} }
); );