New bug fix for TTs...

(cherry picked from commit 59a71cf313063ff66883d68cd6869c8cf8f65ad4)

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -235,7 +235,7 @@ final class OpenAPS {
                 duration = 0
             }
 
-            if temptargetActive || isPercentageEnabled {
+            if temptargetActive /* || isPercentageEnabled */ {
                 var duration_ = 0
                 var hbt = Double(hbt_)
                 var dd = 0.0
@@ -249,25 +249,11 @@ final class OpenAPS {
 
                     if dd > 0.1 {
                         hbt_ = Decimal(hbt)
-                        isPercentageEnabled = false
+                        // isPercentageEnabled = false
                         temptargetActive = true
                     } else {
                         temptargetActive = false
                     }
-                } else if isPercentageEnabled {
-                    duration_ = Int(truncating: sliderArray.first?.duration ?? 0)
-                    hbt = sliderArray.first?.hbt ?? Double(hbt_)
-                    let startDate = sliderArray.first?.date ?? Date()
-                    let durationPlusStart = startDate.addingTimeInterval(duration_.minutes.timeInterval)
-                    dd = durationPlusStart.timeIntervalSinceNow.minutes
-
-                    if dd > 0.1 {
-                        hbt_ = Decimal(hbt)
-                        isPercentageEnabled = true
-                        temptargetActive = false
-                    } else {
-                        isPercentageEnabled = false
-                    }
                 }
             }
 

FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift

@@ -49,12 +49,19 @@ extension AddTempTarget {
                     try? self.coredataContext.save()
                 }
                 saveSettings = true
+            } else {
+                coredataContext.performAndWait {
+                    let saveToCoreData = TempTargets(context: coredataContext)
+                    saveToCoreData.active = false
+                    saveToCoreData.date = Date()
+                    try? coredataContext.save()
+                }
             }
             var highTarget = lowTarget
 
             if units == .mmolL, !viewPercantage {
-                lowTarget = lowTarget.asMgdL
-                highTarget = highTarget.asMgdL
+                lowTarget = Decimal(round(Double(lowTarget.asMgdL)))
+                highTarget = lowTarget
             }
 
             let entry = TempTarget(
@@ -100,8 +107,8 @@ extension AddTempTarget {
             var highTarget = lowTarget
 
             if units == .mmolL, !viewPercantage {
-                lowTarget = lowTarget.asMgdL
-                highTarget = highTarget.asMgdL
+                lowTarget = Decimal(round(Double(lowTarget.asMgdL)))
+                highTarget = lowTarget
             }
 
             let entry = TempTarget(

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -201,10 +201,10 @@ extension Home {
             if sliderTTpresets.first?.active ?? false {
                 let hbt = sliderTTpresets.first?.hbt ?? 0
                 string = ", " + (tirFormatter.string(from: state.infoPanelTTPercentage(hbt, target) as NSNumber) ?? "") + " %"
-            } else if enactedSliderTT.first?.enabled ?? false {
-                let hbt = enactedSliderTT.first?.hbt ?? 0
-                string = ", " + (tirFormatter.string(from: state.infoPanelTTPercentage(hbt, target) as NSNumber) ?? "") + " %"
-            }
+            } /* else if enactedSliderTT.first?.enabled ?? false {
+                 let hbt = enactedSliderTT.first?.hbt ?? 0
+                 string = ", " + (tirFormatter.string(from: state.infoPanelTTPercentage(hbt, target) as NSNumber) ?? "") + " %"
+             } */
 
             let percentString = state
                 .units == .mmolL ? (unitString + " mmol/L" + string) : (rawString + (string == "0" ? "" : string))