Merge pull request #3504 from dhis2/ANDROAPP-5919

andresmr · web-flow · commit 2bfc9bc5a6ed · 2024-03-06T16:10:29.000+01:00
feat: [ANDROAPP-5919] multiselection on dataset
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt
@@ -612,13 +612,7 @@ class DataValueRepository(
                 isNumber = dataElement.valueType()!!.isNumeric
             }
 
-            val options = dataElement.optionSetUid()?.let {
-                d2.optionModule().options()
-                    .byOptionSetUid().eq(it)
-                    .orderBySortOrder(RepositoryScope.OrderByDirection.ASC)
-                    .blockingGet()
-                    .map { option -> "${option.code()}_${option.displayName()}" }
-            } ?: emptyList()
+            val options = getOptionsForOptionSet(dataElement.optionSetUid())
 
             for (
             categoryOptionCombo in categorOptionCombos
@@ -1011,7 +1005,7 @@ class DataValueRepository(
             null,
             dataElement.displayDescription(),
             dataElement.uid(),
-            emptyList(),
+            getOptionsForOptionSet(dataElement.optionSetUid()),
             "android",
             0,
             0,
@@ -1035,4 +1029,12 @@ class DataValueRepository(
     fun getDataSetInfo(): Triple<String, String, String> {
         return Triple(periodId, orgUnitUid, attributeOptionComboUid)
     }
+
+    private fun getOptionsForOptionSet(optionSetUid: String?) = optionSetUid?.let {
+        d2.optionModule().options()
+            .byOptionSetUid().eq(it)
+            .orderBySortOrder(RepositoryScope.OrderByDirection.ASC)
+            .blockingGet()
+            .map { option -> "${option.code()}_${option.displayName()}" }
+    } ?: emptyList()
 }
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/MapFieldValueToUser.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/MapFieldValueToUser.kt
@@ -48,6 +48,9 @@ class MapFieldValueToUser(
                     field.value()
                 }
             }
+            ValueType.MULTI_TEXT -> field.value()?.split(", ")?.map { code ->
+                field.options().find { it.contains(code) }?.split("_")?.get(1)
+            }?.joinToString(", ")
             else -> field.value()
         }
     }
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/TableDataToTableModelMapper.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/TableDataToTableModelMapper.kt
@@ -8,6 +8,7 @@ import org.dhis2.composetable.model.TableHeaderCell
 import org.dhis2.composetable.model.TableHeaderRow
 import org.dhis2.composetable.model.TableModel
 import org.dhis2.composetable.model.TableRowModel
+import org.hisp.dhis.android.core.common.ValueType
 import java.util.SortedMap
 
 class TableDataToTableModelMapper(val mapFieldValueToUser: MapFieldValueToUser) {
@@ -50,6 +51,7 @@ class TableDataToTableModelMapper(val mapFieldValueToUser: MapFieldValueToUser)
                         mandatory = field.mandatory(),
                         error = field.error(),
                         warning = field.warning(),
+                        isMultiText = dataElement.valueType() == ValueType.MULTI_TEXT,
                     )
                 }.toMap(),
                 isLastRow = rowIndex == (tableData.rows()!!.size - 1),
diff --git a/app/src/main/java/org/dhis2/utils/customviews/OptionSetCellPopUp.java b/app/src/main/java/org/dhis2/utils/customviews/OptionSetCellPopUp.java
diff --git a/compose-table/build.gradle.kts b/compose-table/build.gradle.kts
@@ -53,4 +53,5 @@ dependencies {
     debugImplementation(libs.bundles.table.debugImplementation)
     testImplementation(libs.bundles.table.test)
     androidTestImplementation(libs.bundles.table.androidTest)
+    implementation(libs.dhis2.mobile.designsystem)
 }
