FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Update app.js 

Fix (hopefully) time zone issues and boundaries in the event scanner.
pull/986/head
stephenPspackman 2021-12-03 00:11:07 -08:00 committed by GitHub
parent 32980bf3be
commit 633cad5cd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/pooqroman/app.js
View File

@ -305,6 +305,8 @@ const formatDow = new Named(4, [
'Saturday', 'Sat.', 'Sat', 'Sa' 'Saturday', 'Sat.', 'Sat', 'Sa'
]); ]);
const hceil = x => Math.ceil(x / 3600000) * 3600000;
const hfloor = x => Math.floor(x / 3600000) * 3600000;
const isString = x => typeof x == 'string'; const isString = x => typeof x == 'string';
const imageWidth = i => isString(i) ? i.charCodeAt(0) : i.width; const imageWidth = i => isString(i) ? i.charCodeAt(0) : i.width;
const imageHeight = i => isString(i) ? i.charCodeAt(1) : i.height; const imageHeight = i => isString(i) ? i.charCodeAt(1) : i.height;
@ -343,24 +345,24 @@ const events = {
return result; return result;
}, },
span: function(now, width) { span: function(now, from, to, width) {
let o = now.getTimezoneOffset() * 60000; let o = now.getTimezoneOffset() * 60000;
let t = now.getTime() - o; let t = now.getTime() - o;
let lfence = [], rfence = []; let lfence = [], rfence = [];
this.scan(now, now - width, now + width, (e, d, p) => { this.scan(now, from, to, (e, d, p) => {
if (p) { if (p) {
for (let j = 0; j <= e.priority; j++) { for (let j = 0; j <= e.priority; j++) {
if (e.time < (lfence[e.priority] || t)) lfence[e.priority] = e.time; if (d < (lfence[e.priority] || t)) lfence[e.priority] = d;
} }
} else { } else {
for (let j = 0; j <= e.priority; j++) { for (let j = 0; j <= e.priority; j++) {
if (e.time > (rfence[e.priority] || t)) rfence[e.priority] = e.time; if (d > (rfence[e.priority] || t)) rfence[e.priority] = d;
} }
} }
}); });
for (let j = 0; ; j += 0.5) { for (let j = 0; ; j += 0.5) {
if ((rfence[Math.ceil(j)] - lfence[Math.floor(j)] || 0) <= width) { if ((rfence[Math.ceil(j)] - lfence[Math.floor(j)] || 0) <= width) {
return [lfence[Math.floor(j)] || t, rfence[Math.ceil(j)] || t]; return [lfence[Math.floor(j)] || now, rfence[Math.ceil(j)] || now];
} }
} }
}, },
@ -584,11 +586,9 @@ class Roman {
// Hour labels and (purely aesthetic) box; clear inner face. // Hour labels and (purely aesthetic) box; clear inner face.
let keyHour = d.getHours() < 12 ? 1 : 13; let keyHour = d.getHours() < 12 ? 1 : 13;
let alertSpan = events.span(d, 43200000); let alertSpan = events.span(d, hceil(d) - 39600000, hfloor(d) + 39600000, 39600000);
let l = Math.floor(alertSpan[0] / 3600000) % 24; let l = alertSpan[0].getHours(), h = alertSpan[1].getHours();
let h = Math.ceil(alertSpan[1] / 3600000) % 24; if ((l - keyHour + 24) % 24 >= 12 || (h - keyHour + 24) % 24 >= 12) keyHour = l;
if ((l - keyHour + 24) % 24 >= 12) keyHour = l;
else if ((h - keyHour + 24) % 24 >= 12) keyHour = (h + 13) % 24;
if (keyHour !== state.keyHour) { if (keyHour !== state.keyHour) {
state.keyHour = keyHour; state.keyHour = keyHour;
g.setColor(options.bg) g.setColor(options.bg)
@ -616,11 +616,9 @@ class Roman {
} }
// Alerts // Alerts
let b = new Date(d.getTime());
b.setHours(keyHour, 0, 0, 0);
if (b > d) b.setDate(b.getDate() - 1);
let requestedRate = events.scan( let requestedRate = events.scan(
d, b, b + 43200000, (e, t, p) => this.alert(e, t, d, p) d, hfloor(alertSpan[0] + 0), hceil(alertSpan[1] + 0) + 1,
(e, t, p) => this.alert(e, t, d, p)
); );
if (rate > requestedRate) rate = requestedRate; if (rate > requestedRate) rate = requestedRate;