Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

[sleeplogalarm] Correct widget

master
storm64 2022-11-10 23:56:03 +01:00
parent f193e5d9a1
commit 53aaf929ef
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sleeplogalarm/trigger.js
View File

@ -23,7 +23,7 @@ exports = function(now, tNow) {
// filter for active alarms, ...
a => a.on && !a.timer &&
// after now+10s and in alarm range
a.t > tNow && a.t >= settings.from * 36E5 && a.t <= settings.to * 36E5
a.t > tNow && a.t >= settings.from * 36E5 && a.t < settings.to * 36E5
), then) || []).sort((a, b) => a.t > b.t)[0];
}

11
apps/sleeplogalarm/widget.js
View File

@ -50,16 +50,13 @@ if (settings.enabled) {
if (data.prevStatus !== 4 || !(data.status === 3 || data.status === 2)) return;
// get cahed data, now and calculate time of now
var settings = WIDGET.sleeplogalarm;
var settings = WIDGETS.sleeplogalarm;
var now = new Date();
var tNow = (((now.getHours() * 60 + now.getMinutes()) * 60 + now.getSeconds()) * 1000);
// abort if now is outside the possible alarm range
if (tNow + settings.earlier * 6E4 < settings.from * 36E5 ||
tNow + settings.earlier * 6E4 >= settings.to * 36E5) return;
// execute trigger function
require("sleeplogalarm.trigger.js")(now, tNow);
// execute trigger function if now is inside the alarm range
if (tNow + settings.earlier * 6E4 >= settings.from * 36E5 &&
tNow < settings.to * 36E5) require("sleeplogalarm.trigger.js")(now, tNow);
};
}
};