Skip to content

Reconcile delivery above max basal rate as bolus on chart #6

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

Merged
dm61 merged 1 commit into from
Aug 12, 2018
Merged

Reconcile delivery above max basal rate as bolus on chart #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Loop/Managers/StatusChartsManager+LoopKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extension StatusChartsManager {
}
}

func setDoseEntries(_ doseEntries: [DoseEntry]) {
func setDoseEntries(_ doseEntries: [DoseEntry], _ maxBasalRateUnitsPerHour: Double?) {
let dateFormatter = self.dateFormatter
let doseFormatter = self.doseFormatter

Expand All @@ -83,7 +83,8 @@ extension StatusChartsManager {
for entry in doseEntries {
let time = entry.endDate.timeIntervalSince(entry.startDate)

if entry.type == .bolus && entry.netBasalUnits > 0 && time < .minutes(5) {
// Delivery rate above max basal indicates a bolus not yet present in event history:
if (entry.type == .bolus && entry.netBasalUnits > 0 && time < .minutes(5)) || (entry.netBasalUnitsPerHour > maxBasalRateUnitsPerHour ?? Double.infinity) {
let x = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
let y = ChartAxisValueDoubleLog(actualDouble: entry.units, unitString: "U", formatter: doseFormatter)

Expand Down
2 changes: 1 addition & 1 deletion Loop/View Controllers/StatusTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ final class StatusTableViewController: ChartsTableViewController {

// Insulin Delivery
if let doseEntries = doseEntries {
self.charts.setDoseEntries(doseEntries)
self.charts.setDoseEntries(doseEntries, self.deviceManager.loopManager.settings.maximumBasalRatePerHour)
}
if let totalDelivery = totalDelivery {
self.totalDelivery = totalDelivery
Expand Down