bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2379 from lauzonhomeschool/patch-3 

sched - improve support for date timezone, toLocalISOString
master
Gordon Williams 2022-12-09 17:11:01 +00:00 committed by GitHub
parent 31dadf83a0 e0495a1b85
commit 640fe08d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/sched/ChangeLog
View File

@ -16,3 +16,4 @@
0.13: Ask to delete a timer after stopping it 0.13: Ask to delete a timer after stopping it
0.14: Added clkinfo for alarms and timers 0.14: Added clkinfo for alarms and timers
0.15: Automatic translation of some string in clkinfo 0.15: Automatic translation of some string in clkinfo
0.16: Improve support for date timezone

2
apps/sched/boot.js
View File

@ -13,7 +13,7 @@
&& (a.last != d) // not already fired today && (a.last != d) // not already fired today
&& (a.t + 60000 > currentTime) // is not in the past by >1 minute && (a.t + 60000 > currentTime) // is not in the past by >1 minute
&& (a.dow >> time.getDay() & 1) // is allowed on this day of the week && (a.dow >> time.getDay() & 1) // is allowed on this day of the week
&& (!a.date || a.date == time.toISOString().substr(0, 10)) // is allowed on this date && (!a.date || a.date == time.toLocalISOString().substr(0, 10)) // is allowed on this date
); );
if (active.length) { if (active.length) {
active = active.sort((a,b)=>a.t-b.t); // sort by time active = active.sort((a,b)=>a.t-b.t); // sort by time

4
apps/sched/lib.js
View File

@ -21,7 +21,7 @@ exports.getActiveAlarms = function (alarms, time) {
&& (a.last != time.getDate()) // not already fired today && (a.last != time.getDate()) // not already fired today
&& (a.t < currentTime) && (a.t < currentTime)
&& (a.dow >> time.getDay() & 1) // is allowed on this day of the week && (a.dow >> time.getDay() & 1) // is allowed on this day of the week
&& (!a.date || a.date == time.toISOString().substr(0, 10)) // is allowed on this date && (!a.date || a.date == time.toLocalISOString().substr(0, 10)) // is allowed on this date
) )
.sort((a, b) => a.t - b.t); .sort((a, b) => a.t - b.t);
} }
@ -46,7 +46,7 @@ exports.getTimeToAlarm = function(alarm, time) {
if (!alarm) return undefined; if (!alarm) return undefined;
if (!time) time = new Date(); if (!time) time = new Date();
var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000); var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
var active = alarm.on && (alarm.dow>>((time.getDay()+(alarm.t<currentTime))%7))&1 && (!alarm.date || alarm.date==time.toISOString().substr(0,10)); var active = alarm.on && (alarm.dow>>((time.getDay()+(alarm.t<currentTime))%7))&1 && (!alarm.date || alarm.date==time.toLocalISOString().substr(0,10));
if (!active) return undefined; if (!active) return undefined;
var t = alarm.t-currentTime; var t = alarm.t-currentTime;
if (alarm.last == time.getDate() || t < -60000) t += 86400000; if (alarm.last == time.getDate() || t < -60000) t += 86400000;

2
apps/sched/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "sched", "id": "sched",
"name": "Scheduler", "name": "Scheduler",
"version": "0.15", "version": "0.16",
"description": "Scheduling library for alarms and timers", "description": "Scheduling library for alarms and timers",
"icon": "app.png", "icon": "app.png",
"type": "scheduler", "type": "scheduler",