BG Targets editor

FreeAPS.xcodeproj/project.pbxproj

@@ -84,6 +84,7 @@
 		3811DF1025CAAAE200A708ED /* APSManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3811DF0F25CAAAE200A708ED /* APSManager.swift */; };
 		3821ED4C25DD18BA00BC42AD /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3821ED4B25DD18BA00BC42AD /* Constants.swift */; };
 		382C133725F13A1E00715CE1 /* InsulinSensitivities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382C133625F13A1E00715CE1 /* InsulinSensitivities.swift */; };
+		382C134B25F14E3700715CE1 /* BGTargets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382C134A25F14E3700715CE1 /* BGTargets.swift */; };
 		383948D325CD4D6D00E91849 /* Disk in Frameworks */ = {isa = PBXBuildFile; productRef = 383948D225CD4D6D00E91849 /* Disk */; };
 		383948D625CD4D8900E91849 /* FileStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383948D525CD4D8900E91849 /* FileStorage.swift */; };
 		383948DA25CD64D500E91849 /* Glucose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383948D925CD64D500E91849 /* Glucose.swift */; };
@@ -666,6 +667,7 @@
 		3811DF0F25CAAAE200A708ED /* APSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APSManager.swift; sourceTree = "<group>"; };
 		3821ED4B25DD18BA00BC42AD /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		382C133625F13A1E00715CE1 /* InsulinSensitivities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsulinSensitivities.swift; sourceTree = "<group>"; };
+		382C134A25F14E3700715CE1 /* BGTargets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGTargets.swift; sourceTree = "<group>"; };
 		383948D525CD4D8900E91849 /* FileStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileStorage.swift; sourceTree = "<group>"; };
 		383948D925CD64D500E91849 /* Glucose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Glucose.swift; sourceTree = "<group>"; };
 		384E803325C385E60086DB71 /* JavaScriptWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JavaScriptWorker.swift; sourceTree = "<group>"; };
@@ -1216,12 +1218,14 @@
 				388E5A5F25B6F2310019842D /* Autosens.swift */,
 				388358C725EEF6D200E024B2 /* BasalProfileEntry.swift */,
 				38D0B3B525EBE24900CB6E88 /* Battery.swift */,
+				382C134A25F14E3700715CE1 /* BGTargets.swift */,
 				3870FF4225EC13F40088248F /* BloodGlucose.swift */,
-				38D0B3D825EC07C400CB6E88 /* CarbsEntry.swift */,
 				38A9260425F012D8009E3739 /* CarbRatios.swift */,
+				38D0B3D825EC07C400CB6E88 /* CarbsEntry.swift */,
 				3811DF0125CA9FEA00A708ED /* Credentials.swift */,
 				38AEE73C25F0200C0013F05B /* FreeAPSSettings.swift */,
 				383948D925CD64D500E91849 /* Glucose.swift */,
+				382C133625F13A1E00715CE1 /* InsulinSensitivities.swift */,
 				3895E4C525B9E00D00214B37 /* Preferences.swift */,
 				38A13D3125E28B4B00EAA382 /* PumpHistoryEvent.swift */,
 				3883583325EEB38000E024B2 /* PumpSettings.swift */,
@@ -1230,7 +1234,6 @@
 				38A0364125ED069400FCBB52 /* TempBasal.swift */,
 				3871F39B25ED892B0013ECB5 /* TempTarget.swift */,
 				3811DE8E25C9D80400A708ED /* User.swift */,
-				382C133625F13A1E00715CE1 /* InsulinSensitivities.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -1940,6 +1943,7 @@
 				38C4D33725E9A1A300D30B77 /* DispatchQueue+Extensions.swift in Sources */,
 				3811DE6B25C9D62600A708ED /* OnboardingProvider.swift in Sources */,
 				38B4F3C325E2A20B00E76A18 /* PumpSetupView.swift in Sources */,
