caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Add SITE/RESERVOIR CHANGE Action and improve Colors

Browse source
This commit is contained in:
Philoul 2021-04-04 15:05:43 +02:00
parent c615afce95
commit cc3919e9fc
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
View file

@ -141,8 +141,9 @@ class FillDialog : DialogFragmentWithDate() {
requestPrimeBolus(insulinAfterConstraints, notes) requestPrimeBolus(insulinAfterConstraints, notes)
} }
if (siteChange) { if (siteChange) {
uel.log(Action.CAREPORTAL, Sources.FillDialog, uel.log(Action.SITE_CHANGE, Sources.FillDialog,
notes, notes,
ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
ValueWithUnit.TherapyEventType(TherapyEvent.Type.CANNULA_CHANGE)) ValueWithUnit.TherapyEventType(TherapyEvent.Type.CANNULA_CHANGE))
disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction( disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
timestamp = eventTime, timestamp = eventTime,
@ -156,8 +157,9 @@ class FillDialog : DialogFragmentWithDate() {
} }
if (insulinChange) { if (insulinChange) {
// add a second for case of both checked // add a second for case of both checked
uel.log(Action.CAREPORTAL, Sources.FillDialog, uel.log(Action.RESERVOIR_CHANGE, Sources.FillDialog,
notes, notes,
ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
ValueWithUnit.TherapyEventType(TherapyEvent.Type.INSULIN_CHANGE)) ValueWithUnit.TherapyEventType(TherapyEvent.Type.INSULIN_CHANGE))
disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction( disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
timestamp = eventTime + 1000, timestamp = eventTime + 1000,

2
core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
View file

@ -49,6 +49,8 @@ class Translator @Inject internal constructor(
Action.CANCEL_EXTENDED_BOLUS -> resourceHelper.gs(R.string.uel_cancel_extended_bolus) Action.CANCEL_EXTENDED_BOLUS -> resourceHelper.gs(R.string.uel_cancel_extended_bolus)
Action.CANCEL_TT -> resourceHelper.gs(R.string.uel_cancel_tt) Action.CANCEL_TT -> resourceHelper.gs(R.string.uel_cancel_tt)
Action.CAREPORTAL -> resourceHelper.gs(R.string.uel_careportal) 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.CALIBRATION -> resourceHelper.gs(R.string.uel_calibration)
Action.PRIME_BOLUS -> resourceHelper.gs(R.string.uel_prime_bolus) Action.PRIME_BOLUS -> resourceHelper.gs(R.string.uel_prime_bolus)
Action.TREATMENT -> resourceHelper.gs(R.string.uel_treatment) Action.TREATMENT -> resourceHelper.gs(R.string.uel_treatment)

2
core/src/main/res/values/strings.xml
View file

@ -433,6 +433,8 @@
<string name="uel_cancel_extended_bolus">CANCEL EXTENDED BOLUS</string> <string name="uel_cancel_extended_bolus">CANCEL EXTENDED BOLUS</string>
<string name="uel_cancel_tt">CANCEL TT</string> <string name="uel_cancel_tt">CANCEL TT</string>
<string name="uel_careportal">CAREPORTAL</string> <string name="uel_careportal">CAREPORTAL</string>
<string name="uel_site_change">SITE CHANGE</string>
<string name="uel_reservoir_change">RESERVOIR CHANGE</string>
<string name="uel_calibration">CALIBRATION</string> <string name="uel_calibration">CALIBRATION</string>
<string name="uel_prime_bolus">PRIME BOLUS</string> <string name="uel_prime_bolus">PRIME BOLUS</string>
<string name="uel_treatment">TREATMENT</string> <string name="uel_treatment">TREATMENT</string>

16
database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
View file

@ -49,23 +49,25 @@ data class UserEntry(
CANCEL_EXTENDED_BOLUS (ColorGroup.InsulinTreatment), CANCEL_EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
CANCEL_TT (ColorGroup.TT), CANCEL_TT (ColorGroup.TT),
CAREPORTAL (ColorGroup.Careportal), CAREPORTAL (ColorGroup.Careportal),
SITE_CHANGE (ColorGroup.Pump),
RESERVOIR_CHANGE (ColorGroup.Pump),
CALIBRATION (ColorGroup.Careportal), CALIBRATION (ColorGroup.Careportal),
PRIME_BOLUS (ColorGroup.Careportal), PRIME_BOLUS (ColorGroup.Pump),
TREATMENT (ColorGroup.InsulinTreatment), TREATMENT (ColorGroup.InsulinTreatment),
CAREPORTAL_NS_REFRESH (ColorGroup.Aaps), CAREPORTAL_NS_REFRESH (ColorGroup.Aaps),
PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps), PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps),
TREATMENTS_NS_REFRESH (ColorGroup.Aaps), TREATMENTS_NS_REFRESH (ColorGroup.Aaps),
TT_NS_REFRESH (ColorGroup.Aaps), TT_NS_REFRESH (ColorGroup.Aaps),
AUTOMATION_REMOVED (ColorGroup.Aaps), AUTOMATION_REMOVED (ColorGroup.Aaps),
BG_REMOVED (ColorGroup.Careportal), BG_REMOVED (ColorGroup.Aaps),
CAREPORTAL_REMOVED (ColorGroup.Careportal), CAREPORTAL_REMOVED (ColorGroup.Aaps),
EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment), EXTENDED_BOLUS_REMOVED (ColorGroup.Aaps),
FOOD_REMOVED (ColorGroup.CarbTreatment), FOOD_REMOVED (ColorGroup.CarbTreatment),
PROFILE_REMOVED (ColorGroup.Profile), PROFILE_REMOVED (ColorGroup.Profile),
PROFILE_SWITCH_REMOVED (ColorGroup.Profile), PROFILE_SWITCH_REMOVED (ColorGroup.Aaps),
RESTART_EVENTS_REMOVED (ColorGroup.Aaps), RESTART_EVENTS_REMOVED (ColorGroup.Aaps),
TREATMENT_REMOVED (ColorGroup.InsulinTreatment), TREATMENT_REMOVED (ColorGroup.Aaps),
TT_REMOVED (ColorGroup.TT), TT_REMOVED (ColorGroup.Aaps),
NS_PAUSED (ColorGroup.Aaps), NS_PAUSED (ColorGroup.Aaps),
NS_RESUME (ColorGroup.Aaps), NS_RESUME (ColorGroup.Aaps),
NS_QUEUE_CLEARED (ColorGroup.Aaps), NS_QUEUE_CLEARED (ColorGroup.Aaps),