add tag value statistics

Author: Razeeman

core/common/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTagValueMapper.kt

@@ -9,7 +9,7 @@ class RecordTagValueMapper @Inject constructor(
 ) {
 
     fun map(value: Double): String {
-        // TODO TAG do better?
+        // TODO do better?
         return value.toBigDecimal().stripTrailingZeros().toPlainString()
     }
 

domain/common/src/main/java/com/example/util/simpletimetracker/domain/extension/CommonDomainExtensions.kt

@@ -15,6 +15,8 @@ fun Int?.orZero(): Int = this ?: 0
 
 fun Float?.orZero(): Float = this ?: 0f
 
+fun Double?.orZero(): Double = this ?: 0.0
+
 fun <T> List<T>?.orEmpty(): List<T> = this ?: emptyList()
 
 fun <T> List<T>.rotateLeft(n: Int): List<T> = drop(n) + take(n)

features/feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/interactor/ChangeRecordTagViewDataInteractor.kt

@@ -67,7 +67,6 @@ class ChangeRecordTagViewDataInteractor @Inject constructor(
         val result = mutableListOf<ViewHolderType>()
 
         result += HintViewData(
-            // TODO TAG change hint
             text = resourceRepo.getString(R.string.change_record_type_value_type_hint),
         )
         result += ButtonsRowItemViewData(

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/interactor/RecordQuickActionsInteractor.kt

@@ -69,7 +69,6 @@ class RecordQuickActionsInteractor @Inject constructor(
             val records = recordIds
                 .mapNotNull { recordInteractor.get(it) }
                 .filter {
-                    // TODO TAG translate strings
                     it.tags.sortedBy(RecordBase.Tag::tagId) !=
                         newTags.sortedBy(RecordBase.Tag::tagId)
                 }

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/typesSelection/viewModel/TypesSelectionViewModel.kt

@@ -79,7 +79,6 @@ class TypesSelectionViewModel @Inject constructor(
             )
 
         if (needValueSelection) {
-            // TODO TAG add to statistics
             RecordTagValueSelectionParams(
                 tag = CHANGE_RECORD_TAG_VALUE_SELECTION,
                 tagId = item.id,

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/external/ExternalBroadcastInteractor.kt

@@ -232,7 +232,7 @@ class ExternalBroadcastInteractor @Inject constructor(
         return ids.map {
             RecordBase.Tag(
                 tagId = it,
-                numericValue = null, // TODO TAG value selection?
+                numericValue = null, // TODO value selection?
             )
         }
     }

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailBlock.kt

@@ -38,6 +38,12 @@ enum class StatisticsDetailBlock : ButtonsRowItemViewData.ButtonsRowId {
     GoalChartLength,
     GoalRangeAverages,
     GoalTotals,
+    TagValuesHint,
+    TagValuesChartData,
+    TagValuesChartGrouping,
+    TagValuesChartLength,
+    TagValuesRangeAverages,
+    TagValuesTotals,
     DataDistributionHint,
     DataDistributionPieChart,
     DataDistributionBarChart,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/conts/StatisticsDetailConsts.kt

@@ -0,0 +1,3 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.conts
+
+internal const val TAG_VALUE_PRECISION = 1000

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailChartInteractor.kt

@@ -20,6 +20,7 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTyp
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
+import com.example.util.simpletimetracker.feature_statistics_detail.conts.TAG_VALUE_PRECISION
 import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailViewDataMapper
 import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartBarDataDuration
 import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartBarDataRange
@@ -33,6 +34,7 @@ import kotlinx.coroutines.withContext
 import java.util.Calendar
 import javax.inject.Inject
 import kotlin.math.abs
+import kotlin.math.roundToLong
 
 class StatisticsDetailChartInteractor @Inject constructor(
     private val timeMapper: TimeMapper,
@@ -196,10 +198,17 @@ class StatisticsDetailChartInteractor @Inject constructor(
             }
         }
 
-        fun mapRangesToValue(list: List<Range>): Long {
+        fun mapRangesToValue(list: List<RecordBase>, range: Range): Long {
             return when (chartMode) {
-                ChartMode.DURATIONS -> rangeMapper.mapToDuration(list)
+                ChartMode.DURATIONS -> list
+                    .map { record -> rangeMapper.clampToRange(record, range) }
+                    .let(rangeMapper::mapToDuration)
                 ChartMode.COUNTS -> list.size.toLong()
+                ChartMode.TAG_VALUE -> list
+                    .sumOf { record ->
+                        record.tags.sumOf { it.numericValue.orZero() * TAG_VALUE_PRECISION }
+                    }
+                    .roundToLong()
             }
         }
 
@@ -219,17 +228,15 @@ class StatisticsDetailChartInteractor @Inject constructor(
             .map { data ->
                 val range = Range(data.rangeStart, data.rangeEnd)
                 val durations = if (!splitByActivity) {
-                    rangeMapper.getRecordsFromRange(records, range)
-                        .map { record -> rangeMapper.clampToRange(record, range) }
-                        .let(::mapRangesToValue)
-                        .let { listOf(it to 0) }
+                    val clampedRecords = rangeMapper.getRecordsFromRange(records, range)
+                    val value = mapRangesToValue(clampedRecords, range)
+                    listOf(value to 0)
                 } else {
                     rangeMapper.getRecordsFromRange(records, range)
                         .groupBy { it.typeIds.firstOrNull().orZero() }
                         .toList()
                         .map { (id, records) ->
-                            val value = records.map { record -> rangeMapper.clampToRange(record, range) }
-                                .let(::mapRangesToValue)
+                            val value = mapRangesToValue(records, range)
                             value to id
                         }
                         .run {

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailContentInteractor.kt

@@ -24,6 +24,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.viewData.Sta
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailStatsViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailStreaksViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailTagValuesCompositeViewData
 import javax.inject.Inject
 
 class StatisticsDetailContentInteractor @Inject constructor(
@@ -46,6 +47,7 @@ class StatisticsDetailContentInteractor @Inject constructor(
         nextActivitiesViewData: List<ViewHolderType>?,
         goalsViewData: StatisticsDetailGoalsCompositeViewData?,
         dataDistributionViewData: StatisticsDetailDataDistributionViewData?,
+        tagValueViewData: StatisticsDetailTagValuesCompositeViewData?,
     ): List<ViewHolderType> {
         val result = mutableListOf<ViewHolderType>()
 
@@ -300,6 +302,14 @@ class StatisticsDetailContentInteractor @Inject constructor(
 
         result += goalsViewData?.viewData.orEmpty()
 
+        result += tagValueViewData?.viewData.orEmpty().map {
+            if (it is StatisticsDetailBarChartViewData) {
+                it.copy(singleColor = getPreviewColor())
+            } else {
+                it
+            }
+        }
+
         result += dataDistributionViewData?.splitData.orEmpty()
 
         return result