feat: [ANDROAPP-5683] legend description

dhis2 · Feb 5, 2024 · ea22a60 · ea22a60
1 parent e028271
commit ea22a60
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 273 deletions.
diff --git a/...a/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureFieldProvider.kt b/...a/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureFieldProvider.kt
diff --git a/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt b/form/src/main/java/org/dhis2/form/extensions/FieldUiModelExtensions.kt
@@ -31,7 +31,7 @@ fun FieldUiModel.supportingText() = listOfNotNull(
 ).ifEmpty { null }
 
 fun FieldUiModel.legend() = legend?.let {
-    LegendData(Color(it.color), it.label ?: "", null)
+    LegendData(Color(it.color), it.label ?: "", it.legendsInfo)
 }
 
 fun FieldUiModel.orientation() = when (renderingType) {

diff --git a/form/src/main/java/org/dhis2/form/model/LegendValue.kt b/form/src/main/java/org/dhis2/form/model/LegendValue.kt
@@ -1,3 +1,9 @@
 package org.dhis2.form.model
 
-data class LegendValue(val color: Int, val label: String?)
+import org.hisp.dhis.mobile.ui.designsystem.component.LegendDescriptionData
+
+data class LegendValue(
+    val color: Int,
+    val label: String?,
+    val legendsInfo: List<LegendDescriptionData>?,
+)
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/LegendValueProviderImpl.kt b/form/src/main/java/org/dhis2/form/ui/provider/LegendValueProviderImpl.kt
@@ -1,8 +1,10 @@
 package org.dhis2.form.ui.provider
 
+import androidx.compose.ui.graphics.Color
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.model.LegendValue
 import org.hisp.dhis.android.core.D2
+import org.hisp.dhis.mobile.ui.designsystem.component.LegendDescriptionData
 
 class LegendValueProviderImpl(
     val d2: D2,
@@ -30,10 +32,25 @@ class LegendValueProviderImpl(
                         .byLegendSet().eq(legendSet.uid())
                         .one()
                         .blockingGet()
+                    val legendValues = d2.legendSetModule()
+                        .legendSets()
+                        .withLegends()
+                        .uid(legendSet.uid())
+                        .blockingGet()
                     if (legend != null) {
                         return LegendValue(
                             resourceManager.getColorFrom(legend.color()),
                             legend.displayName(),
+                            legendValues?.legends()?.sortedBy { it.startValue() }?.map {
+                                LegendDescriptionData(
+                                    Color(resourceManager.getColorFrom(it.color())),
+                                    it.displayName() ?: "",
+                                    IntRange(
+                                        it.startValue()?.toInt() ?: 0,
+                                        it.endValue()?.toInt() ?: 0,
+                                    ),
+                                )
+                            },
                         )
                     }
                 }