caspervk/AndroidAPS
1
Code Releases Activity

- problem with evaluating Rewing/NoDelivery records

Browse source
This commit is contained in:
Andy Rozman 2021-06-26 17:12:03 +01:00
parent e30c5162ef
commit c8d11c375a
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
View file

@ -349,7 +349,7 @@ class MedtronicHistoryData @Inject constructor(
aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TBRs Processed [count=%d, items=%s]", tbrs.size, gson.toJson(tbrs))) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TBRs Processed [count=%d, items=%s]", tbrs.size, gson.toJson(tbrs)))
if (tbrs.isNotEmpty()) { if (tbrs.isNotEmpty()) {
try { try {
processTBREntries(tbrs) // TODO not implemented yet processTBREntries(tbrs)
} catch (ex: Exception) { } catch (ex: Exception) {
aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing TBR entries: " + ex.message, ex) aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing TBR entries: " + ex.message, ex)
throw ex throw ex
@ -836,6 +836,9 @@ class MedtronicHistoryData @Inject constructor(
private fun getSuspendResumeRecordsList(): List<TempBasalProcessDTO> { private fun getSuspendResumeRecordsList(): List<TempBasalProcessDTO> {
val filteredItems = getFilteredItems(newHistory, // val filteredItems = getFilteredItems(newHistory, //
setOf(PumpHistoryEntryType.SuspendPump, PumpHistoryEntryType.ResumePump)) setOf(PumpHistoryEntryType.SuspendPump, PumpHistoryEntryType.ResumePump))
aapsLogger.debug(LTag.PUMP, "SuspendResume Records: $filteredItems")
val outList: MutableList<TempBasalProcessDTO> = mutableListOf() val outList: MutableList<TempBasalProcessDTO> = mutableListOf()
if (filteredItems.size > 0) { if (filteredItems.size > 0) {
val filtered2Items: MutableList<PumpHistoryEntry> = mutableListOf() val filtered2Items: MutableList<PumpHistoryEntry> = mutableListOf()
@ -881,7 +884,8 @@ class MedtronicHistoryData @Inject constructor(
tbrProcess.itemTwo = filtered2Items[i + 1] tbrProcess.itemTwo = filtered2Items[i + 1]
outList.add(tbrProcess) if (tbrProcess.itemTwo != null)
outList.add(tbrProcess)
i += 2 i += 2
} }
@ -893,6 +897,9 @@ class MedtronicHistoryData @Inject constructor(
private fun getNoDeliveryRewindPrimeRecordsList(): List<TempBasalProcessDTO> { private fun getNoDeliveryRewindPrimeRecordsList(): List<TempBasalProcessDTO> {
val primeItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory, // val primeItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory, //
setOf(PumpHistoryEntryType.Prime)) setOf(PumpHistoryEntryType.Prime))
aapsLogger.debug(LTag.PUMP, "Prime Records: $primeItems")
val outList: MutableList<TempBasalProcessDTO> = ArrayList() val outList: MutableList<TempBasalProcessDTO> = ArrayList()
if (primeItems.size == 0) return outList if (primeItems.size == 0) return outList
val filteredItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory, // val filteredItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory, //
@ -902,6 +909,9 @@ class MedtronicHistoryData @Inject constructor(
PumpHistoryEntryType.Bolus, PumpHistoryEntryType.Bolus,
PumpHistoryEntryType.TempBasalCombined) PumpHistoryEntryType.TempBasalCombined)
) )
aapsLogger.debug(LTag.PUMP, "Filtered Records: $filteredItems")
val tempData: MutableList<PumpHistoryEntry> = mutableListOf() val tempData: MutableList<PumpHistoryEntry> = mutableListOf()
var startedItems = false var startedItems = false
var finishedItems = false var finishedItems = false
@ -940,7 +950,8 @@ class MedtronicHistoryData @Inject constructor(
} }
showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson.toJson(tempData)) showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson.toJson(tempData))
var items: MutableList<PumpHistoryEntry> = getFilteredItems(tempData, PumpHistoryEntryType.Prime) var items: MutableList<PumpHistoryEntry> = getFilteredItems(tempData, PumpHistoryEntryType.Prime)
var itemTwo = items[0] val itemTwo = items[0]
items = getFilteredItems(tempData, PumpHistoryEntryType.NoDeliveryAlarm) items = getFilteredItems(tempData, PumpHistoryEntryType.NoDeliveryAlarm)
if (items.size > 0) { if (items.size > 0) {
val tbrProcess = TempBasalProcessDTO( val tbrProcess = TempBasalProcessDTO(
@ -951,19 +962,28 @@ class MedtronicHistoryData @Inject constructor(
tbrProcess.itemTwo = itemTwo tbrProcess.itemTwo = itemTwo
outList.add(tbrProcess) if (tbrProcess.itemTwo != null)
outList.add(tbrProcess)
return outList return outList
} }
items = getFilteredItems(tempData, PumpHistoryEntryType.Rewind) items = getFilteredItems(tempData, PumpHistoryEntryType.Rewind)
if (items.size > 0) { if (items.size > 0) {
outList.add(TempBasalProcessDTO( val tbrProcess = TempBasalProcessDTO(
itemOne = items[0], itemOne = items[0],
processOperation = TempBasalProcessDTO.Operation.Add, processOperation = TempBasalProcessDTO.Operation.Add,
aapsLogger = aapsLogger, aapsLogger = aapsLogger,
objectType = TempBasalProcessDTO.ObjectType.Suspend)) objectType = TempBasalProcessDTO.ObjectType.Suspend)
tbrProcess.itemTwo = itemTwo
if (tbrProcess.itemTwo != null)
outList.add(tbrProcess)
return outList return outList
} }
return outList return outList
} }