+				382C134B25F14E3700715CE1 /* BGTargets.swift in Sources */,
 				38AEE75725F0F18E0013F05B /* CarbsStorage.swift in Sources */,
 				38B4F3CA25E502E200E76A18 /* SwiftNotificationCenter.swift in Sources */,
 				3811DEC225C9D99900A708ED /* SecurityContainer.swift in Sources */,

FreeAPS/Resources/json/defaults/settings/bg_targets.json

@@ -1,14 +1,12 @@
 {
-    "units": "mg/dL",
+    "units": "mmol/L",
     "user_preferred_units": "mmol/L",
     "targets": [
         {
-            "i": 0,
-            "high": 100.0,
+            "low": 5.5,
+            "high": 6.0,
             "start": "00:00:00",
-            "low": 100.0,
-            "offset": 0,
-            "x": 0
+            "offset": 0
         }
     ]
 }

FreeAPS/Sources/Models/BGTargets.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+struct BGTargets: JSON {
+    let units: GlucoseUnits
+    let userPrefferedUnits: GlucoseUnits
+    let targets: [BGTargetEntry]
+}
+
+extension BGTargets {
+    private enum CodingKeys: String, CodingKey {
+        case units
+        case userPrefferedUnits = "user_preferred_units"
+        case targets
+    }
+}
+
+struct BGTargetEntry: JSON {
+    let low: Decimal
+    let high: Decimal
+    let start: String
+    let offset: Int
+}

FreeAPS/Sources/Modules/BasalProfileEditor/BasalProfileEditorDataFlow.swift

