Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve issue https://github.com/Artificial-Pancreas/iAPS/issues/712 #715

Merged
merged 2 commits into from
May 29, 2024
Merged

Resolve issue https://github.com/Artificial-Pancreas/iAPS/issues/712 #715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ed3af
Remove type conversion (resolves issue https://github.com/Artificial-…
Jon-b-m May 29, 2024
18569e6
Clean
Jon-b-m May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorStateModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ extension TargetsEditor {

let timeValues = stride(from: 0.0, to: 1.days.timeInterval, by: 30.minutes.timeInterval).map { $0 }

var rateValues: [Double] {
var rateValues: [Decimal] {
switch units {
case .mgdL:
return stride(from: 72, to: 180.01, by: 1.0).map { $0 }
Expand All @@ -27,8 +27,8 @@ extension TargetsEditor {
units = profile.units
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 = lowIndex
let lowIndex = rateValues.firstIndex(of: value.low) ?? 0
let highIndex = rateValues.firstIndex(of: value.high) ?? 0
return Item(lowIndex: lowIndex, highIndex: highIndex, timeIndex: timeIndex)
}
}
Expand All @@ -50,14 +50,14 @@ extension TargetsEditor {

func save() {
let targets = items.map { item -> BGTargetEntry in
let fotmatter = DateFormatter()
fotmatter.timeZone = TimeZone(secondsFromGMT: 0)
fotmatter.dateFormat = "HH:mm:ss"
let formatter = DateFormatter()
formatter.timeZone = TimeZone(secondsFromGMT: 0)
formatter.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 low = self.rateValues[item.lowIndex]
let high = low
return BGTargetEntry(low: low, high: high, start: fotmatter.string(from: date), offset: minutes)
return BGTargetEntry(low: low, high: high, start: formatter.string(from: date), offset: minutes)
}
let profile = BGTargets(units: units, userPrefferedUnits: settingsManager.settings.units, targets: targets)
provider.saveProfile(profile)
Expand All @@ -68,8 +68,7 @@ extension TargetsEditor {
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)
Item(lowIndex: item.lowIndex, highIndex: item.highIndex, timeIndex: item.timeIndex)
}
sorted.first?.timeIndex = 0
self.items = sorted
Expand Down