Skip to content

Fix bolus end date charting #638

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
merged 1 commit into from
Dec 13, 2017
Merged

Fix bolus end date charting #638

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
21 changes: 10 additions & 11 deletions Loop/Managers/StatusChartsManager+LoopKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@ extension StatusChartsManager {
var allDosePoints = [ChartPoint]()

for entry in doseEntries {
switch entry.endDate.timeIntervalSince(entry.startDate) {
case let time where time > 0:
let time = entry.endDate.timeIntervalSince(entry.startDate)

if entry.type == .bolus && entry.units > 0 && time < .minutes(5) {
let x = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
let y = ChartAxisValueDoubleLog(actualDouble: entry.units, unitString: "U", formatter: doseFormatter)

let point = ChartPoint(x: x, y: y)
bolusDosePoints.append(point)
allDosePoints.append(point)
} else if time > 0 {
// TODO: Display the DateInterval
let startX = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
let endX = ChartAxisValueDate(date: entry.endDate, formatter: dateFormatter)
Expand All @@ -110,15 +118,6 @@ extension StatusChartsManager {
]

allDosePoints += valuePoints
default:
if entry.type == .bolus && entry.units > 0 {
let x = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
let y = ChartAxisValueDoubleLog(actualDouble: entry.units, unitString: "U", formatter: doseFormatter)

let point = ChartPoint(x: x, y: y)
bolusDosePoints.append(point)
allDosePoints.append(point)
}
}
}

Expand Down