Merge pull request #914 from 0pen-dash/avereha/fix-bolusdelivery-text
dash: fix bolusdelivery text
This commit is contained in:
commit
c3959aa9a7
3 changed files with 12 additions and 1 deletions
|
@ -697,7 +697,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
|
|||
}
|
||||
val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
|
||||
updateBolusProgressDialog(
|
||||
rh.gs(R.string.bolusdelivering, requestedBolusAmount),
|
||||
rh.gs(R.string.dash_bolusdelivering, requestedBolusAmount),
|
||||
percent.toInt()
|
||||
)
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
|
|||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BasalValuesRecord
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.Constants
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
|
||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
||||
|
@ -94,6 +95,15 @@ class DashInsertCannulaViewModel @Inject constructor(
|
|||
onComplete = {
|
||||
logger.debug("Pod activation part 2 completed")
|
||||
podStateManager.basalProgram = basalProgram
|
||||
|
||||
pumpSync.syncStopTemporaryBasalWithPumpId(
|
||||
timestamp = System.currentTimeMillis(),
|
||||
endPumpId = System.currentTimeMillis(),
|
||||
pumpType = PumpType.OMNIPOD_DASH,
|
||||
pumpSerial = Constants.PUMP_SERIAL_FOR_FAKE_TBR // cancel the fake TBR with the same pump
|
||||
// serial that it was created with
|
||||
)
|
||||
|
||||
pumpSync.connectNewPump()
|
||||
|
||||
pumpSync.insertTherapyEventIfNewWithTimestamp(
|
||||
|
|
|
@ -46,4 +46,5 @@
|
|||
<string name="omnipod_dash_unknown">Unknown state for the command</string>
|
||||
<string name="omnipod_common_history_tbr_value">Rate: %1$.2f U, duration: %2$d minutes</string>
|
||||
<string name="omnipod_common_history_bolus_value">%1$.2f U</string>
|
||||
<string name="dash_bolusdelivering">Delivering %1$.2f U</string>
|
||||
</resources>
|
||||
|
|
Loading…
Reference in a new issue