Selaa lähdekoodia

move maxExternal to a single location

Mike Plante 1 vuosi sitten
vanhempi
commit
50a4b28f2c

+ 2 - 1
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -25,6 +25,7 @@ extension Bolus {
         @Published var percentage: Decimal = 0
         @Published var percentage: Decimal = 0
         @Published var threshold: Decimal = 0
         @Published var threshold: Decimal = 0
         @Published var maxBolus: Decimal = 0
         @Published var maxBolus: Decimal = 0
+        var maxExternal: Decimal { maxBolus * 3 }
         @Published var errorString: Decimal = 0
         @Published var errorString: Decimal = 0
         @Published var evBG: Decimal = 0
         @Published var evBG: Decimal = 0
         @Published var insulin: Decimal = 0
         @Published var insulin: Decimal = 0
@@ -350,7 +351,7 @@ extension Bolus {
                 return
                 return
             }
             }
 
 
-            amount = min(amount, maxBolus * 3)
+            amount = min(amount, maxExternal)
 
 
             do {
             do {
                 let authenticated = try await unlockmanager.unlock()
                 let authenticated = try await unlockmanager.unlock()

+ 2 - 6
FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -519,7 +519,7 @@ extension Bolus {
             if pumpBolusLimitExceeded {
             if pumpBolusLimitExceeded {
                 return Text("Max Bolus of \(state.maxBolus) U Exceeded")
                 return Text("Max Bolus of \(state.maxBolus) U Exceeded")
             } else if externalBolusLimitExceeded {
             } else if externalBolusLimitExceeded {
-                return Text("Max External Bolus of \(maxExternal) U Exceeded")
+                return Text("Max External Bolus of \(state.maxExternal) U Exceeded")
             } else if carbLimitExceeded {
             } else if carbLimitExceeded {
                 return Text("Max Carbs of \(state.maxCarbs) g Exceeded")
                 return Text("Max Carbs of \(state.maxCarbs) g Exceeded")
             } else if fatLimitExceeded {
             } else if fatLimitExceeded {
@@ -557,12 +557,8 @@ extension Bolus {
             !state.externalInsulin && state.amount > state.maxBolus
             !state.externalInsulin && state.amount > state.maxBolus
         }
         }
 
 
-        private var maxExternal: Decimal {
-            state.maxBolus * 3
-        }
-
         private var externalBolusLimitExceeded: Bool {
         private var externalBolusLimitExceeded: Bool {
-            state.externalInsulin && state.amount > maxExternal
+            state.externalInsulin && state.amount > state.maxExternal
         }
         }
 
 
         private var carbLimitExceeded: Bool {
         private var carbLimitExceeded: Bool {