Browse Source

Override and temp target alarm fix

Jonas Björkert 1 year ago
parent
commit
e7bcd9f3fb
1 changed files with 5 additions and 4 deletions
  1. 5 4
      LoopFollow/Task/AlarmTask.swift

+ 5 - 4
LoopFollow/Task/AlarmTask.swift

@@ -15,10 +15,11 @@ extension MainViewController {
 
 
     func alarmTaskAction() {
     func alarmTaskAction() {
         DispatchQueue.main.async {
         DispatchQueue.main.async {
-            let latestOverrideStart = self.overrideGraphData.last?.date
-            let latestOverrideEnd = self.overrideGraphData.last?.endDate
-            let latestTempTargetStart = self.tempTargetGraphData.last?.date
-            let latestTempTargetEnd = self.tempTargetGraphData.last?.endDate
+            let now = Date().timeIntervalSince1970
+            let latestOverrideStart = self.overrideGraphData.last { $0.date <= now }?.date
+            let latestOverrideEnd = self.overrideGraphData.last { $0.endDate <= now }?.endDate
+            let latestTempTargetStart = self.tempTargetGraphData.last { $0.date <= now }?.date
+            let latestTempTargetEnd = self.tempTargetGraphData.last { $0.endDate <= now }?.endDate
             let recBolus = UserDefaultsRepository.deviceRecBolus.value
             let recBolus = UserDefaultsRepository.deviceRecBolus.value
             let COB = self.latestCOB?.value
             let COB = self.latestCOB?.value
             let sensorInsertedAt = UserDefaultsRepository.alertSageInsertTime.value
             let sensorInsertedAt = UserDefaultsRepository.alertSageInsertTime.value