Skip to content

enable the carbohydrate display to contain more history #2654

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
ps2 merged 2 commits into from
Nov 6, 2026
Merged

enable the carbohydrate display to contain more history #2654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d780c4
enable the carbohydrate display to contain two days of history
marionbarker Nov 3, 2026
bb5d0e0
Make carb entries older than the entry window delete-only
ps2 Nov 5, 2026
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
28 changes: 24 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 @@ -147,7 +147,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: -LoopCoreConstants.maximumCarbAbsorptionTimeInterval))
let listStart = min(midnight - .hours(24), chartStartDate, Date(timeIntervalSinceNow: -LoopCoreConstants.maximumCarbAbsorptionTimeInterval))
let listEnd = Date().addingTimeInterval(LoopConstants.maxCarbEntryFutureTime)

let shouldUpdateGlucose = currentContext.contains(.glucose)
Expand Down Expand Up @@ -252,6 +252,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 @@ -308,7 +316,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 Expand Up @@ -359,7 +374,7 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
}
}

cell.isEditable = allowEditing
cell.isEditable = canEdit(status.entry)
return cell
}
}
Expand Down Expand Up @@ -447,9 +462,14 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
case .totals:
return nil
case .entries:
return (allowEditing && carbStatuses[indexPath.row].entry.createdByCurrentApp) ? indexPath : nil
return canEdit(carbStatuses[indexPath.row].entry) ? indexPath : nil
}
}

// Entries older than the carb entry window are delete-only.
private func canEdit(_ entry: StoredCarbEntry) -> Bool {
allowEditing && entry.createdByCurrentApp && entry.startDate >= Date().addingTimeInterval(LoopConstants.maxCarbEntryPastTime)
}

override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
Expand Down