Skip to content

Display the previous day's carb entries on the carb absorption screen. #2182

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Display the previous day's carb entries on the carb absorption screen. #2182

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
2 changes: 1 addition & 1 deletion Loop/Managers/LoopDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ extension LoopDataManager {

let retrospectiveStart = lastGlucoseDate.addingTimeInterval(-type(of: retrospectiveCorrection).retrospectionInterval)

let earliestEffectDate = Date(timeInterval: .hours(-24), since: now())
let earliestEffectDate = Date(timeInterval: .hours(-48), since: now())
let nextCounteractionEffectDate = insulinCounteractionEffects.last?.endDate ?? earliestEffectDate
let insulinEffectStartDate = nextCounteractionEffectDate.addingTimeInterval(.minutes(-5))

Expand Down
31 changes: 27 additions & 4 deletions Loop/View Controllers/CarbAbsorptionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
charts.updateEndDate(chartStartDate.addingTimeInterval(.hours(totalHours+1))) // When there is no data, this allows presenting current hour + 1

let midnight = Calendar.current.startOfDay(for: Date())
let listStart = min(midnight, chartStartDate, Date(timeIntervalSinceNow: -deviceManager.carbStore.maximumAbsorptionTimeInterval))
let previousMidnight = midnight - .hours(24)

let reloadGroup = DispatchGroup()
let shouldUpdateGlucose = currentContext.contains(.glucose)
Expand All @@ -158,11 +158,19 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
let allInsulinCounteractionEffects = state.insulinCounteractionEffects
insulinCounteractionEffects = allInsulinCounteractionEffects.filterDateRange(chartStartDate, nil)

let earliestCounteractionEffect = allInsulinCounteractionEffects.first?.startDate ?? Date()
// Show carb entries as far back as previous midnight, or only as far back as counteraction effects are available
let boundOnCarbList = max(previousMidnight, earliestCounteractionEffect)
// If counteraction effects are missing, at least show all the entries for today and those on the chart
let displayListStart = min(boundOnCarbList, midnight, chartStartDate)
// To estimate dynamic carb absorption for the entry at the start of the list, we need to fetch samples that might still be absorbing
let fetchEntriesStart = displayListStart.addingTimeInterval(-self.deviceManager.carbStore.maximumAbsorptionTimeInterval)

reloadGroup.enter()
self.deviceManager.carbStore.getCarbStatus(start: listStart, end: nil, effectVelocities: allInsulinCounteractionEffects) { (result) in
self.deviceManager.carbStore.getCarbStatus(start: fetchEntriesStart, end: nil, effectVelocities: allInsulinCounteractionEffects) { (result) in
switch result {
case .success(let status):
carbStatuses = status
carbStatuses = status.filterDateRange(displayListStart, nil)
carbsOnBoard = status.getClampedCarbsOnBoard()
case .failure(let error):
self.log.error("CarbStore failed to get carbStatus: %{public}@", String(describing: error))
Expand Down Expand Up @@ -287,6 +295,14 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
return formatter
}()

private lazy var relativeTimeFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.dateStyle = .medium
formatter.doesRelativeDateFormatting = true
formatter.timeStyle = .short
return formatter
}()

override func numberOfSections(in tableView: UITableView) -> Int {
return Section.count
}
Expand Down Expand Up @@ -343,7 +359,14 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
}

// Entry time
let startTime = timeFormatter.string(from: status.entry.startDate)
let startTime: String
// Indicate if an entry is from the previous day to avoid potential confusion
let midnight = Calendar.current.startOfDay(for: Date())
if status.entry.startDate < midnight {
startTime = relativeTimeFormatter.string(from: status.entry.startDate)
} else {
startTime = timeFormatter.string(from: status.entry.startDate)
}
if let absorptionTime = status.entry.absorptionTime,
let duration = absorptionFormatter.string(from: absorptionTime)
{
Expand Down