Fixed timezone-related bug in new repeating alarms feature. (#125)

Fixed timezone-related bug in new repeating alarms feature.

Author: kshetline

.idea/jsLibraryMappings.xml

@@ -1,3 +1,7 @@
+## 3.9.2
+
+* Fixed timezone-related bug in new repeating alarms feature.
+
 ## 3.9.1
 
 * I let compatibility with the Raspberry Pi 3B+ lapse. Installation on a Raspberry Pi 3B+ should now work once again.

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,

sass/package-lock.json

@@ -62,6 +62,7 @@ export class AlarmMonitor {
     let next24Hours = NOTHING_PENDING;
 
     this.silencedAlarms = this.silencedAlarms.filter(sa => sa.stoppedAt > nowMinutes - 65);
+    alarmCheckTime += now.utcOffsetSeconds * 1000;
 
     for (let i = alarms.length - 1; i >= 0; --i) {
       const alarm = alarms[i];

sass/package.json

@@ -682,7 +682,11 @@ export class SettingsDialog {
   }
 
   private formatAlarmDate(time: number, repeat?: string): string {
-    time = findRepeatTime(time, repeat, this.appService.getAlarmTime());
+    let alarmCheckTime = this.appService.getAlarmTime();
+    const now = new DateTime(alarmCheckTime, this.appService.timezone);
+
+    alarmCheckTime += now.utcOffsetSeconds * 1000;
+    time = findRepeatTime(time, repeat, alarmCheckTime);
 
     return new DateTime(time * 60000, 'UTC').format('DD MMM yyyy');
   }