Jon Mårtensson 4 лет назад
Родитель
Сommit
f0a17222f4

+ 7 - 7
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -8,8 +8,8 @@ extension Bolus {
         @Injected() var broadcaster: Broadcaster!
         @Injected() var broadcaster: Broadcaster!
         @Injected() var pumpHistotyStorage: PumpHistoryStorage!
         @Injected() var pumpHistotyStorage: PumpHistoryStorage!
         @Published var amount: Decimal = 0
         @Published var amount: Decimal = 0
-        @Published var inslinRecommended: Decimal = 0
-        @Published var inslinRequired: Decimal = 0
+        @Published var insulinRecommended: Decimal = 0
+        @Published var insulinRequired: Decimal = 0
         @Published var waitForSuggestion: Bool = false
         @Published var waitForSuggestion: Bool = false
         var waitForSuggestionInitial: Bool = false
         var waitForSuggestionInitial: Bool = false
 
 
@@ -24,8 +24,8 @@ extension Bolus {
                         guard let self = self else { return }
                         guard let self = self else { return }
                         if !ok {
                         if !ok {
                             self.waitForSuggestion = false
                             self.waitForSuggestion = false
-                            self.inslinRequired = 0
-                            self.inslinRecommended = 0
+                            self.insulinRequired = 0
+                            self.insulinRecommended = 0
                         }
                         }
                     }.store(in: &lifetime)
                     }.store(in: &lifetime)
             }
             }
@@ -74,9 +74,9 @@ extension Bolus {
 
 
         func setupInsulinRequired() {
         func setupInsulinRequired() {
             DispatchQueue.main.async {
             DispatchQueue.main.async {
-                self.inslinRequired = self.provider.suggestion?.insulinReq ?? 0
-                self.inslinRecommended = self.apsManager
-                    .roundBolus(amount: max(self.inslinRequired * self.settingsManager.settings.insulinReqFraction, 0))
+                self.insulinRequired = self.provider.suggestion?.insulinReq ?? 0
+                self.insulinRecommended = self.apsManager
+                    .roundBolus(amount: max(self.insulinRequired * self.settingsManager.settings.insulinReqFraction, 0))
             }
             }
         }
         }
     }
     }

+ 3 - 3
FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -30,7 +30,7 @@ extension Bolus {
                             Spacer()
                             Spacer()
                             Text(
                             Text(
                                 formatter
                                 formatter
-                                    .string(from: state.inslinRequired as NSNumber)! +
+                                    .string(from: state.insulinRequired as NSNumber)! +
                                     NSLocalizedString(" U", comment: "Insulin unit")
                                     NSLocalizedString(" U", comment: "Insulin unit")
                             ).foregroundColor(.secondary)
                             ).foregroundColor(.secondary)
                         }.contentShape(Rectangle())
                         }.contentShape(Rectangle())
@@ -43,12 +43,12 @@ extension Bolus {
                             Spacer()
                             Spacer()
                             Text(
                             Text(
                                 formatter
                                 formatter
-                                    .string(from: state.inslinRecommended as NSNumber)! +
+                                    .string(from: state.insulinRecommended as NSNumber)! +
                                     NSLocalizedString(" U", comment: "Insulin unit")
                                     NSLocalizedString(" U", comment: "Insulin unit")
                             ).foregroundColor(.secondary)
                             ).foregroundColor(.secondary)
                         }.contentShape(Rectangle())
                         }.contentShape(Rectangle())
                             .onTapGesture {
                             .onTapGesture {
-                                state.amount = state.inslinRecommended
+                                state.amount = state.insulinRecommended
                             }
                             }
                     }
                     }
                 }
                 }

+ 2 - 2
FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -58,9 +58,9 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
             self.state.maxBolus = self.settingsManager.pumpSettings.maxBolus
             self.state.maxBolus = self.settingsManager.pumpSettings.maxBolus
             self.state.carbsRequired = self.suggestion?.carbsReq
             self.state.carbsRequired = self.suggestion?.carbsReq
 
 
-            let inslinRequired = self.suggestion?.insulinReq ?? 0
+            let insulinRequired = self.suggestion?.insulinReq ?? 0
             self.state.bolusRecommended = self.apsManager
             self.state.bolusRecommended = self.apsManager
-                .roundBolus(amount: max(inslinRequired * self.settingsManager.settings.insulinReqFraction, 0))
+                .roundBolus(amount: max(insulinRequired * self.settingsManager.settings.insulinReqFraction, 0))
 
 
             self.state.iob = self.suggestion?.iob
             self.state.iob = self.suggestion?.iob
             self.state.cob = self.suggestion?.cob
             self.state.cob = self.suggestion?.cob