From cc3919e9fcb05d3f16d793c0b0cb62eeda5baa67 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sun, 4 Apr 2021 15:05:43 +0200 Subject: [PATCH] Add SITE/RESERVOIR CHANGE Action and improve Colors --- .../nightscout/androidaps/dialogs/FillDialog.kt | 6 ++++-- .../nightscout/androidaps/utils/Translator.kt | 2 ++ core/src/main/res/values/strings.xml | 2 ++ .../androidaps/database/entities/UserEntry.kt | 16 +++++++++------- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt index 6dc813c72e..9a8bab718f 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt @@ -141,8 +141,9 @@ class FillDialog : DialogFragmentWithDate() { requestPrimeBolus(insulinAfterConstraints, notes) } if (siteChange) { - uel.log(Action.CAREPORTAL, Sources.FillDialog, + uel.log(Action.SITE_CHANGE, Sources.FillDialog, notes, + ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventType(TherapyEvent.Type.CANNULA_CHANGE)) disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction( timestamp = eventTime, @@ -156,8 +157,9 @@ class FillDialog : DialogFragmentWithDate() { } if (insulinChange) { // add a second for case of both checked - uel.log(Action.CAREPORTAL, Sources.FillDialog, + uel.log(Action.RESERVOIR_CHANGE, Sources.FillDialog, notes, + ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventType(TherapyEvent.Type.INSULIN_CHANGE)) disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction( timestamp = eventTime + 1000, diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt index be5a7666d9..85e2632cc1 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt @@ -49,6 +49,8 @@ class Translator @Inject internal constructor( Action.CANCEL_EXTENDED_BOLUS -> resourceHelper.gs(R.string.uel_cancel_extended_bolus) Action.CANCEL_TT -> resourceHelper.gs(R.string.uel_cancel_tt) Action.CAREPORTAL -> resourceHelper.gs(R.string.uel_careportal) + Action.SITE_CHANGE -> resourceHelper.gs(R.string.uel_site_change) + Action.RESERVOIR_CHANGE -> resourceHelper.gs(R.string.uel_reservoir_change) Action.CALIBRATION -> resourceHelper.gs(R.string.uel_calibration) Action.PRIME_BOLUS -> resourceHelper.gs(R.string.uel_prime_bolus) Action.TREATMENT -> resourceHelper.gs(R.string.uel_treatment) diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 50412c35b8..035a48e885 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -433,6 +433,8 @@ CANCEL EXTENDED BOLUS CANCEL TT CAREPORTAL + SITE CHANGE + RESERVOIR CHANGE CALIBRATION PRIME BOLUS TREATMENT diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt index c1e8a7c80b..6d6501f425 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt @@ -49,23 +49,25 @@ data class UserEntry( CANCEL_EXTENDED_BOLUS (ColorGroup.InsulinTreatment), CANCEL_TT (ColorGroup.TT), CAREPORTAL (ColorGroup.Careportal), + SITE_CHANGE (ColorGroup.Pump), + RESERVOIR_CHANGE (ColorGroup.Pump), CALIBRATION (ColorGroup.Careportal), - PRIME_BOLUS (ColorGroup.Careportal), + PRIME_BOLUS (ColorGroup.Pump), TREATMENT (ColorGroup.InsulinTreatment), CAREPORTAL_NS_REFRESH (ColorGroup.Aaps), PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps), TREATMENTS_NS_REFRESH (ColorGroup.Aaps), TT_NS_REFRESH (ColorGroup.Aaps), AUTOMATION_REMOVED (ColorGroup.Aaps), - BG_REMOVED (ColorGroup.Careportal), - CAREPORTAL_REMOVED (ColorGroup.Careportal), - EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment), + BG_REMOVED (ColorGroup.Aaps), + CAREPORTAL_REMOVED (ColorGroup.Aaps), + EXTENDED_BOLUS_REMOVED (ColorGroup.Aaps), FOOD_REMOVED (ColorGroup.CarbTreatment), PROFILE_REMOVED (ColorGroup.Profile), - PROFILE_SWITCH_REMOVED (ColorGroup.Profile), + PROFILE_SWITCH_REMOVED (ColorGroup.Aaps), RESTART_EVENTS_REMOVED (ColorGroup.Aaps), - TREATMENT_REMOVED (ColorGroup.InsulinTreatment), - TT_REMOVED (ColorGroup.TT), + TREATMENT_REMOVED (ColorGroup.Aaps), + TT_REMOVED (ColorGroup.Aaps), NS_PAUSED (ColorGroup.Aaps), NS_RESUME (ColorGroup.Aaps), NS_QUEUE_CLEARED (ColorGroup.Aaps),