From 1876a6064c03b0adccd85f0af4f240f558096fe4 Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 27 Mar 2021 14:15:35 +0100 Subject: [PATCH] TimeUnit for ms-> min conversion --- .../nsclient/NSClientAddUpdateWorker.kt | 47 ++++++++++--------- .../general/nsclient/NSClientRemoveWorker.kt | 3 +- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt index 77e8b7832b..c4bc4b0cbf 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.R import info.nightscout.androidaps.database.AppRepository import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.database.entities.UserEntry -import info.nightscout.androidaps.database.entities.UserEntry.ValueWithUnit +import info.nightscout.androidaps.database.entities.UserEntry.* import info.nightscout.androidaps.database.transactions.SyncTemporaryTargetTransaction import info.nightscout.androidaps.database.transactions.SyncTherapyEventTransaction import info.nightscout.androidaps.events.EventNsTreatment @@ -28,6 +28,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.extensions.temporaryTargetFromJson import info.nightscout.androidaps.utils.extensions.therapyEventFromJson import info.nightscout.androidaps.utils.sharedPreferences.SP +import java.util.concurrent.TimeUnit import javax.inject.Inject class NSClientAddUpdateWorker( @@ -86,27 +87,27 @@ class NSClientAddUpdateWorker( .blockingGet() .also { result -> result.inserted.forEach { - uel.log(UserEntry.Action.TT, ValueWithUnit(UserEntry.Sources.NSClient), - ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent), - ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true), - ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget), - ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true) + uel.log(Action.TT, ValueWithUnit(Sources.NSClient), + ValueWithUnit(it.reason.text, Units.TherapyEvent), + ValueWithUnit(it.lowTarget, Units.Mg_Dl, true), + ValueWithUnit(it.highTarget, Units.Mg_Dl, it.lowTarget != it.highTarget), + ValueWithUnit(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt(), Units.M, true) ) } result.invalidated.forEach { - uel.log(UserEntry.Action.TT_REMOVED, ValueWithUnit(UserEntry.Sources.NSClient), - ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent), - ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true), - ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget), - ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true) + uel.log(Action.TT_REMOVED, ValueWithUnit(Sources.NSClient), + ValueWithUnit(it.reason.text, Units.TherapyEvent), + ValueWithUnit(it.lowTarget, Units.Mg_Dl, true), + ValueWithUnit(it.highTarget, Units.Mg_Dl, it.lowTarget != it.highTarget), + ValueWithUnit(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt(), Units.M, true) ) } result.ended.forEach { - uel.log(UserEntry.Action.CANCEL_TT, ValueWithUnit(UserEntry.Sources.NSClient), - ValueWithUnit(it.reason.text, UserEntry.Units.TherapyEvent), - ValueWithUnit(it.lowTarget, UserEntry.Units.Mg_Dl, true), - ValueWithUnit(it.highTarget, UserEntry.Units.Mg_Dl, it.lowTarget != it.highTarget), - ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, true) + uel.log(Action.CANCEL_TT, ValueWithUnit(Sources.NSClient), + ValueWithUnit(it.reason.text, Units.TherapyEvent), + ValueWithUnit(it.lowTarget, Units.Mg_Dl, true), + ValueWithUnit(it.highTarget, Units.Mg_Dl, it.lowTarget != it.highTarget), + ValueWithUnit(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt(), Units.M, true) ) } } @@ -131,17 +132,17 @@ class NSClientAddUpdateWorker( .blockingGet() .also { result -> result.inserted.forEach { - uel.log(UserEntry.Action.CAREPORTAL, - it.note ?: "", ValueWithUnit(UserEntry.Sources.NSClient), - ValueWithUnit(it.timestamp, UserEntry.Units.Timestamp, true), - ValueWithUnit(it.type.text, UserEntry.Units.TherapyEvent) + uel.log(Action.CAREPORTAL, + it.note ?: "", ValueWithUnit(Sources.NSClient), + ValueWithUnit(it.timestamp, Units.Timestamp, true), + ValueWithUnit(it.type.text, Units.TherapyEvent) ) } result.invalidated.forEach { uel.log(UserEntry.Action.CAREPORTAL_REMOVED, - it.note ?: "", ValueWithUnit(UserEntry.Sources.NSClient), - ValueWithUnit(it.timestamp, UserEntry.Units.Timestamp, true), - ValueWithUnit(it.type.text, UserEntry.Units.TherapyEvent) + it.note ?: "", ValueWithUnit(Sources.NSClient), + ValueWithUnit(it.timestamp, Units.Timestamp, true), + ValueWithUnit(it.type.text, Units.TherapyEvent) ) } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt index 515c733e81..8f579b7554 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt @@ -24,6 +24,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.extensions.temporaryTargetFromNsIdForInvalidating import info.nightscout.androidaps.utils.extensions.therapyEventFromNsIdForInvalidating import info.nightscout.androidaps.utils.sharedPreferences.SP +import java.util.concurrent.TimeUnit import javax.inject.Inject // This will not be needed fpr NS v3 @@ -72,7 +73,7 @@ class NSClientRemoveWorker( ValueWithUnit(it.reason.text, Units.TherapyEvent), ValueWithUnit(it.lowTarget, Units.Mg_Dl, true), ValueWithUnit(it.highTarget, Units.Mg_Dl, it.lowTarget != it.highTarget), - ValueWithUnit(it.duration.toInt() / 60000, UserEntry.Units.M, it.duration != 0L) + ValueWithUnit(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt(), Units.M, it.duration != 0L) ) } }