diff --git a/apps.json b/apps.json index 2362c2e9d..d0f3e95b8 100644 --- a/apps.json +++ b/apps.json @@ -4160,7 +4160,7 @@ "name": "Q Alarm and Timer", "shortName": "Q Alarm", "icon": "app.png", - "version": "0.01", + "version": "0.02", "description": "Alarm and timer app with days of week and 'hard' option.", "tags": "tool,alarm,widget", "supports": ["BANGLEJS", "BANGLEJS2"], diff --git a/apps/qalarm/ChangeLog b/apps/qalarm/ChangeLog index 4022f485c..135e69d23 100644 --- a/apps/qalarm/ChangeLog +++ b/apps/qalarm/ChangeLog @@ -1 +1,2 @@ 0.01: First version! +0.02: Fixed alarms not working and localised days of week. \ No newline at end of file diff --git a/apps/qalarm/app.js b/apps/qalarm/app.js index 4d27739cf..64f601bf6 100644 --- a/apps/qalarm/app.js +++ b/apps/qalarm/app.js @@ -172,21 +172,14 @@ function showDaysMenu(alarmIndex, alarm) { "< Back": () => showEditAlarmMenu(alarmIndex, alarm), }; - [ - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - ].forEach((dayOfWeek, i) => { + for (let i = 0; i < 7; i++) { + let dayOfWeek = require("locale").dow({ getDay: () => i }); menu[dayOfWeek] = { value: alarm.daysOfWeek[i], format: (v) => (v ? "Yes" : "No"), onchange: (v) => (alarm.daysOfWeek[i] = v), }; - }); + } return E.showMenu(menu); } diff --git a/apps/qalarm/qalarm.js b/apps/qalarm/qalarm.js index 38571987e..6b31ba645 100644 --- a/apps/qalarm/qalarm.js +++ b/apps/qalarm/qalarm.js @@ -1,7 +1,5 @@ // This file shows the alarm -print("Starting alarm"); - function formatTime(t) { let hrs = Math.floor(t / 3600000); let mins = Math.round((t / 60000) % 60); @@ -150,8 +148,6 @@ let active = alarms.filter( (alarm.timer || alarm.daysOfWeek[time.getDay()]) ); -print(active); - if (active.length) { showAlarm(active.sort((a, b) => a.t - b.t)[0]); } diff --git a/apps/qalarm/qalarmcheck.js b/apps/qalarm/qalarmcheck.js index de3db68ab..9a3f10d5e 100644 --- a/apps/qalarm/qalarmcheck.js +++ b/apps/qalarm/qalarmcheck.js @@ -29,13 +29,12 @@ let nextAlarms = (require("Storage").readJSON("qalarm.json", 1) || []) .sort((a, b) => a.t - b.t); if (nextAlarms[0]) { - print("Found alarm, scheduling...", nextAlarms[0].t - t); setTimeout(() => { - load("qalarm.js"); eval(require("Storage").read("qalarmcheck.js")); - }, 3600000 * (nextAlarms[0].t - t)); + load("qalarm.js"); + }, nextAlarms[0].t - t); } else { - print("No alarms found. Will re-check at midnight."); + // No alarms found: will re-check at midnight setTimeout(() => { eval(require("Storage").read("qalarmcheck.js")); }, 86400000 - t);