Prechádzať zdrojové kódy

remove target validity check

Robert 1 rok pred
rodič
commit
f8465bb5f1

+ 0 - 19
FreeAPS/Sources/Modules/OverrideConfig/OverrideStateModel.swift

@@ -42,8 +42,6 @@ extension OverrideConfig {
         var currentActiveTempTarget: TempTargetStored?
         var currentActiveTempTarget: TempTargetStored?
         var showOverrideEditSheet = false
         var showOverrideEditSheet = false
         var showTempTargetEditSheet = false
         var showTempTargetEditSheet = false
-        var showInvalidTargetAlert = false
-
         var units: GlucoseUnits = .mgdL
         var units: GlucoseUnits = .mgdL
 
 
         // temp target stuff
         // temp target stuff
@@ -74,11 +72,6 @@ extension OverrideConfig {
         var isHelpSheetPresented: Bool = false
         var isHelpSheetPresented: Bool = false
         var helpSheetDetent = PresentationDetent.large
         var helpSheetDetent = PresentationDetent.large
 
 
-        var alertMessage: String {
-            let target: String = units == .mgdL ? "70-270 mg/dl" : "4-15 mmol/l"
-            return "Please enter a valid target between" + " \(target)."
-        }
-
         private var cancellables = Set<AnyCancellable>()
         private var cancellables = Set<AnyCancellable>()
 
 
         override func subscribe() {
         override func subscribe() {
@@ -166,18 +159,6 @@ extension OverrideConfig {
                 await getCurrentGlucoseTarget()
                 await getCurrentGlucoseTarget()
             }
             }
         }
         }
-
-        func isInputInvalid(target: Decimal) -> Bool {
-            guard target != 0 else { return false }
-
-            if target < 80 || target > 270 // in oref min lowTT = 80!
-            {
-                showInvalidTargetAlert = true
-                return true
-            } else {
-                return false
-            }
-        }
     }
     }
 }
 }
 
 

+ 37 - 41
FreeAPS/Sources/Modules/OverrideConfig/View/EditTempTargetForm.swift

@@ -286,52 +286,48 @@ struct EditTempTargetForm: View {
         HStack {
         HStack {
             Spacer()
             Spacer()
             Button(action: {
             Button(action: {
-                if !state.isInputInvalid(target: target) {
-                    saveChanges()
-
-                    do {
-                        guard let moc = tempTarget.managedObjectContext else { return }
-                        guard moc.hasChanges else { return }
-                        try moc.save()
-
-                        if let currentActiveTempTarget = state.currentActiveTempTarget {
-                            Task {
-                                // TODO: - Creating a Run entry is probably needed for Overrides as well and the reason for "jumping" Overrides?
-                                // Disable previous active Temp Targets
-                                await state.disableAllActiveOverrides(
-                                    except: currentActiveTempTarget.objectID,
-                                    createOverrideRunEntry: false
+                saveChanges()
+                do {
+                    guard let moc = tempTarget.managedObjectContext else { return }
+                    guard moc.hasChanges else { return }
+                    try moc.save()
+
+                    if let currentActiveTempTarget = state.currentActiveTempTarget {
+                        Task {
+                            // TODO: - Creating a Run entry is probably needed for Overrides as well and the reason for "jumping" Overrides?
+                            // Disable previous active Temp Targets
+                            await state.disableAllActiveOverrides(
+                                except: currentActiveTempTarget.objectID,
+                                createOverrideRunEntry: false
+                            )
+
+                            // If the temp target which currently gets edited is enabled, then store it to the Temp Target JSON so that oref uses it
+                            if isEnabled {
+                                let tempTarget = TempTarget(
+                                    name: name,
+                                    createdAt: Date(),
+                                    targetTop: target,
+                                    targetBottom: target,
+                                    duration: duration,
+                                    enteredBy: TempTarget.manual,
+                                    reason: TempTarget.custom,
+                                    isPreset: isPreset ? true : false,
+                                    enabled: isEnabled ? true : false,
+                                    halfBasalTarget: halfBasalTarget
                                 )
                                 )
 
 
-                                // If the temp target which currently gets edited is enabled, then store it to the Temp Target JSON so that oref uses it
-                                if isEnabled {
-                                    let tempTarget = TempTarget(
-                                        name: name,
-                                        createdAt: Date(),
-                                        targetTop: target,
-                                        targetBottom: target,
-                                        duration: duration,
-                                        enteredBy: TempTarget.manual,
-                                        reason: TempTarget.custom,
-                                        isPreset: isPreset ? true : false,
-                                        enabled: isEnabled ? true : false,
-                                        halfBasalTarget: halfBasalTarget
-                                    )
-
-                                    // Store to TempTargetStorage so that oref uses the edited Temp target
-                                    state.saveTempTargetToStorage(tempTargets: [tempTarget])
-                                }
-
-                                // Update view
-                                state.updateLatestTempTargetConfiguration()
+                                // Store to TempTargetStorage so that oref uses the edited Temp target
+                                state.saveTempTargetToStorage(tempTargets: [tempTarget])
                             }
                             }
-                        }
 
 
-                        hasChanges = false
-                        presentationMode.wrappedValue.dismiss()
-                    } catch {
-                        debugPrint("Failed to Edit Temp Target")
+                            // Update view
+                            state.updateLatestTempTargetConfiguration()
+                        }
                     }
                     }
+                    hasChanges = false
+                    presentationMode.wrappedValue.dismiss()
+                } catch {
+                    debugPrint("Failed to Edit Temp Target")
                 }
                 }
             }, label: {
             }, label: {
                 Text("Save")
                 Text("Save")