Add basal/bolus/carb/target overlays to Live and Dagoverzicht charts #30

2026-09-05T20:30:33Z

willemjan commented

2026-09-05 20:30:33 +00:00

Summary

Stacked on #29 (base branch is feature/insulin-profile, not main) — this PR should be merged after #29, or retargeted to main once #29 lands.

reporting.py: new classify_bolus() (splits bolus treatments into food/correction/SMB), effective_basal_series() (profile-scheduled basal rate overridden by active temp basal), target_glucose_series() (pump target as a step function), and glucose_min_max().
ui_common.py: new shared Plotly trace-building helpers — add_basal_area_trace, add_carb_bars_trace, add_bolus_marker_traces, add_target_line_trace — each parametrized by an x_col so they work both with real timestamps (Live) and hour-of-day floats (Dagoverzicht's per-day subplots).
pages/4_Dagoverzicht.py: each day's subplot now overlays the basal-rate area (secondary y-axis), carb bars, bolus dots (sized by units, food/correction labeled, SMB unlabeled), and the profile's target-glucose line, alongside the existing glucose line. Manual per-row title annotations replace make_subplots' subplot_titles to avoid colliding with the new shared legend.
pages/1_Live.py: same overlays added to the rolling live chart; the existing insulin markers are replaced by the categorized/sized bolus markers for consistency. Basal/target series are computed per calendar day and concatenated to correctly span a rolling window that crosses midnight.

Every overlay layer uses its own color and alpha (so nothing fully occludes what's behind it) and is properly attributed in the legend, per the request's spec.

Note on a pre-existing issue found during testing: the Live page's "48 uur" period option doesn't actually refresh the chart to show 48h of data (still shows ~24h) — verified this reproduces identically on the unmodified main version of this page, so it predates this PR and is unrelated to these changes. Flagging it here rather than silently leaving it; happy to file it separately if useful.

Test plan

ruff check . passes
pytest tests/ -v passes (122 tests, +26 new: classify_bolus/effective_basal_series/target_glucose_series/glucose_min_max in test_reporting.py, overlay trace helpers in test_ui_common.py)
Manually launched the app against the real configured Nightscout instance and verified both pages render real basal/bolus/carb/target overlays correctly (screenshots inspected): legend fully attributed and deduplicated across Dagoverzicht's stacked days, correct axis titles on both primary (mmol/L) and secondary (Basaal E/uur · KH g) axes, alpha blending visible, bolus dose labels legible, target line tracks the real profile.

🤖 Generated with Claude Code

## Summary Stacked on #29 (base branch is `feature/insulin-profile`, not `main`) — this PR should be merged after #29, or retargeted to `main` once #29 lands. - `reporting.py`: new `classify_bolus()` (splits bolus treatments into food/correction/SMB), `effective_basal_series()` (profile-scheduled basal rate overridden by active temp basal), `target_glucose_series()` (pump target as a step function), and `glucose_min_max()`. - `ui_common.py`: new shared Plotly trace-building helpers — `add_basal_area_trace`, `add_carb_bars_trace`, `add_bolus_marker_traces`, `add_target_line_trace` — each parametrized by an `x_col` so they work both with real timestamps (Live) and hour-of-day floats (Dagoverzicht's per-day subplots). - `pages/4_Dagoverzicht.py`: each day's subplot now overlays the basal-rate area (secondary y-axis), carb bars, bolus dots (sized by units, food/correction labeled, SMB unlabeled), and the profile's target-glucose line, alongside the existing glucose line. Manual per-row title annotations replace `make_subplots`' `subplot_titles` to avoid colliding with the new shared legend. - `pages/1_Live.py`: same overlays added to the rolling live chart; the existing insulin markers are replaced by the categorized/sized bolus markers for consistency. Basal/target series are computed per calendar day and concatenated to correctly span a rolling window that crosses midnight. Every overlay layer uses its own color and alpha (so nothing fully occludes what's behind it) and is properly attributed in the legend, per the request's spec. **Note on a pre-existing issue found during testing:** the Live page's "48 uur" period option doesn't actually refresh the chart to show 48h of data (still shows ~24h) — verified this reproduces identically on the unmodified `main` version of this page, so it predates this PR and is unrelated to these changes. Flagging it here rather than silently leaving it; happy to file it separately if useful. ## Test plan - [x] `ruff check .` passes - [x] `pytest tests/ -v` passes (122 tests, +26 new: `classify_bolus`/`effective_basal_series`/`target_glucose_series`/`glucose_min_max` in `test_reporting.py`, overlay trace helpers in `test_ui_common.py`) - [x] Manually launched the app against the real configured Nightscout instance and verified both pages render real basal/bolus/carb/target overlays correctly (screenshots inspected): legend fully attributed and deduplicated across Dagoverzicht's stacked days, correct axis titles on both primary (mmol/L) and secondary (Basaal E/uur · KH g) axes, alpha blending visible, bolus dose labels legible, target line tracks the real profile. 🤖 Generated with [Claude Code](https://claude.com/claude-code)

willemjan added 1 commit 2026-09-05 20:30:33 +00:00

Add basal/bolus/carb/target overlays to the Live and Dagoverzicht charts

willemjan/glucose-dashboard/pipeline/pr-feature/insulin-profile This commit looks good

Details

c54dcf616a

Overlay the full insulin picture onto the interactive glucose charts:
basal rate as a semi-transparent step-area (profile schedule overridden
by active temp basal), bolus doses as size-scaled dots split into
food/correction/SMB categories (food and correction labeled with units,
SMB left unlabeled), carbs as bars, and the pump's target glucose as a
line — each with its own color, alpha, and legend entry. Shared trace-
building helpers live in ui_common.py so both pages (and the PDF report
in a follow-up PR) render identically.

Builds on the pump profile work in #29 (profile_data.py, load_profile()).

willemjan added 1 commit 2026-09-05 20:38:10 +00:00

Avoid pandas Timedelta(days=1) deprecation warning d33516e2a1

pd.Timedelta(days=1) triggers a DeprecationWarning about NumPy's
"generic" timedelta unit in this pandas version; pd.Timedelta(1, unit="D")
is equivalent and warning-free.

willemjan referenced this issue from a commit

2026-09-05 20:44:17 +00:00

Redesign the PDF report: landscape pages, headers/footers, icon, daily stats

willemjan merged commit 1376101212 into feature/insulin-profile

2026-09-05 20:44:26 +00:00

willemjan referenced this pull request

2026-09-05 20:44:31 +00:00

Redesign PDF report: landscape pages, headers/footers, icon, daily stats #31

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: willemjan/glucose-dashboard#30