From 07e2e0eaf43f9f66ac95fe6252af11d992ddca94 Mon Sep 17 00:00:00 2001 From: Philoul Date: Tue, 30 Mar 2021 12:22:49 +0200 Subject: [PATCH] Add QuickWizard Source (final solution) # Conflicts: # app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt # app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt --- .../nightscout/androidaps/utils/wizard/BolusWizard.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt index 1e80e0fcec..961371dfc6 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt @@ -346,7 +346,10 @@ class BolusWizard @Inject constructor( bolusCalculatorResult = createBolusCalculatorResult() notes = this@BolusWizard.notes //uel.log(Action.BOLUS_ADVISOR, notes, XXXValueWithUnit.TherapyEventType(eventType), XXXValueWithUnit.Insulin(insulinAfterConstraints)) - uel.log(Action.BOLUS_ADVISOR, notes, ValueWithUnit(Sources.WizardDialog), ValueWithUnit(eventType.toDBbEventType().text, Units.TherapyEvent), ValueWithUnit(insulinAfterConstraints, Units.U)) + uel.log(Action.BOLUS_ADVISOR, notes, + ValueWithUnit(if (quickWizard) Sources.QuickWizard else Sources.WizardDialog), + ValueWithUnit(eventType.toDBbEventType().text, Units.TherapyEvent), + ValueWithUnit(insulinAfterConstraints, Units.U)) if (insulin > 0) { commandQueue.bolus(this, object : Callback() { override fun run() { @@ -421,8 +424,7 @@ class BolusWizard @Inject constructor( ValueWithUnit(eventType.toDBbEventType().text, Units.TherapyEvent), ValueWithUnit(insulinAfterConstraints, Units.U, insulinAfterConstraints != 0.0), ValueWithUnit(this@BolusWizard.carbs, Units.G, this@BolusWizard.carbs != 0), - ValueWithUnit(carbTime, Units.M, carbTime != 0) - ) + ValueWithUnit(carbTime, Units.M, carbTime != 0)) commandQueue.bolus(this, object : Callback() { override fun run() { if (!result.success) {