Kaynağa Gözat

Show ISF. Not working right now

Jon Mårtensson 4 yıl önce
ebeveyn
işleme
f94fb5318b

+ 2 - 0
FreeAPS/Sources/Models/Suggestion.swift

@@ -16,6 +16,7 @@ struct Suggestion: JSON, Equatable {
     let temp: TempType?
     let temp: TempType?
     let bg: Decimal?
     let bg: Decimal?
     let reservoir: Decimal?
     let reservoir: Decimal?
+    let isf: Int?
     var timestamp: Date?
     var timestamp: Date?
     var recieved: Bool?
     var recieved: Bool?
 
 
@@ -48,6 +49,7 @@ extension Suggestion {
         case temp
         case temp
         case bg
         case bg
         case reservoir
         case reservoir
+        case isf = "ISF"
         case timestamp
         case timestamp
         case recieved
         case recieved
     }
     }

+ 2 - 0
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -41,6 +41,7 @@ extension Home {
         @Published var errorDate: Date? = nil
         @Published var errorDate: Date? = nil
         @Published var bolusProgress: Decimal?
         @Published var bolusProgress: Decimal?
         @Published var eventualBG: Int?
         @Published var eventualBG: Int?
+        @Published var isf: Int?
         @Published var carbsRequired: Decimal?
         @Published var carbsRequired: Decimal?
         @Published var allowManualTemp = false
         @Published var allowManualTemp = false
         @Published var units: GlucoseUnits = .mmolL
         @Published var units: GlucoseUnits = .mmolL
@@ -246,6 +247,7 @@ extension Home {
             }
             }
 
 
             eventualBG = suggestion.eventualBG
             eventualBG = suggestion.eventualBG
+            isf = suggestion.isf
         }
         }
 
 
         private func setupReservoir() {
         private func setupReservoir() {

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

@@ -8,7 +8,8 @@ extension Home {
 
 
         @StateObject var state = StateModel()
         @StateObject var state = StateModel()
         @State var isStatusPopupPresented = false
         @State var isStatusPopupPresented = false
-
+        @State var currentISF: Int?
+        
         private var numberFormatter: NumberFormatter {
         private var numberFormatter: NumberFormatter {
             let formatter = NumberFormatter()
             let formatter = NumberFormatter()
             formatter.numberStyle = .decimal
             formatter.numberStyle = .decimal
@@ -160,6 +161,18 @@ extension Home {
                             state.cancelBolus()
                             state.cancelBolus()
                         }
                         }
                 }
                 }
+                Spacer()
+                Text(
+                    NSLocalizedString("ISF", comment: "current ISF") + ":"
+                )
+                .font(.system(size: 12))
+                .padding(.leading, 6)
+                .fixedSize()
+                Text(
+                    numberFormatter.string(from: (currentISF ?? 0) as NSNumber) ?? "0"
+                )
+                .font(.system(size: 12, weight: .bold)).foregroundColor(.secondary)
+                .fixedSize()
             }
             }
             .frame(maxWidth: .infinity, maxHeight: 30)
             .frame(maxWidth: .infinity, maxHeight: 30)
         }
         }