caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wear: create bolus wizard record

Browse source
This commit is contained in:
Milos Kozak 2023-01-13 20:41:40 +01:00
parent 378002df33
commit 34ba03bef4
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
View file

@ -277,7 +277,7 @@ class BolusWizard @Inject constructor(
return this return this
} }
private fun createBolusCalculatorResult(): BolusCalculatorResult { fun createBolusCalculatorResult(): BolusCalculatorResult {
val unit = profileFunction.getUnits() val unit = profileFunction.getUnits()
return BolusCalculatorResult( return BolusCalculatorResult(
timestamp = dateUtil.now(), timestamp = dateUtil.now(),

18
plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
View file

@ -17,6 +17,7 @@ import info.nightscout.core.wizard.QuickWizard
import info.nightscout.core.wizard.QuickWizardEntry import info.nightscout.core.wizard.QuickWizardEntry
import info.nightscout.database.ValueWrapper import info.nightscout.database.ValueWrapper
import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.Bolus
import info.nightscout.database.entities.BolusCalculatorResult
import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.GlucoseValue
import info.nightscout.database.entities.TemporaryBasal import info.nightscout.database.entities.TemporaryBasal
import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.TemporaryTarget
@ -33,6 +34,7 @@ import info.nightscout.interfaces.GlucoseUnit
import info.nightscout.interfaces.aps.Loop import info.nightscout.interfaces.aps.Loop
import info.nightscout.interfaces.constraints.Constraint import info.nightscout.interfaces.constraints.Constraint
import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.constraints.Constraints
import info.nightscout.interfaces.db.PersistenceLayer
import info.nightscout.interfaces.iob.GlucoseStatusProvider import info.nightscout.interfaces.iob.GlucoseStatusProvider
import info.nightscout.interfaces.iob.InMemoryGlucoseValue import info.nightscout.interfaces.iob.InMemoryGlucoseValue
import info.nightscout.interfaces.iob.IobCobCalculator import info.nightscout.interfaces.iob.IobCobCalculator
@ -102,7 +104,8 @@ class DataHandlerMobile @Inject constructor(
private val activePlugin: ActivePlugin, private val activePlugin: ActivePlugin,
private val commandQueue: CommandQueue, private val commandQueue: CommandQueue,
private val fabricPrivacy: FabricPrivacy, private val fabricPrivacy: FabricPrivacy,
private val uiInteraction: UiInteraction private val uiInteraction: UiInteraction,
private val persistenceLayer: PersistenceLayer
) { ) {
private val disposable = CompositeDisposable() private val disposable = CompositeDisposable()
@ -224,7 +227,7 @@ class DataHandlerMobile @Inject constructor(
.observeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.io)
.subscribe({ .subscribe({
aapsLogger.debug(LTag.WEAR, "ActionBolusConfirmed received $it from ${it.sourceNodeId}") aapsLogger.debug(LTag.WEAR, "ActionBolusConfirmed received $it from ${it.sourceNodeId}")
doBolus(it.insulin, it.carbs, null, 0) doBolus(it.insulin, it.carbs, null, 0, null)
}, fabricPrivacy::logException) }, fabricPrivacy::logException)
disposable += rxBus disposable += rxBus
.toObservable(EventData.ActionECarbsPreCheck::class.java) .toObservable(EventData.ActionECarbsPreCheck::class.java)
@ -284,8 +287,10 @@ class DataHandlerMobile @Inject constructor(
.observeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.io)
.subscribe({ .subscribe({
aapsLogger.debug(LTag.WEAR, "ActionWizardConfirmed received $it from ${it.sourceNodeId}") aapsLogger.debug(LTag.WEAR, "ActionWizardConfirmed received $it from ${it.sourceNodeId}")
if (lastBolusWizard?.timeStamp == it.timeStamp) { //use last calculation as confirmed string matches lastBolusWizard?.let { lastBolusWizard ->
doBolus(lastBolusWizard!!.calculatedTotalInsulin, lastBolusWizard!!.carbs, null, 0) if (lastBolusWizard.timeStamp == it.timeStamp) { //use last calculation as confirmed string matches
doBolus(lastBolusWizard.calculatedTotalInsulin, lastBolusWizard.carbs, null, 0, lastBolusWizard.createBolusCalculatorResult())
}
} }
lastBolusWizard = null lastBolusWizard = null
}, fabricPrivacy::logException) }, fabricPrivacy::logException)
@ -1155,7 +1160,7 @@ class DataHandlerMobile @Inject constructor(
} }
} }
private fun doBolus(amount: Double, carbs: Int, carbsTime: Long?, carbsDuration: Int) { private fun doBolus(amount: Double, carbs: Int, carbsTime: Long?, carbsDuration: Int, bolusCalculatorResult: BolusCalculatorResult?) {
val detailedBolusInfo = DetailedBolusInfo() val detailedBolusInfo = DetailedBolusInfo()
detailedBolusInfo.insulin = amount detailedBolusInfo.insulin = amount
detailedBolusInfo.carbs = carbs.toDouble() detailedBolusInfo.carbs = carbs.toDouble()
@ -1179,6 +1184,7 @@ class DataHandlerMobile @Inject constructor(
sendError(rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment) sendError(rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment)
} }
}) })
bolusCalculatorResult?.let { persistenceLayer.insertOrUpdate(it) }
} }
} }
@ -1203,7 +1209,7 @@ class DataHandlerMobile @Inject constructor(
ValueWithUnit.Timestamp(carbsTime), ValueWithUnit.Timestamp(carbsTime),
ValueWithUnit.Gram(carbs), ValueWithUnit.Gram(carbs),
ValueWithUnit.Hour(duration).takeIf { duration != 0 }) ValueWithUnit.Hour(duration).takeIf { duration != 0 })
doBolus(0.0, carbs, carbsTime, duration) doBolus(0.0, carbs, carbsTime, duration, null)
} }
private fun doProfileSwitch(command: EventData.ActionProfileSwitchConfirmed) { private fun doProfileSwitch(command: EventData.ActionProfileSwitchConfirmed) {