From 523a9f280026aa35c557206b5484699e1bd2cd0e Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 6 Mar 2021 19:45:13 +0100
Subject: [PATCH] Add detailed information for Careportal entries

---
 .../nightscout/androidaps/dialogs/CareDialog.kt    | 14 +++++++++-----
 .../androidaps/logging/UserEntryLogger.kt          | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 80df9ce2c3..96bab1b369 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -54,6 +54,7 @@ class CareDialog : DialogFragmentWithDate() {
     }
 
     private var options: EventType = EventType.BGCHECK
+    private var valuesWithUnit = mutableListOf<ValueWithUnit>()
 
     @StringRes
     private var event: Int = R.string.none
@@ -178,11 +179,14 @@ class CareDialog : DialogFragmentWithDate() {
                 }
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype) + ": " + translator.translate(type))
             actions.add(resourceHelper.gs(R.string.treatments_wizard_bg_label) + ": " + Profile.toCurrentUnitsString(profileFunction, binding.bg.value) + " " + resourceHelper.gs(unitResId))
+            valuesWithUnit.add(ValueWithUnit(binding.bg.value.toDouble(), profileFunction.getUnits()))
+            valuesWithUnit.add(ValueWithUnit(type,Units.CPEvent))
             json.put("glucose", binding.bg.value)
             json.put("glucoseType", type)
         }
         if (options == EventType.NOTE || options == EventType.EXERCISE) {
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_duration_label) + ": " + resourceHelper.gs(R.string.format_mins, binding.duration.value.toInt()))
+            valuesWithUnit.add(ValueWithUnit(binding.duration.value.toInt(), Units.M))
             json.put("duration", binding.duration.value.toInt())
         }
         val notes = binding.notesLayout.notes.text.toString()
@@ -192,8 +196,10 @@ class CareDialog : DialogFragmentWithDate() {
         }
         eventTime -= eventTime % 1000
 
-        if (eventTimeChanged)
+        if (eventTimeChanged) {
             actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+            valuesWithUnit.add(0, ValueWithUnit(eventTime, Units.Timestamp))
+        }
 
         json.put("created_at", DateUtil.toISOString(eventTime))
         json.put("mills", eventTime)
@@ -224,11 +230,9 @@ class CareDialog : DialogFragmentWithDate() {
                     EventType.QUESTION       -> CareportalEvent.QUESTION
                     EventType.ANNOUNCEMENT   -> CareportalEvent.ANNOUNCEMENT
                 }
+                valuesWithUnit.add(if (eventTimeChanged) 1 else 0, ValueWithUnit(careportalEvent.eventType, Units.CPEvent))
                 careportalEvent.json = json.toString()
-                if (eventTimeChanged)
-                    uel.log(Action.CAREPORTAL, notes, ValueWithUnit(eventTime, Units.Timestamp), ValueWithUnit(careportalEvent.eventType, Units.CPEvent))
-                else
-                    uel.log(Action.CAREPORTAL, notes, ValueWithUnit(careportalEvent.eventType, Units.CPEvent))
+                uel.log(Action.CAREPORTAL, notes, valuesWithUnit)
                 databaseHelper.createOrUpdate(careportalEvent)
                 nsUpload.uploadCareportalEntryToNS(json, eventTime)
             }, null)
diff --git a/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt b/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
index 1cc1895c48..1ddbca4d7f 100644
--- a/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
+++ b/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
@@ -68,4 +68,18 @@ class UserEntryLogger @Inject constructor(
                 onComplete = { aapsLogger.debug("USER ENTRY: $action") }
             )
     }
+
+    fun log(action: Action, s: String = "",  values: MutableList<ValueWithUnit>) {
+        compositeDisposable += repository.runTransaction(UserEntryTransaction(
+            action = action,
+            s = s,
+            values = values
+        ))
+            .subscribeOn(aapsSchedulers.io)
+            .observeOn(aapsSchedulers.io)
+            .subscribeBy(
+                onError = { aapsLogger.debug("ERRORED USER ENTRY: $action $s $values") },
+                onComplete = { aapsLogger.debug("USER ENTRY: $action $s $values") }
+            )
+    }
 }
\ No newline at end of file