caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Add QuickWizard Source (not sure if it's the best solution...)

Browse source
This commit is contained in:
Philoul 2021-03-29 23:03:53 +02:00
parent 6c8b4dfab0
commit d607b855b0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
View file

@ -154,7 +154,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
uel.log(action, uel.log(action,
ValueWithUnit(Sources.TreatmentDialog), ValueWithUnit(Sources.TreatmentDialog),
ValueWithUnit(detailedBolusInfo.timestamp, Units.Timestamp, eventTimeChanged), ValueWithUnit(detailedBolusInfo.timestamp, Units.Timestamp, eventTimeChanged),
ValueWithUnit(R.string.record, Units.R_String), ValueWithUnit(R.string.record, Units.R_String, insulin != 0.0),
ValueWithUnit(insulinAfterConstraints, Units.U, insulin != 0.0), ValueWithUnit(insulinAfterConstraints, Units.U, insulin != 0.0),
ValueWithUnit(carbsAfterConstraints, Units.G, carbs != 0)) ValueWithUnit(carbsAfterConstraints, Units.G, carbs != 0))
if (detailedBolusInfo.insulin > 0) if (detailedBolusInfo.insulin > 0)

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

@ -63,6 +63,7 @@ class BolusWizard @Inject constructor(
@Inject lateinit var carbTimer: CarbTimer @Inject lateinit var carbTimer: CarbTimer
@Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
@Inject lateinit var repository: AppRepository @Inject lateinit var repository: AppRepository
@Inject lateinit var quickWizard: QuickWizard
@Inject lateinit var nsUpload: NSUpload @Inject lateinit var nsUpload: NSUpload
private val disposable = CompositeDisposable() private val disposable = CompositeDisposable()
@ -415,8 +416,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, notes, uel.log(action, if (notes == resourceHelper.gs(R.string.key_quickwizard)) quickWizard.getActive()?.buttonText() else notes,
ValueWithUnit(Sources.WizardDialog), ValueWithUnit(if (notes == resourceHelper.gs(R.string.key_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),