Просмотр исходного кода

Another bug fix fro Overrides...

(cherry picked from commit 339e1bd6e1d5554df54eba5d02fe1b5b718c7d90)
Jon Mårtensson 3 лет назад
Родитель
Сommit
5682d34339

+ 8 - 0
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -203,6 +203,14 @@ final class OpenAPS {
                     saveToCoreData.indefinite = false
                     saveToCoreData.percentage = Double(overridePercentage)
                     try? self.coredataContext.save()
+                } else if overrideArray.first?.indefinite ?? false {
+                    let saveToCoreData = Override(context: self.coredataContext)
+                    saveToCoreData.enabled = true
+                    saveToCoreData.date = Date()
+                    saveToCoreData.duration = 0
+                    saveToCoreData.indefinite = true
+                    saveToCoreData.percentage = Double(overridePercentage)
+                    try? self.coredataContext.save()
                 } else {
                     newDuration = Decimal(Date().distance(to: date.addingTimeInterval(addedMinutes.minutes.timeInterval)).minutes)
                     let saveToCoreData = Override(context: self.coredataContext)

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -216,7 +216,7 @@ extension Home {
                 return nil
             }
             let percentString = "\((fetchedPercent.first?.percentage ?? 100).formatted(.number)) %"
-            let durationString = (tirFormatter.string(from: (fetchedPercent.first?.duration ?? 0) as NSNumber) ?? "") == "0" ?
+            let durationString = (fetchedPercent.first?.indefinite ?? false) ?
                 "" : ", " + (tirFormatter.string(from: (fetchedPercent.first?.duration ?? 0) as NSNumber) ?? "") + " min"
 
             return percentString + durationString