Skip to content

Pump-Concentration#4697

Merged
MilosKozak merged 12 commits intonightscout:devfrom
Philoul:Pump-Concentration
Apr 12, 2026
Merged

Pump-Concentration#4697
MilosKozak merged 12 commits intonightscout:devfrom
Philoul:Pump-Concentration

Conversation

@Philoul
Copy link
Copy Markdown
Contributor

@Philoul Philoul commented Apr 8, 2026

Update Pump Overview with some missing ch (Virtual, Dash, Eros, Dana, Equil, EOPatch, Medtronic)

One question concerning the formating included into translated strings:

  • if I replace the format : %1$.2fU/h by %1$s, I think translated strings (with previous format) should be replaced by the english one until a new translation is done in Crowdin?

If not we have a risk of crash... (I can update my PR with another key to prevent this)

@MilosKozak
Copy link
Copy Markdown
Contributor

you must create new string if param is different otherwise it crash

@MilosKozak
Copy link
Copy Markdown
Contributor

MilosKozak commented Apr 9, 2026

<string name="reservoir_value">%1$.0f / %2$d U</string>
this is current definition
you are using it like
rh.gs(app.aaps.core.ui.R.string.reservoir_value, ch.fromPump(PumpInsulin(pump.dailyTotalUnits)), ch.fromPump(PumpInsulin(pump.maxDailyTotalUnits.toDouble()))),

and I checked only this one example ...

@Philoul
Copy link
Copy Markdown
Contributor Author

Philoul commented Apr 9, 2026

Here this string is not only used for reservoir level, but also for TDD (with a max TDD).

  • I hesitate to provide the full string for non U100 xxx U (yyy CU) / XXX U (YYY CU) or just TDD in IU values

Additional question: how far we standardize information provided in pump overview
I.e. for TBR I found

  • TBR rate only
  • TBR rate + remaining time
  • starting time + TBR rate + remaining time
  • ...

I found customization of information on several other "standard" items like reservoir level (with or without max), TDD (with or without max TDD), extended boluses (rate, delivered amount? timing?...)

  • here I tried to be as close as possible to the origin, but we can probably simplify much more the readability of the code in pump ViewModels if we standardize more the presentation 🤔 (whatever the concentration)

@MilosKozak
Copy link
Copy Markdown
Contributor

I'd standartize it everywhere. easier to maintain
and it cannot be too long to fit on screen .... or split to 2 lines ... you must test, what looks good

@Philoul
Copy link
Copy Markdown
Contributor Author

Philoul commented Apr 11, 2026

I started to standardize common pump information (first with lastBolus including ago)

  • I included Insight and Combo even if not converted (will fix conflicts with compose once both Insight on combo are merged in dev)

Philoul added 3 commits April 11, 2026 16:17
# Conflicts:
#	pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
#	pump/insight/src/main/kotlin/app/aaps/pump/insight/InsightFragment.kt
@Philoul
Copy link
Copy Markdown
Contributor Author

Philoul commented Apr 11, 2026

With my latest commit here are the proposed harmonisation pour Reservoir Level and TDD:

  • Reservoir level: proposal is to remove max level (Dana, Diaconn and Medtronic pump only provide max reservoir level). "Over xxx U left" is managed in ViewModel for Dash, Eros and Eopatch pumps.
  • TDD: proposal is to add a new row for "Max daily units" for the pumps managing this value (Dana and Diaconn only). Both value "TDD / MaxTDD U" on the same row is only ok for U100 but too long for other concentation with "xxx U (yyy CU)"

@MilosKozak MilosKozak merged commit 7c422a6 into nightscout:dev Apr 12, 2026
0 of 2 checks passed
@sonarqubecloud
Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants