Browse Source

Show calculated ISF

Ivan Valkou 5 years ago
parent
commit
e47bd29f81

+ 1 - 1
FreeAPS/Sources/Models/Autosens.swift

@@ -2,6 +2,6 @@ import Foundation
 
 struct Autosens: JSON {
     let ratio: Decimal
-    let newISF: Decimal?
+    let newisf: Decimal?
     var timestamp: Date?
 }

+ 1 - 1
FreeAPS/Sources/Modules/ISFEditor/ISFEditorProvider.swift

@@ -17,7 +17,7 @@ extension ISFEditor {
         var autosense: Autosens {
             (try? storage.retrieve(OpenAPS.Settings.autosense, as: Autosens.self))
                 ?? Autosens(from: OpenAPS.defaults(for: OpenAPS.Settings.autosense))
-                ?? Autosens(ratio: 1, newISF: nil, timestamp: nil)
+                ?? Autosens(ratio: 1, newisf: nil, timestamp: nil)
         }
     }
 }

+ 1 - 1
FreeAPS/Sources/Modules/ISFEditor/ISFEditorViewModel.swift

@@ -33,7 +33,7 @@ extension ISFEditor {
                 return Item(rateIndex: rateIndex, timeIndex: timeIndex)
             }
 
-            if let newISF = provider.autosense.newISF, provider.autosense.ratio != 1 {
+            if let newISF = provider.autosense.newisf, provider.autosense.ratio != 1 {
                 switch units {
                 case .mgdL:
                     autosensISF = Double(newISF)

+ 2 - 2
FreeAPS/Sources/Modules/ISFEditor/View/ISFEditorRootView.swift

@@ -24,9 +24,9 @@ extension ISFEditor {
                 if let newISF = viewModel.autosensISF {
                     Section(header: Text("Autosens")) {
                         HStack {
-                            Text("New ISF")
+                            Text("Calculated ISF").foregroundColor(.secondary)
                             Spacer()
-                            Text(rateFormatter.string(from: newISF as NSNumber) ?? "0" + " \(viewModel.units)/U")
+                            Text((rateFormatter.string(from: newISF as NSNumber) ?? "0") + " \(viewModel.units.rawValue)/U")
                         }
                     }
                 }