From 633767ad3d030979e6e66079e8db119412b785e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=BCthing?= Date: Sun, 23 Aug 2020 18:02:38 +0200 Subject: [PATCH] Subtract setup units from displayed total insulin delivered --- .../androidaps/plugins/pump/omnipod/OmnipodFragment.kt | 8 +++++++- omnipod/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt index e9b059c89b..2d9d3b82d1 100644 --- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt +++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt @@ -281,7 +281,13 @@ class OmnipodFragment : DaggerFragment() { .getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull() ?: "-" // total delivered - omnipod_total_delivered.text = resourceHelper.gs(R.string.omnipod_total_delivered,podStateManager.totalInsulinDelivered); + omnipod_total_delivered.text = podStateManager.totalInsulinDelivered.let { + when { + it == null -> "-" + it < OmnipodConst.POD_SETUP_UNITS -> resourceHelper.gs(R.string.omnipod_total_delivered_pod_preparing) + else -> resourceHelper.gs(R.string.omnipod_total_delivered, it - OmnipodConst.POD_SETUP_UNITS); + } + } // reservoir if (podStateManager.reservoirLevel == null) { diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml index 5107c443c1..2abe3fc797 100644 --- a/omnipod/src/main/res/values/strings.xml +++ b/omnipod/src/main/res/values/strings.xml @@ -27,6 +27,7 @@ Pod Mgmt Pod Status Total Delivered + Pod Preparing %1$.2f U %1$.2f U left Over 50 U