|
|
@@ -1,5 +1,4 @@
|
|
|
import CoreData
|
|
|
-import Foundation
|
|
|
import SwiftUI
|
|
|
import Swinject
|
|
|
|
|
|
@@ -63,7 +62,6 @@ extension OverrideProfilesConfig {
|
|
|
return formatter
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
var body: some View {
|
|
|
VStack {
|
|
|
Picker("Tab", selection: $state.selectedTab) {
|
|
|
@@ -72,21 +70,6 @@ extension OverrideProfilesConfig {
|
|
|
}
|
|
|
}
|
|
|
.pickerStyle(.segmented).padding(.horizontal, 10)
|
|
|
-=======
|
|
|
- var presetPopover: some View {
|
|
|
- Form {
|
|
|
- nameSection(header: "Enter a name")
|
|
|
- settingsSection(header: "Settings to save")
|
|
|
- Section {
|
|
|
- Button("Save") {
|
|
|
- state.savePreset()
|
|
|
- isSheetPresented = false
|
|
|
- }
|
|
|
- .disabled(
|
|
|
- state.profileName.isEmpty || fetchedProfiles
|
|
|
- .contains(where: { $0.name == state.profileName })
|
|
|
- )
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
|
|
|
Form {
|
|
|
switch state.selectedTab {
|
|
|
@@ -113,7 +96,6 @@ extension OverrideProfilesConfig {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
.sheet(isPresented: $state.showOverrideEditSheet, onDismiss: {
|
|
|
Task {
|
|
|
await state.resetStateVariables()
|
|
|
@@ -189,14 +171,10 @@ extension OverrideProfilesConfig {
|
|
|
HStack {
|
|
|
Image(systemName: "hand.draw.fill")
|
|
|
Text("Swipe left to edit or delete an override preset. Hold, drag and drop to reorder a preset.")
|
|
|
-=======
|
|
|
- .tint(.red)
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
private var currentActiveOverride: some View {
|
|
|
Section {
|
|
|
HStack {
|
|
|
@@ -278,238 +256,6 @@ extension OverrideProfilesConfig {
|
|
|
Spacer()
|
|
|
Divider()
|
|
|
Text(
|
|
|
-=======
|
|
|
- var editPresetPopover: some View {
|
|
|
- Form {
|
|
|
- nameSection(header: "Change name?")
|
|
|
- settingsConfig(header: "Change settings")
|
|
|
- Section {
|
|
|
- Button("Save") {
|
|
|
- guard let selectedPreset = selectedPreset else { return }
|
|
|
- state.updatePreset(selectedPreset)
|
|
|
- isEditSheetPresented = false
|
|
|
- }
|
|
|
- .disabled(!hasChanges())
|
|
|
-
|
|
|
- Button("Cancel") {
|
|
|
- isEditSheetPresented = false
|
|
|
- }
|
|
|
- .tint(.red)
|
|
|
- }
|
|
|
- }
|
|
|
- .onAppear {
|
|
|
- if let preset = selectedPreset {
|
|
|
- originalPreset = preset
|
|
|
- state.populateSettings(from: preset)
|
|
|
- }
|
|
|
- }
|
|
|
- .onDisappear {
|
|
|
- state.savedSettings()
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @ViewBuilder private func nameSection(header: String) -> some View {
|
|
|
- Section {
|
|
|
- TextField("Profile override name", text: $state.profileName)
|
|
|
- } header: {
|
|
|
- Text(header)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @ViewBuilder private func settingsConfig(header: String) -> some View {
|
|
|
- Section {
|
|
|
- VStack {
|
|
|
- Spacer()
|
|
|
- Text("\(state.percentage.formatted(.number)) %")
|
|
|
- .foregroundColor(
|
|
|
- state
|
|
|
- .percentage >= 130 ? .red :
|
|
|
- (isEditing ? .orange : .blue)
|
|
|
- )
|
|
|
- .font(.largeTitle)
|
|
|
- Slider(
|
|
|
- value: $state.percentage,
|
|
|
- in: 10 ... 200,
|
|
|
- step: 1,
|
|
|
- onEditingChanged: { editing in
|
|
|
- isEditing = editing
|
|
|
- }
|
|
|
- ).accentColor(state.percentage >= 130 ? .red : .blue)
|
|
|
- Spacer()
|
|
|
- Toggle(isOn: $state._indefinite) {
|
|
|
- Text("Enable indefinitely")
|
|
|
- }
|
|
|
- }
|
|
|
- if !state._indefinite {
|
|
|
- HStack {
|
|
|
- Text("Duration")
|
|
|
- TextFieldWithToolBar(text: $state.duration, placeholder: "0", numberFormatter: formatter)
|
|
|
- Text("minutes").foregroundColor(.secondary)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.override_target) {
|
|
|
- Text("Override Profile Target")
|
|
|
- }
|
|
|
- }
|
|
|
- if state.override_target {
|
|
|
- HStack {
|
|
|
- Text("Target Glucose")
|
|
|
- TextFieldWithToolBar(text: $state.target, placeholder: "0", numberFormatter: glucoseFormatter)
|
|
|
- Text(state.units.rawValue).foregroundColor(.secondary)
|
|
|
- }
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.advancedSettings) {
|
|
|
- Text("More options")
|
|
|
- }
|
|
|
- }
|
|
|
- if state.advancedSettings {
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.smbIsOff) {
|
|
|
- Text("Always Disable SMBs")
|
|
|
- }
|
|
|
- }
|
|
|
- if !state.smbIsOff {
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.smbIsScheduledOff) {
|
|
|
- Text("Schedule when SMBs are Off")
|
|
|
- }
|
|
|
- }
|
|
|
- if state.smbIsScheduledOff {
|
|
|
- HStack {
|
|
|
- Text("First Hour SMBs are Off (24 hours)")
|
|
|
- TextFieldWithToolBar(text: $state.start, placeholder: "0", numberFormatter: formatter)
|
|
|
- Text("hour").foregroundColor(.secondary)
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Text("First Hour SMBs are Resumed (24 hours)")
|
|
|
- TextFieldWithToolBar(text: $state.end, placeholder: "0", numberFormatter: formatter)
|
|
|
- Text("hour").foregroundColor(.secondary)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.isfAndCr) {
|
|
|
- Text("Change ISF and CR")
|
|
|
- }
|
|
|
- }
|
|
|
- if !state.isfAndCr {
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.isf) {
|
|
|
- Text("Change ISF")
|
|
|
- }
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Toggle(isOn: $state.cr) {
|
|
|
- Text("Change CR")
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Text("SMB Minutes")
|
|
|
- TextFieldWithToolBar(text: $state.smbMinutes, placeholder: "0", numberFormatter: formatter)
|
|
|
- Text("minutes").foregroundColor(.secondary)
|
|
|
- }
|
|
|
- HStack {
|
|
|
- Text("UAM SMB Minutes")
|
|
|
- TextFieldWithToolBar(text: $state.uamMinutes, placeholder: "0", numberFormatter: formatter)
|
|
|
- Text("minutes").foregroundColor(.secondary)
|
|
|
- }
|
|
|
- }
|
|
|
- } header: {
|
|
|
- Text(header)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @ViewBuilder private func settingsSection(header: String) -> some View {
|
|
|
- Section(header: Text(header)) {
|
|
|
- let percentString = Text("Override: \(Int(state.percentage))%")
|
|
|
- let targetString = state
|
|
|
- .target != 0 ? Text("Target: \(state.target.formatted()) \(state.units.rawValue)") : Text("")
|
|
|
- let durationString = state
|
|
|
- ._indefinite ? Text("Duration: Indefinite") : Text("Duration: \(state.duration.formatted()) minutes")
|
|
|
- let isfString = state.isf ? Text("Change ISF") : Text("")
|
|
|
- let crString = state.cr ? Text("Change CR") : Text("")
|
|
|
- let smbString = state.smbIsOff ? Text("Disable SMB") : Text("")
|
|
|
- let scheduledSMBString = state.smbIsScheduledOff ? Text("SMB Schedule On") : Text("")
|
|
|
- let maxMinutesSMBString = state
|
|
|
- .smbMinutes != 0 ? Text("\(state.smbMinutes.formatted()) SMB Basal minutes") : Text("")
|
|
|
- let maxMinutesUAMString = state
|
|
|
- .uamMinutes != 0 ? Text("\(state.uamMinutes.formatted()) UAM Basal minutes") : Text("")
|
|
|
-
|
|
|
- VStack(alignment: .leading, spacing: 2) {
|
|
|
- percentString
|
|
|
- if targetString != Text("") { targetString }
|
|
|
- if durationString != Text("") { durationString }
|
|
|
- if isfString != Text("") { isfString }
|
|
|
- if crString != Text("") { crString }
|
|
|
- if smbString != Text("") { smbString }
|
|
|
- if scheduledSMBString != Text("") { scheduledSMBString }
|
|
|
- if maxMinutesSMBString != Text("") { maxMinutesSMBString }
|
|
|
- if maxMinutesUAMString != Text("") { maxMinutesUAMString }
|
|
|
- }
|
|
|
- .foregroundColor(.secondary)
|
|
|
- .font(.caption)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- var body: some View {
|
|
|
- Form {
|
|
|
- if state.presets.isNotEmpty {
|
|
|
- Section {
|
|
|
- ForEach(fetchedProfiles.indices, id: \.self) { index in
|
|
|
- let preset = fetchedProfiles[index]
|
|
|
- profilesView(for: preset)
|
|
|
- .swipeActions {
|
|
|
- Button(role: .none) {
|
|
|
- indexToDelete = index
|
|
|
- profileNameToDelete = preset.name ?? "this profile"
|
|
|
- showDeleteAlert = true
|
|
|
- } label: {
|
|
|
- Label("Delete", systemImage: "trash")
|
|
|
- }.tint(.red)
|
|
|
-
|
|
|
- Button {
|
|
|
- selectedPreset = preset
|
|
|
- state.profileName = preset.name ?? ""
|
|
|
- isEditSheetPresented = true
|
|
|
- } label: {
|
|
|
- Label("Edit", systemImage: "square.and.pencil")
|
|
|
- }.tint(.blue)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- header: { Text("Activate profile override") }
|
|
|
- footer: { VStack(alignment: .leading) {
|
|
|
- Text("Swipe left on a profile to edit or delete it.")
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- settingsConfig(header: "Insulin")
|
|
|
- Section {
|
|
|
- HStack {
|
|
|
- Button("Start new Profile") {
|
|
|
- showAlert.toggle()
|
|
|
- alertSring = "\(state.percentage.formatted(.number)) %, " +
|
|
|
- (
|
|
|
- state.duration > 0 || !state
|
|
|
- ._indefinite ?
|
|
|
- (
|
|
|
- state
|
|
|
- .duration
|
|
|
- .formatted(.number.grouping(.never).rounded().precision(.fractionLength(0))) +
|
|
|
- " min."
|
|
|
- ) :
|
|
|
- NSLocalizedString(" infinite duration.", comment: "")
|
|
|
- ) +
|
|
|
- (
|
|
|
- (state.target == 0 || !state.override_target) ? "" :
|
|
|
- (" Target: " + state.target.formatted() + " " + state.units.rawValue + ".")
|
|
|
- )
|
|
|
- +
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
(
|
|
|
state
|
|
|
.units == .mmolL ?
|
|
|
@@ -527,7 +273,6 @@ extension OverrideProfilesConfig {
|
|
|
step: 1
|
|
|
).accentColor(.green)
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
}
|
|
|
}.listRowBackground(Color.chart)
|
|
|
} else {
|
|
|
@@ -556,38 +301,10 @@ extension OverrideProfilesConfig {
|
|
|
Button { isPromptPresented = true }
|
|
|
label: { Text("Save as preset") }
|
|
|
.disabled(state.durationTT == 0)
|
|
|
-=======
|
|
|
- .disabled(unChanged())
|
|
|
- .buttonStyle(BorderlessButtonStyle())
|
|
|
- .font(.callout)
|
|
|
- .controlSize(.mini)
|
|
|
- .alert(
|
|
|
- "Start Profile",
|
|
|
- isPresented: $showAlert,
|
|
|
- actions: {
|
|
|
- Button("Cancel", role: .cancel) { state.isEnabled = false }
|
|
|
- Button("Start Profile", role: .destructive) {
|
|
|
- if state._indefinite { state.duration = 0 }
|
|
|
- state.isEnabled.toggle()
|
|
|
- state.saveSettings()
|
|
|
- dismiss()
|
|
|
- }
|
|
|
- },
|
|
|
- message: {
|
|
|
- Text(alertSring)
|
|
|
- }
|
|
|
- )
|
|
|
- Button {
|
|
|
- isSheetPresented = true
|
|
|
- }
|
|
|
- label: { Text("Save as Profile") }
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
.tint(.orange)
|
|
|
.frame(maxWidth: .infinity, alignment: .trailing)
|
|
|
.buttonStyle(BorderlessButtonStyle())
|
|
|
- .font(.callout)
|
|
|
.controlSize(.mini)
|
|
|
-<<<<<<< HEAD
|
|
|
}
|
|
|
}.listRowBackground(Color.chart)
|
|
|
}
|
|
|
@@ -618,19 +335,6 @@ extension OverrideProfilesConfig {
|
|
|
}
|
|
|
}.listRowBackground(Color.chart)
|
|
|
}
|
|
|
-=======
|
|
|
- .disabled(unChanged())
|
|
|
- }
|
|
|
- .sheet(isPresented: $isSheetPresented) {
|
|
|
- presetPopover
|
|
|
- }
|
|
|
- }
|
|
|
- footer: {
|
|
|
- Text(
|
|
|
- "Your profile basal insulin will be adjusted with the override percentage and your profile ISF and CR will be inversly adjusted with the percentage."
|
|
|
- )
|
|
|
- }
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
|
|
|
Section {
|
|
|
Button { state.cancel() }
|
|
|
@@ -665,7 +369,6 @@ extension OverrideProfilesConfig {
|
|
|
configureView()
|
|
|
state.hbt = isEnabledArray.first?.hbt ?? 160
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
}
|
|
|
|
|
|
private func presetView(for preset: TempTarget) -> some View {
|
|
|
@@ -787,54 +490,6 @@ extension OverrideProfilesConfig {
|
|
|
Text(isfAndCRstring)
|
|
|
}
|
|
|
Spacer()
|
|
|
-=======
|
|
|
- .onAppear(perform: configureView)
|
|
|
- .onAppear { state.savedSettings() }
|
|
|
- .navigationBarTitle("Profiles")
|
|
|
- .navigationBarTitleDisplayMode(.automatic)
|
|
|
- .navigationBarItems(leading: Button("Close", action: state.hideModal))
|
|
|
- .sheet(isPresented: $isEditSheetPresented) {
|
|
|
- editPresetPopover
|
|
|
- .padding()
|
|
|
- }
|
|
|
- .alert(isPresented: $showDeleteAlert) {
|
|
|
- Alert(
|
|
|
- title: Text("Delete profile override"),
|
|
|
- message: Text("Are you sure you want to delete\n\(profileNameToDelete)?"),
|
|
|
- primaryButton: .destructive(Text("Delete")) {
|
|
|
- if let index = indexToDelete {
|
|
|
- removeProfile(at: IndexSet(integer: index))
|
|
|
- }
|
|
|
- },
|
|
|
- secondaryButton: .cancel()
|
|
|
- )
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @ViewBuilder private func profilesView(for preset: OverridePresets) -> some View {
|
|
|
- let data = state.profileViewData(for: preset)
|
|
|
-
|
|
|
- if data.name != "" {
|
|
|
- HStack {
|
|
|
- VStack {
|
|
|
- HStack {
|
|
|
- Text(data.name)
|
|
|
- Spacer()
|
|
|
- }
|
|
|
- HStack(spacing: 5) {
|
|
|
- Text(data.percent.formatted(.percent.grouping(.never).rounded().precision(.fractionLength(0))))
|
|
|
- if data.targetString != "" {
|
|
|
- Text(data.targetString)
|
|
|
- Text(data.targetString != "" ? state.units.rawValue : "")
|
|
|
- }
|
|
|
- if data.durationString != "" { Text(data.durationString + (data.perpetual ? "" : "min")) }
|
|
|
- if data.smbString != "" { Text(data.smbString).foregroundColor(.secondary).font(.caption) }
|
|
|
- if data.scheduledSMBString != "" { Text(data.scheduledSMBString) }
|
|
|
- if preset.advancedSettings {
|
|
|
- Text(data.maxMinutesSMB == 0 ? "" : data.maxMinutesSMB.formatted() + " SMB")
|
|
|
- Text(data.maxMinutesUAM == 0 ? "" : data.maxMinutesUAM.formatted() + " UAM")
|
|
|
- Text(data.isfAndCRString)
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
}
|
|
|
.padding(.top, 2)
|
|
|
.foregroundColor(.secondary)
|
|
|
@@ -849,7 +504,6 @@ extension OverrideProfilesConfig {
|
|
|
showCheckmark.toggle()
|
|
|
selectedPresetID = preset.id
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
// deactivate showCheckmark after 3 seconds
|
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
|
|
|
showCheckmark = false
|
|
|
@@ -869,60 +523,6 @@ extension OverrideProfilesConfig {
|
|
|
.foregroundStyle(.secondary)
|
|
|
}
|
|
|
})
|
|
|
-=======
|
|
|
- private func unChanged() -> Bool {
|
|
|
- let defaultProfile = state.percentage == 100 && !state.override_target && !state.advancedSettings
|
|
|
- let noDurationSpecified = !state._indefinite && state.duration == 0
|
|
|
- let targetZeroWithOverride = state.override_target && state.target == 0
|
|
|
- let allSettingsDefault = state.percentage == 100 && !state.override_target && !state.smbIsOff && !state
|
|
|
- .smbIsScheduledOff && state.smbMinutes == state.defaultSmbMinutes && state.uamMinutes == state.defaultUamMinutes
|
|
|
-
|
|
|
- return defaultProfile || noDurationSpecified || targetZeroWithOverride || allSettingsDefault
|
|
|
- }
|
|
|
-
|
|
|
- private func hasChanges() -> Bool {
|
|
|
- guard let originalPreset = originalPreset else { return false }
|
|
|
-
|
|
|
- let targetInStateUnits: Decimal
|
|
|
- let targetInPresetUnits: Decimal
|
|
|
-
|
|
|
- if state.units == .mmolL {
|
|
|
- targetInStateUnits = state.target
|
|
|
- targetInPresetUnits = (originalPreset.target as NSDecimalNumber?)?.decimalValue.asMmolL ?? 0
|
|
|
- } else {
|
|
|
- targetInStateUnits = state.target
|
|
|
- targetInPresetUnits = (originalPreset.target as NSDecimalNumber?)?.decimalValue ?? 0
|
|
|
- }
|
|
|
-
|
|
|
- let hasChanges = state.profileName != originalPreset.name ||
|
|
|
- state.percentage != originalPreset.percentage ||
|
|
|
- state.duration != (originalPreset.duration ?? 0) as Decimal ||
|
|
|
- state._indefinite != originalPreset.indefinite ||
|
|
|
- state.override_target != (originalPreset.target != nil) ||
|
|
|
- (state.override_target && targetInStateUnits != targetInPresetUnits) ||
|
|
|
- state.smbIsOff != originalPreset.smbIsOff ||
|
|
|
- state.smbIsScheduledOff != originalPreset.smbIsScheduledOff ||
|
|
|
- state.isf != originalPreset.isf ||
|
|
|
- state.cr != originalPreset.cr ||
|
|
|
- state.smbMinutes != (originalPreset.smbMinutes ?? 0) as Decimal ||
|
|
|
- state.uamMinutes != (originalPreset.uamMinutes ?? 0) as Decimal ||
|
|
|
- state.isfAndCr != originalPreset.isfAndCr ||
|
|
|
- state.start != (originalPreset.start ?? 0) as Decimal ||
|
|
|
- state.end != (originalPreset.end ?? 0) as Decimal
|
|
|
-
|
|
|
- return hasChanges
|
|
|
- }
|
|
|
-
|
|
|
- private func removeProfile(at offsets: IndexSet) {
|
|
|
- for index in offsets {
|
|
|
- let language = fetchedProfiles[index]
|
|
|
- moc.delete(language)
|
|
|
- }
|
|
|
- do {
|
|
|
- try moc.save()
|
|
|
- } catch {
|
|
|
- // To do: add error
|
|
|
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
|
|
|
}
|
|
|
}
|
|
|
}
|
polscm32