diff --git a/compose-table/src/main/java/org/dhis2/composetable/model/TableCell.kt b/compose-table/src/main/java/org/dhis2/composetable/model/TableCell.kt
@@ -13,6 +13,7 @@ data class TableCell(
     val error: String? = null,
     val warning: String? = null,
     val legendColor: Int? = null,
+    val isMultiText: Boolean = false,
 ) {
 
     fun hasErrorOrWarning() = errorOrWarningMessage() != null
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/ItemValues.kt
@@ -20,6 +20,7 @@ fun ItemValues(
     overridenValues: Map<Int, TableCell>,
     headerExtraSize: Int,
     options: List<String>,
+    headerLabel: String,
 ) {
     Row(
         modifier = Modifier
@@ -42,6 +43,7 @@ fun ItemValues(
                         maxLines = maxLines,
                         headerExtraSize = headerExtraSize,
                         options = options,
+                        headerLabel = headerLabel,
                     )
                 }
             },
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/MultiOptionSelector.kt
@@ -0,0 +1,43 @@
+package org.dhis2.composetable.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import org.dhis2.composetable.R
+import org.dhis2.composetable.model.TableCell
+import org.hisp.dhis.mobile.ui.designsystem.component.CheckBoxData
+import org.hisp.dhis.mobile.ui.designsystem.component.MultiSelectBottomSheet
+
+@Composable
+fun MultiOptionSelector(
+    options: List<String>,
+    cell: TableCell,
+    title: String,
+    onSave: (String, String) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    MultiSelectBottomSheet(
+        items = options.map { option ->
+            val code = option.split("_")[0]
+            val label = option.split("_")[1]
+            CheckBoxData(
+                uid = code,
+                checked = cell.value?.contains(label) == true,
+                enabled = cell.editable,
+                textInput = label,
+            )
+        },
+        title = title,
+        noResultsFoundString = stringResource(R.string.no_results_found),
+        doneButtonText = stringResource(id = R.string.done),
+        onItemsSelected = { checkBoxes ->
+            val checkedCodes = checkBoxes
+                .filter { item -> item.checked }
+                .joinToString(", ") { it.uid }
+            val checkedValues = checkBoxes
+                .filter { item -> item.checked }
+                .joinToString(", ") { it.textInput?.text.orEmpty() }
+            onSave(checkedCodes, checkedValues)
+        },
+        onDismiss = onDismiss,
+    )
+}
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/TableCell.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/TableCell.kt
@@ -58,9 +58,11 @@ fun TableCell(
     maxLines: Int,
     headerExtraSize: Int,
     options: List<String>,
+    headerLabel: String,
 ) {
     val localInteraction = LocalInteraction.current
     val (dropDownExpanded, setExpanded) = remember { mutableStateOf(false) }
+    val (showMultiSelector, setShowMultiSelector) = remember { mutableStateOf(false) }
 
     var cellValue by remember {
         mutableStateOf<String?>(null)
@@ -138,7 +140,10 @@ fun TableCell(
             .fillMaxHeight()
             .clickable(cell.editable) {
                 when {
-                    options.isNotEmpty() -> setExpanded(true)
+                    options.isNotEmpty() -> when {
+                        cell.isMultiText -> setShowMultiSelector(true)
+                        else -> setExpanded(true)
+                    }
                     else -> {
                         localInteraction.onSelectionChange(
                             TableSelection.CellSelection(
@@ -195,6 +200,29 @@ fun TableCell(
                     cellValue = label
                 },
             )
+            if (showMultiSelector) {
+                MultiOptionSelector(
+                    options = options,
+                    cell = cell,
+                    title = headerLabel,
+                    onSave = { codes, values ->
+                        localInteraction.onSelectionChange(
+                            TableSelection.CellSelection(
+                                tableId = tableId,
+                                columnIndex = cell.column,
+                                rowIndex = cell.row ?: -1,
+                                globalIndex = 0,
+                            ),
+                        )
+                        cellValue = values
+                        localInteraction.onOptionSelected(cell, codes, values)
+                        setShowMultiSelector(false)
+                    },
+                    onDismiss = {
+                        setShowMultiSelector(false)
+                    },
+                )
+            }
         }
 
         if (cell.mandatory == true) {
diff --git a/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt b/compose-table/src/main/java/org/dhis2/composetable/ui/TableItemRow.kt
@@ -74,6 +74,7 @@ fun TableItemRow(
                     tableModel.tableHeaderModel.hasTotals,
                 ),
                 options = rowModel.dropDownOptions ?: emptyList(),
+                headerLabel = rowModel.rowHeader.title,
             )
         }
         if (!rowModel.isLastRow) {

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ class MapFieldValueToUser(`
`48`	`48`	`field.value()`
`49`	`49`	`}`
`50`	`50`	`}`
	`51`	`+ ValueType.MULTI_TEXT -> field.value()?.split(", ")?.map { code ->`
	`52`	`+ field.options().find { it.contains(code) }?.split("_")?.get(1)`
	`53`	`+ }?.joinToString(", ")`
`51`	`54`	`else -> field.value()`
`52`	`55`	`}`
`53`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,5 @@ dependencies {`
`53`	`53`	`debugImplementation(libs.bundles.table.debugImplementation)`
`54`	`54`	`testImplementation(libs.bundles.table.test)`
`55`	`55`	`androidTestImplementation(libs.bundles.table.androidTest)`
	`56`	`+ implementation(libs.dhis2.mobile.designsystem)`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ fun TableItemRow(`
`74`	`74`	`tableModel.tableHeaderModel.hasTotals,`
`75`	`75`	`),`
`76`	`76`	`options = rowModel.dropDownOptions ?: emptyList(),`
	`77`	`+ headerLabel = rowModel.rowHeader.title,`
`77`	`78`	`)`
`78`	`79`	`}`
`79`	`80`	`if (!rowModel.isLastRow) {`