@@ -9,9 +9,9 @@ enum BasalProfileEditor {
         var rateIndex = 0
         var timeIndex = 0
 
-        init(rateIndex: Int, selectedIndex: Int) {
+        init(rateIndex: Int, timeIndex: Int) {
             self.rateIndex = rateIndex
-            timeIndex = selectedIndex
+            self.timeIndex = timeIndex
         }
 
         static func == (lhs: Item, rhs: Item) -> Bool {

FreeAPS/Sources/Modules/BasalProfileEditor/BasalProfileEditorViewModel.swift

@@ -19,19 +19,19 @@ extension BasalProfileEditor {
             items = provider.profile.map { value in
                 let timeIndex = timeValues.firstIndex(of: Double(value.minutes * 60)) ?? 0
                 let rateIndex = rateValues.firstIndex(of: Double(value.rate)) ?? 0
-                return Item(rateIndex: rateIndex, selectedIndex: timeIndex)
+                return Item(rateIndex: rateIndex, timeIndex: timeIndex)
             }
         }
 
         func add() {
-            var selected = 0
+            var time = 0
             var rate = 0
             if let last = items.last {
-                selected = last.timeIndex + 1
+                time = last.timeIndex + 1
                 rate = last.rateIndex
             }
 
-            let newItem = Item(rateIndex: rate, selectedIndex: selected)
+            let newItem = Item(rateIndex: rate, timeIndex: time)
 
             items.append(newItem)
         }

FreeAPS/Sources/Modules/CREditor/CREditorDataFlow.swift

@@ -8,9 +8,9 @@ enum CREditor {
         var rateIndex = 0
         var timeIndex = 0
 
-        init(rateIndex: Int, selectedIndex: Int) {
+        init(rateIndex: Int, timeIndex: Int) {
             self.rateIndex = rateIndex
-            timeIndex = selectedIndex
+            self.timeIndex = timeIndex
         }
 
         static func == (lhs: Item, rhs: Item) -> Bool {

FreeAPS/Sources/Modules/CREditor/CREditorProvider.swift

@@ -5,7 +5,7 @@ extension CREditor {
         var profile: CarbRatios {
             (try? storage.retrieve(OpenAPS.Settings.carbRatios, as: CarbRatios.self))
                 ?? CarbRatios(from: OpenAPS.defaults(for: OpenAPS.Settings.carbRatios))
-                ?? CarbRatios(units: .grams, schedule: [CarbRatioEntry(start: "00:00:00", offset: 0, ratio: 10)])
+                ?? CarbRatios(units: .grams, schedule: [])
         }
 
         func saveProfile(_ profile: CarbRatios) {

FreeAPS/Sources/Modules/CREditor/CREditorViewModel.swift

@@ -17,19 +17,19 @@ extension CREditor {
             items = provider.profile.schedule.map { value in
                 let timeIndex = timeValues.firstIndex(of: Double(value.offset * 60)) ?? 0
                 let rateIndex = rateValues.firstIndex(of: Double(value.ratio)) ?? 0
-                return Item(rateIndex: rateIndex, selectedIndex: timeIndex)
+                return Item(rateIndex: rateIndex, timeIndex: timeIndex)
             }
         }
 
         func add() {
-            var selected = 0
+            var time = 0
             var rate = 0
             if let last = items.last {
-                selected = last.timeIndex + 1
+                time = last.timeIndex + 1
                 rate = last.rateIndex
             }
 
-            let newItem = Item(rateIndex: rate, selectedIndex: selected)
+            let newItem = Item(rateIndex: rate, timeIndex: time)
 
             items.append(newItem)
         }

FreeAPS/Sources/Modules/ISFEditor/ISFEditorDataFlow.swift

@@ -8,9 +8,9 @@ enum ISFEditor {
         var rateIndex = 0
         var timeIndex = 0
 
-        init(rateIndex: Int, selectedIndex: Int) {
+        init(rateIndex: Int, timeIndex: Int) {
             self.rateIndex = rateIndex
-            timeIndex = selectedIndex
+            self.timeIndex = timeIndex
         }
 
         static func == (lhs: Item, rhs: Item) -> Bool {

FreeAPS/Sources/Modules/ISFEditor/ISFEditorProvider.swift

@@ -6,7 +6,7 @@ extension ISFEditor {
                 ?? InsulinSensitivities(
                     units: .mmolL,
                     userPrefferedUnits: .mmolL,
-                    sensitivities: [InsulinSensitivityEntry(sensitivity: 3.0, offset: 0, start: "00:00:00")]
+                    sensitivities: []
                 )
         }
 

FreeAPS/Sources/Modules/ISFEditor/ISFEditorViewModel.swift

@@ -29,25 +29,25 @@ extension ISFEditor {
             items = profile.sensitivities.map { value in
                 let timeIndex = timeValues.firstIndex(of: Double(value.offset * 60)) ?? 0
                 let rateIndex = rateValues.firstIndex(of: Double(value.sensitivity)) ?? 0
-                return Item(rateIndex: rateIndex, selectedIndex: timeIndex)
+                return Item(rateIndex: rateIndex, timeIndex: timeIndex)
             }
         }
 
         func add() {
-            var selected = 0
+            var time = 0
             var rate = 0
             if let last = items.last {
-                selected = last.timeIndex + 1
+                time = last.timeIndex + 1
                 rate = last.rateIndex
             }
 
-            let newItem = Item(rateIndex: rate, selectedIndex: selected)
+            let newItem = Item(rateIndex: rate, timeIndex: time)
 
             items.append(newItem)
         }
 
         func save() {
-            let sensitivities = items.enumerated().map { _, item -> InsulinSensitivityEntry in
+            let sensitivities = items.map { item -> InsulinSensitivityEntry in
                 let fotmatter = DateFormatter()
                 fotmatter.timeZone = TimeZone(secondsFromGMT: 0)
                 fotmatter.dateFormat = "HH:mm:ss"

FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -19,11 +19,11 @@ extension Settings {
                 }
 
                 Section(header: Text("Configuration")) {
-                    Text("Pump settings").chevronCell().modal(for: .pumpSettingsEditor, from: self)
-                    Text("Basal settings").chevronCell().modal(for: .basalProfileEditor, from: self)
+                    Text("Pump Settings").chevronCell().modal(for: .pumpSettingsEditor, from: self)
+                    Text("Basal Profile").chevronCell().modal(for: .basalProfileEditor, from: self)
                     Text("Insulin Sensitivities").chevronCell().modal(for: .isfEditor, from: self)
                     Text("Carb Ratios").chevronCell().modal(for: .crEditor, from: self)
-                    Text("Targets").chevronCell().modal(for: .targetsEditor, from: self)
+                    Text("Target Ranges").chevronCell().modal(for: .targetsEditor, from: self)
                     Text("Preferences").chevronCell().modal(for: .preferencesEditor, from: self)
                 }
 
@@ -37,7 +37,8 @@ extension Settings {
                             .modal(for: .configEditor(file: OpenAPS.Monitor.pumpHistory), from: self)
                         Text("Basal profile").chevronCell()
                             .modal(for: .configEditor(file: OpenAPS.Settings.basalProfile), from: self)
-                        Text("BG targets").chevronCell().modal(for: .configEditor(file: OpenAPS.Settings.bgTargets), from: self)
+                        Text("Targets ranges").chevronCell()
+                            .modal(for: .configEditor(file: OpenAPS.Settings.bgTargets), from: self)
                         Text("Carb ratios").chevronCell().modal(for: .configEditor(file: OpenAPS.Settings.carbRatios), from: self)
                         Text("Insulin sensitivities").chevronCell()
                             .modal(for: .configEditor(file: OpenAPS.Settings.insulinSensitivities), from: self)

FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorDataFlow.swift

@@ -1,5 +1,31 @@
+import Foundation
+
 enum TargetsEditor {
     enum Config {}
+
+    class Item: Identifiable, Hashable, Equatable {
+        let id = UUID()
+        var lowIndex = 0
+        var highIndex = 0
+        var timeIndex = 0
+
+        init(lowIndex: Int, highIndex: Int, timeIndex: Int) {
+            self.lowIndex = lowIndex
+            self.highIndex = highIndex
+            self.timeIndex = timeIndex
+        }
+
+        static func == (lhs: Item, rhs: Item) -> Bool {
+            lhs.timeIndex == rhs.timeIndex
+        }
+
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(timeIndex)
+        }
+    }
 }
 
-protocol TargetsEditorProvider: Provider {}
+protocol TargetsEditorProvider: Provider {
+    var profile: BGTargets { get }
+    func saveProfile(_ profile: BGTargets)
+}

FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorProvider.swift

@@ -1,3 +1,13 @@
 extension TargetsEditor {
-    final class Provider: BaseProvider, TargetsEditorProvider {}
+    final class Provider: BaseProvider, TargetsEditorProvider {
+        var profile: BGTargets {
+            (try? storage.retrieve(OpenAPS.Settings.bgTargets, as: BGTargets.self))
+                ?? BGTargets(from: OpenAPS.defaults(for: OpenAPS.Settings.bgTargets))
+                ?? BGTargets(units: .mmolL, userPrefferedUnits: .mmolL, targets: [])
+        }
+
+        func saveProfile(_ profile: BGTargets) {
+            try? storage.save(profile, as: OpenAPS.Settings.bgTargets)
+        }
+    }
 }

FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorViewModel.swift

@@ -2,6 +2,79 @@ import SwiftUI
 
 extension TargetsEditor {
     class ViewModel<Provider>: BaseViewModel<Provider>, ObservableObject where Provider: TargetsEditorProvider {
-        override func subscribe() {}
+        @Injected() var settingsManager: SettingsManager!
+        @Published var items: [Item] = []
+
+        let timeValues = stride(from: 0.0, to: 1.days.timeInterval, by: 30.minutes.timeInterval).map { $0 }
+
+        var rateValues: [Double] {
+            switch units {
+            case .mgdL:
+                return stride(from: 72, to: 180.01, by: 1.0).map { $0 }
+            case .mmolL:
+                return stride(from: 4.0, to: 10.01, by: 0.1).map { $0 }
+            }
+        }
+
+        var canAdd: Bool {
+            guard let lastItem = items.last else { return true }
+            return lastItem.timeIndex < timeValues.count - 1
+        }
+
+        private(set) var units: GlucoseUnits = .mmolL
+
+        override func subscribe() {
+            units = settingsManager.settings.units
+            let profile = provider.profile
+            items = profile.targets.map { value in
+                let timeIndex = timeValues.firstIndex(of: Double(value.offset * 60)) ?? 0
+                let lowIndex = rateValues.firstIndex(of: Double(value.low)) ?? 0
+                let highIndex = rateValues.firstIndex(of: Double(value.high)) ?? 0
+                return Item(lowIndex: lowIndex, highIndex: highIndex, timeIndex: timeIndex)
+            }
+        }
+
+        func add() {
+            var time = 0
+            var low = 0
+            var high = 0
+            if let last = items.last {
+                time = last.timeIndex + 1
+                low = last.lowIndex
+                high = last.highIndex
+            }
+
+            let newItem = Item(lowIndex: low, highIndex: high, timeIndex: time)
+
+            items.append(newItem)
+        }
+
+        func save() {
+            let targets = items.map { item -> BGTargetEntry in
+                let fotmatter = DateFormatter()
+                fotmatter.timeZone = TimeZone(secondsFromGMT: 0)
+                fotmatter.dateFormat = "HH:mm:ss"
+                let date = Date(timeIntervalSince1970: self.timeValues[item.timeIndex])
+                let minutes = Int(date.timeIntervalSince1970 / 60)
+                let low = Decimal(self.rateValues[item.lowIndex])
+                let high = Decimal(self.rateValues[item.highIndex])
+                return BGTargetEntry(low: low, high: high, start: fotmatter.string(from: date), offset: minutes)
+            }
+            let profile = BGTargets(units: units, userPrefferedUnits: units, targets: targets)
+            provider.saveProfile(profile)
+        }
+
+        func validate() {
+            DispatchQueue.main.async {
+                let uniq = Array(Set(self.items))
+                let sorted = uniq.sorted { $0.timeIndex < $1.timeIndex }
+                    .map { item -> Item in
+                        guard item.highIndex < item.lowIndex else { return item }
+                        return Item(lowIndex: item.lowIndex, highIndex: item.lowIndex, timeIndex: item.timeIndex)
+                    }
+                sorted.first?.timeIndex = 0
+                self.items = sorted
+            }
+        }
     }
 }

FreeAPS/Sources/Modules/TargetsEditor/View/TargetsEditorRootView.swift

@@ -3,12 +3,141 @@ import SwiftUI
 extension TargetsEditor {
     struct RootView: BaseView {
         @EnvironmentObject var viewModel: ViewModel<Provider>
+        @State private var editMode = EditMode.inactive
+
+        private var dateFormatter: DateFormatter {
+            let formatter = DateFormatter()
+            formatter.timeZone = TimeZone(secondsFromGMT: 0)
+            formatter.timeStyle = .short
+            return formatter
+        }
+
+        private var rateFormatter: NumberFormatter {
+            let formatter = NumberFormatter()
+            formatter.numberStyle = .decimal
+            return formatter
+        }
 
         var body: some View {
-            Text("TargetsEditor screen")
-                .navigationTitle("TargetsEditor")
-                .navigationBarTitleDisplayMode(.automatic)
-                .navigationBarItems(leading: Button("Close", action: viewModel.hideModal))
+            Form {
+                Section(header: Text("Schedule")) {
+                    list
+                    addButton
+                }
+                Section {
+                    Button { viewModel.save() }
+                    label: {
+                        Text("Save")
+                    }
+                    .disabled(viewModel.items.isEmpty)
+                }
+            }
+            .navigationTitle("Target Ranges")
+            .navigationBarTitleDisplayMode(.automatic)
+            .navigationBarItems(
+                leading: Button("Close", action: viewModel.hideModal),
+                trailing: EditButton()
+            )
+            .environment(\.editMode, $editMode)
+            .onAppear {
+                viewModel.validate()
+            }
+        }
+
+        private func pickers(for index: Int) -> some View {
+            GeometryReader { geometry in
+                VStack {
+                    HStack {
+                        Text("Low target").frame(width: geometry.size.width / 3)
+                        Text("High target").frame(width: geometry.size.width / 3)
+                        Text("Time").frame(width: geometry.size.width / 3)
+                    }
+                    HStack(spacing: 0) {
+                        Picker(selection: $viewModel.items[index].lowIndex, label: EmptyView()) {
+                            ForEach(0 ..< viewModel.rateValues.count, id: \.self) { i in
+                                Text(
+                                    self.rateFormatter
+                                        .string(from: viewModel.rateValues[i] as NSNumber) ?? ""
+                                ).tag(i)
+                            }
+                        }
+                        .frame(maxWidth: geometry.size.width / 3)
+                        .clipped()
+                        Picker(selection: $viewModel.items[index].highIndex, label: EmptyView()) {
+                            ForEach(0 ..< viewModel.rateValues.count, id: \.self) { i in
+                                Text(
+                                    self.rateFormatter
+                                        .string(from: viewModel.rateValues[i] as NSNumber) ?? ""
+                                ).tag(i)
+                            }
+                        }
+                        .frame(maxWidth: geometry.size.width / 3)
+                        .clipped()
+
+                        Picker(selection: $viewModel.items[index].timeIndex, label: EmptyView()) {
+                            ForEach(0 ..< viewModel.timeValues.count, id: \.self) { i in
+                                Text(
+                                    self.dateFormatter
+                                        .string(from: Date(
+                                            timeIntervalSince1970: viewModel
+                                                .timeValues[i]
+                                        ))
+                                ).tag(i)
+                            }
+                        }
+                        .frame(maxWidth: geometry.size.width / 3)
+                        .clipped()
+                    }
+                }
+            }
+        }
+
+        private var list: some View {
+            List {
+                ForEach(viewModel.items.indexed(), id: \.1.id) { index, item in
+                    NavigationLink(destination: pickers(for: index)) {
+                        HStack {
+                            Text(
+                                "\(rateFormatter.string(from: viewModel.rateValues[item.lowIndex] as NSNumber) ?? "0")"
+                            )
+                            Text("–").foregroundColor(.secondary)
+                            Text(
+                                "\(rateFormatter.string(from: viewModel.rateValues[item.highIndex] as NSNumber) ?? "0")"
+                            )
+                            Text("\(viewModel.units.rawValue)").foregroundColor(.secondary)
+                            Spacer()
+                            Text("starts at").foregroundColor(.secondary)
+                            Text(
+                                "\(dateFormatter.string(from: Date(timeIntervalSince1970: viewModel.timeValues[item.timeIndex])))"
+                            )
+                        }
+                    }
+                    .moveDisabled(true)
+                }
+                .onDelete(perform: onDelete)
+            }
+        }
+
+        private var addButton: some View {
+            guard viewModel.canAdd else {
+                return AnyView(EmptyView())
+            }
+
+            switch editMode {
+            case .inactive:
+                return AnyView(Button(action: onAdd) { Text("Add") })
+            default:
+                return AnyView(EmptyView())
+            }
+        }
+
+        func onAdd() {
+            viewModel.add()
+        }
+
+        private func onDelete(offsets: IndexSet) {
+            viewModel.items.remove(atOffsets: offsets)
+            viewModel.validate()
         }
     }
 }