Add glucose value for calibration (DexcomPlugin and GlunovoPlugin)
=> To review
This commit is contained in:
parent
8fe0266bcb
commit
009d428e89
2 changed files with 27 additions and 6 deletions
|
@ -161,12 +161,17 @@ class DexcomPlugin @Inject constructor(
|
||||||
ValueWithUnit.TherapyEventType(it.type))
|
ValueWithUnit.TherapyEventType(it.type))
|
||||||
aapsLogger.debug(LTag.DATABASE, "Inserted sensor insertion $it")
|
aapsLogger.debug(LTag.DATABASE, "Inserted sensor insertion $it")
|
||||||
}
|
}
|
||||||
result.calibrationsInserted.forEach {
|
result.calibrationsInserted.forEach { calibration ->
|
||||||
uel.log(Action.CAREPORTAL,
|
calibration.glucose?.let { glucosevalue ->
|
||||||
Sources.Dexcom,
|
uel.log(
|
||||||
ValueWithUnit.Timestamp(it.timestamp),
|
Action.CAREPORTAL,
|
||||||
ValueWithUnit.TherapyEventType(it.type))
|
Sources.Dexcom,
|
||||||
aapsLogger.debug(LTag.DATABASE, "Inserted calibration $it")
|
ValueWithUnit.Timestamp(calibration.timestamp),
|
||||||
|
ValueWithUnit.TherapyEventType(calibration.type),
|
||||||
|
ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString())
|
||||||
|
)
|
||||||
|
}
|
||||||
|
aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
|
|
|
@ -10,6 +10,8 @@ import info.nightscout.androidaps.R
|
||||||
import info.nightscout.androidaps.database.AppRepository
|
import info.nightscout.androidaps.database.AppRepository
|
||||||
import info.nightscout.androidaps.database.entities.GlucoseValue
|
import info.nightscout.androidaps.database.entities.GlucoseValue
|
||||||
import info.nightscout.androidaps.database.entities.TherapyEvent
|
import info.nightscout.androidaps.database.entities.TherapyEvent
|
||||||
|
import info.nightscout.androidaps.database.entities.UserEntry
|
||||||
|
import info.nightscout.androidaps.database.entities.ValueWithUnit
|
||||||
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
|
import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
|
||||||
import info.nightscout.androidaps.interfaces.BgSource
|
import info.nightscout.androidaps.interfaces.BgSource
|
||||||
import info.nightscout.androidaps.interfaces.PluginBase
|
import info.nightscout.androidaps.interfaces.PluginBase
|
||||||
|
@ -17,6 +19,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
|
||||||
import info.nightscout.androidaps.interfaces.PluginType
|
import info.nightscout.androidaps.interfaces.PluginType
|
||||||
import info.nightscout.androidaps.logging.AAPSLogger
|
import info.nightscout.androidaps.logging.AAPSLogger
|
||||||
import info.nightscout.androidaps.logging.LTag
|
import info.nightscout.androidaps.logging.LTag
|
||||||
|
import info.nightscout.androidaps.logging.UserEntryLogger
|
||||||
import info.nightscout.androidaps.utils.DateUtil
|
import info.nightscout.androidaps.utils.DateUtil
|
||||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
import info.nightscout.androidaps.utils.FabricPrivacy
|
||||||
import info.nightscout.androidaps.utils.T
|
import info.nightscout.androidaps.utils.T
|
||||||
|
@ -37,6 +40,7 @@ class GlunovoPlugin @Inject constructor(
|
||||||
private val repository: AppRepository,
|
private val repository: AppRepository,
|
||||||
private val xDripBroadcast: XDripBroadcast,
|
private val xDripBroadcast: XDripBroadcast,
|
||||||
private val dateUtil: DateUtil,
|
private val dateUtil: DateUtil,
|
||||||
|
private val uel: UserEntryLogger,
|
||||||
private val fabricPrivacy: FabricPrivacy
|
private val fabricPrivacy: FabricPrivacy
|
||||||
) : PluginBase(
|
) : PluginBase(
|
||||||
PluginDescription()
|
PluginDescription()
|
||||||
|
@ -146,6 +150,18 @@ class GlunovoPlugin @Inject constructor(
|
||||||
xDripBroadcast.send(it)
|
xDripBroadcast.send(it)
|
||||||
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
|
aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
|
||||||
}
|
}
|
||||||
|
savedValues.calibrationsInserted.forEach { calibration ->
|
||||||
|
calibration.glucose?.let { glucosevalue ->
|
||||||
|
uel.log(
|
||||||
|
UserEntry.Action.CAREPORTAL,
|
||||||
|
UserEntry.Sources.Dexcom,
|
||||||
|
ValueWithUnit.Timestamp(calibration.timestamp),
|
||||||
|
ValueWithUnit.TherapyEventType(calibration.type),
|
||||||
|
ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString())
|
||||||
|
)
|
||||||
|
}
|
||||||
|
aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue