caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

QuickWizard

Browse source
This commit is contained in:
Philoul 2021-03-30 23:13:20 +02:00
parent bf218e9ff4
commit 348c260d3d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
View file

@ -131,6 +131,7 @@ class BolusWizard @Inject constructor(
private var useAlarm = false private var useAlarm = false
var notes: String = "" var notes: String = ""
private var carbTime: Int = 0 private var carbTime: Int = 0
private var quickWizard: Boolean = true
@JvmOverloads @JvmOverloads
fun doCalc(profile: Profile, fun doCalc(profile: Profile,
@ -150,7 +151,8 @@ class BolusWizard @Inject constructor(
useTrend: Boolean, useTrend: Boolean,
useAlarm: Boolean, useAlarm: Boolean,
notes: String = "", notes: String = "",
carbTime: Int = 0 carbTime: Int = 0,
quickWizard: Boolean = false
): BolusWizard { ): BolusWizard {
this.profile = profile this.profile = profile
@ -171,6 +173,7 @@ class BolusWizard @Inject constructor(
this.useAlarm = useAlarm this.useAlarm = useAlarm
this.notes = notes this.notes = notes
this.carbTime = carbTime this.carbTime = carbTime
this.quickWizard = quickWizard
// Insulin from BG // Insulin from BG
sens = Profile.fromMgdlToUnits(profile.isfMgdl, profileFunction.getUnits()) sens = Profile.fromMgdlToUnits(profile.isfMgdl, profileFunction.getUnits())
@ -418,8 +421,8 @@ class BolusWizard @Inject constructor(
carbs.equals(0.0) -> Action.BOLUS carbs.equals(0.0) -> Action.BOLUS
else -> Action.TREATMENT else -> Action.TREATMENT
} }
uel.log(action, if (notes == resourceHelper.gs(R.string.ue_quickwizard_ID)) quickWizard.getActive()?.buttonText() else notes, // ue_quickwizard_ID is complicated string impossible to write as note in WizardDialog uel.log(action, notes,
ValueWithUnit(if (notes == resourceHelper.gs(R.string.ue_quickwizard_ID)) Sources.QuickWizard else Sources.WizardDialog), ValueWithUnit(if (quickWizard) Sources.QuickWizard else Sources.WizardDialog),
ValueWithUnit(eventType.toDBbEventType().text, Units.TherapyEvent), ValueWithUnit(eventType.toDBbEventType().text, Units.TherapyEvent),
ValueWithUnit(insulinAfterConstraints, Units.U, insulinAfterConstraints != 0.0), ValueWithUnit(insulinAfterConstraints, Units.U, insulinAfterConstraints != 0.0),
ValueWithUnit(this@BolusWizard.carbs, Units.G, this@BolusWizard.carbs != 0), ValueWithUnit(this@BolusWizard.carbs, Units.G, this@BolusWizard.carbs != 0),