Missed Bolus and No Looping Alert and Snooze Time Fixes

LoopFollow/Controllers/Alarms.swift

@@ -172,7 +172,7 @@ extension MainViewController {
            }
         
         // check for missed bolus - Only checks within 1 hour of carb entry
-        if UserDefaultsRepository.alertMissedBolusActive.value {
+        if UserDefaultsRepository.alertMissedBolusActive.value && !UserDefaultsRepository.alertMissedBolusIsSnoozed.value {
             if carbData.count > 0  {
                 let lastCarb = carbData[carbData.count - 1].value
                 let lastCarbTime = carbData[carbData.count - 1].date
@@ -186,7 +186,7 @@ extension MainViewController {
                         !UserDefaultsRepository.alertMissedBolusLowGramsActive.value {
                         
                         // There is a current carb but no boluses at all
-                        if bolusData.count < 1 && ((now - lastCarbTime) < (60 * 60)) {
+                        if bolusData.count < 1 {
                             AlarmSound.whichAlarm = "Missed Bolus Alert"
                             triggerAlarm(sound: UserDefaultsRepository.alertMissedBolusSound.value, snooozedBGReadingTime: nil)
                             return

LoopFollow/ViewControllers/SnoozeViewController.swift

@@ -135,17 +135,17 @@ class SnoozeViewController: UIViewController {
                        alarms.reloadSnoozeTime(key: "alertCAGESnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertCAGESnooze.value * 60 * 60)))
        } else if AlarmSound.whichAlarm == "Not Looping Alert" {
                        UserDefaultsRepository.alertNotLoopingIsSnoozed.value = true
-                       UserDefaultsRepository.alertNotLoopingSnoozedTime.value = Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertNotLoopingSnooze.value * 60 * 60))
+                       UserDefaultsRepository.alertNotLoopingSnoozedTime.value = Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertNotLoopingSnooze.value * 60))
                        guard let alarms = self.tabBarController!.viewControllers?[1] as? AlarmViewController else { return }
                        alarms.reloadIsSnoozed(key: "alertNotLoopingIsSnoozed", value: true)
-                       alarms.reloadSnoozeTime(key: "alertNotLoopingSnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertNotLoopingSnooze.value * 60 * 60)))
+                       alarms.reloadSnoozeTime(key: "alertNotLoopingSnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertNotLoopingSnooze.value * 60)))
        }
         else if AlarmSound.whichAlarm == "Missed Bolus Alert" {
                         UserDefaultsRepository.alertMissedBolusIsSnoozed.value = true
-                        UserDefaultsRepository.alertMissedBolusSnoozedTime.value = Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertMissedBolusSnooze.value * 60 * 60))
+                        UserDefaultsRepository.alertMissedBolusSnoozedTime.value = Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertMissedBolusSnooze.value * 60))
                         guard let alarms = self.tabBarController!.viewControllers?[1] as? AlarmViewController else { return }
                         alarms.reloadIsSnoozed(key: "alertMissedBolusIsSnoozed", value: true)
-                        alarms.reloadSnoozeTime(key: "alertMissedBolusSnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertMissedBolusSnooze.value * 60 * 60)))
+                        alarms.reloadSnoozeTime(key: "alertMissedBolusSnoozedTime", setNil: false, value: Date().addingTimeInterval(TimeInterval(UserDefaultsRepository.alertMissedBolusSnooze.value * 60)))
         }
     }