[F] Use lastActivate as the base for nextActivate rather than current date
This commit is contained in:
@@ -51,15 +51,13 @@ struct Alarm: Codable
|
|||||||
var oneTime = true
|
var oneTime = true
|
||||||
|
|
||||||
/// When is the last time that the alarm went off
|
/// When is the last time that the alarm went off
|
||||||
var lastActivate: Date? = nil
|
var lastActivate: Date = Date()
|
||||||
|
|
||||||
/// When should the alarm activate next
|
/// When should the alarm activate next since lastActivate?
|
||||||
var nextActivate: Date?
|
var nextActivate: Date?
|
||||||
{
|
{
|
||||||
// Get current date
|
let (y, m, d) = lastActivate.getYMD()
|
||||||
let now = Date()
|
let (nh, nm, _) = lastActivate.getHMS()
|
||||||
let (y, m, d) = now.getYMD()
|
|
||||||
let (nh, nm, _) = now.getHMS()
|
|
||||||
|
|
||||||
// Create activation date
|
// Create activation date
|
||||||
var date = Date.create(y, m, d, hour, minute)
|
var date = Date.create(y, m, d, hour, minute)
|
||||||
|
|||||||
Reference in New Issue
Block a user