From b2742226ba8de12d0fc6632f46c4f0d02279bc3f Mon Sep 17 00:00:00 2001 From: "Tod E. Kurt" Date: Wed, 2 Sep 2020 22:01:46 -0700 Subject: [PATCH] fix #143, alarms at 12:xx am/pm fire at wrong time --- app/server/timeService.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/server/timeService.js b/app/server/timeService.js index 57d4771..82fcec7 100644 --- a/app/server/timeService.js +++ b/app/server/timeService.js @@ -89,14 +89,15 @@ var TimeService = { var rHour = parseInt(rule.alarmHours); var rMin = parseInt( rule.alarmMinutes ) || 0; var rSec = parseInt( rule.alarmSeconds ) || 0; - var rMode = rule.alarmTimeMode || '24'; + var rMode = rule.alarmTimeMode || '24'; - // convert am/pm to 0-24, am: 1-12 -> 1-12, pm: 1-11,12 -> 13-23,0 - if( rMode === 'am' ) { - rHour = (rHour !== 12) ? rHour : 23; - } else if( rMode === 'pm' ) { - rHour = (rHour !== 12) ? rHour + 12 : 0; - } // else 24 hour mode + // convert am/pm to 0-24, am: 1-12 -> 1-12, pm: 1-11,12 -> 13-23,0 + // convert am/pm to 0-24, am: 1-11,12 -> 1-11,0, pm: 1-11,12 -> 13-23,12 + if( rMode === 'am' ) { + rHour = (rHour !== 12) ? rHour : 0; + } else if( rMode === 'pm' ) { + rHour = (rHour !== 12) ? rHour + 12 : 12; + } // else 24 hour mode if( rule.alarmType === 'hourly' ) { log.msg("TimeService.checkTime: hourly:", rHour,rMin,rSec, " - ", now.getHours(),now.getMinutes(),now.getSeconds());