Jelajahi Sumber

Change upper limit for glucose picker from 270 to 200 due to handling in oref; fixes

polscm32 aka Marvout 1 tahun lalu
induk
melakukan
f8ae0b241f

+ 2 - 0
FreeAPS/Sources/Modules/Adjustments/AdjustmentsStateModel.swift

@@ -737,6 +737,8 @@ extension OverrideConfig.StateModel {
             return
         }
 
+        await setCurrentTempTarget(from: ids)
+
         await MainActor.run {
             do {
                 if let tempTarget = try viewContext.existingObject(with: firstID) as? TempTargetStored {

+ 6 - 3
FreeAPS/Sources/Modules/Adjustments/View/AdjustmentsRootView.swift

@@ -314,6 +314,9 @@ extension OverrideConfig {
             Section {
                 ForEach(state.scheduledTempTargets) { tempTarget in
                     tempTargetView(for: tempTarget)
+                        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                            swipeActions(for: tempTarget)
+                        }
                 }
                 .listRowBackground(Color.chart)
             } header: {
@@ -365,11 +368,11 @@ extension OverrideConfig {
             }
         }
 
-        private func swipeActions(for preset: TempTargetStored) -> some View {
+        private func swipeActions(for tempTarget: TempTargetStored) -> some View {
             Group {
                 Button {
                     Task {
-                        selectedTempTarget = preset
+                        selectedTempTarget = tempTarget
                         isConfirmDeletePresented = true
                     }
                 } label: {
@@ -377,7 +380,7 @@ extension OverrideConfig {
                         .tint(.red)
                 }
                 Button(action: {
-                    selectedTempTarget = preset
+                    selectedTempTarget = tempTarget
                     state.showTempTargetEditSheet = true
                 }, label: {
                     Label("Edit", systemImage: "pencil")

+ 2 - 2
FreeAPS/Sources/Modules/Adjustments/View/TempTargets/AddTempTargetForm.swift

@@ -133,7 +133,7 @@ struct AddTempTargetForm: View {
 
             Section {
                 let settingsProvider = PickerSettingsProvider.shared
-                let glucoseSetting = PickerSetting(value: 0, step: targetStep, min: 80, max: 270, type: .glucose)
+                let glucoseSetting = PickerSetting(value: 0, step: targetStep, min: 80, max: 200, type: .glucose)
                 TargetPicker(
                     label: "Target Glucose",
                     selection: Binding(
@@ -213,7 +213,7 @@ struct AddTempTargetForm: View {
             }
 
             Section {
-                DatePicker("Date", selection: $state.date)
+                DatePicker("Start Time", selection: $state.date)
             }.listRowBackground(Color.chart)
 
             Section {

+ 1 - 1
FreeAPS/Sources/Modules/Adjustments/View/TempTargets/EditTempTargetForm.swift

@@ -133,7 +133,7 @@ struct EditTempTargetForm: View {
             Section {
                 // Picker on the right side
                 let settingsProvider = PickerSettingsProvider.shared
-                let glucoseSetting = PickerSetting(value: 0, step: targetStep, min: 80, max: 270, type: .glucose)
+                let glucoseSetting = PickerSetting(value: 0, step: targetStep, min: 80, max: 200, type: .glucose)
                 TargetPicker(
                     label: "Target Glucose",
                     selection: Binding(