fix: add options for boolean valueType and orientation

Signed-off-by: Manu Muñoz <[email protected]>

Author: mmmateos

app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt

@@ -269,6 +269,7 @@ fun SearchParametersScreen(
                                                     ),
                                                 )
                                             },
+                                            resourceManager = resourceManager,
                                         ),
                                     // TODO is this always the same string?, check if it is optional somewhere
                                     helperText = resourceManager.getString(R.string.optional),

app/src/main/java/org/dhis2/usescases/searchTrackEntity/searchparameters/mapper/ParameterInputModelMapper.kt

@@ -7,7 +7,11 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.google.common.primitives.Booleans
+import org.dhis2.commons.resources.ResourceManager
+import org.dhis2.form.R
 import org.dhis2.form.model.FieldUiModel
+import org.dhis2.form.model.OptionSetConfiguration
 import org.dhis2.form.model.PeriodSelector
 import org.dhis2.form.model.UiRenderType
 import org.dhis2.tracker.ui.input.model.TrackerInputModel
@@ -16,11 +20,13 @@ import org.dhis2.tracker.ui.input.model.TrackerOptionItem
 import org.dhis2.tracker.ui.input.model.TrackerOptionSetConfiguration
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.mobile.ui.designsystem.component.LegendData
+import org.hisp.dhis.mobile.ui.designsystem.component.Orientation
 
 @Composable
 fun FieldUiModel.toParameterInputModel(
     onValueChange: (String?) -> Unit,
     fetchOptions: () -> Unit,
+    resourceManager: ResourceManager,
 ): TrackerInputModel {
     val trackerInputType =
         when {
@@ -60,8 +66,12 @@ fun FieldUiModel.toParameterInputModel(
                     popUpLegendDescriptionData = it.legendsInfo,
                 )
             },
+        orientation = renderingType.getOrientation(),
         optionSetConfiguration =
-            optionSetConfiguration?.toTrackerOptionSetConfiguration(fetchOptions),
+            when (valueType) {
+                ValueType.BOOLEAN -> getBooleanOptionConfiguration(resourceManager)
+                else -> optionSetConfiguration?.toTrackerOptionSetConfiguration(fetchOptions)
+            },
         onItemClick = { onItemClick() },
         onValueChange = onValueChange,
     )
@@ -174,3 +184,27 @@ private fun getInputTypeByValueType(
         null,
         -> TrackerInputType.NOT_SUPPORTED
     }
+
+private fun UiRenderType?.getOrientation(): Orientation =
+    when (this) {
+        UiRenderType.HORIZONTAL_CHECKBOXES,
+        UiRenderType.HORIZONTAL_RADIOBUTTONS,
+        -> Orientation.HORIZONTAL
+
+        else -> Orientation.VERTICAL
+    }
+
+private fun getBooleanOptionConfiguration(resourceManager: ResourceManager) =
+    TrackerOptionSetConfiguration(
+        options =
+            listOf(
+                TrackerOptionItem(
+                    true.toString(),
+                    resourceManager.getString(R.string.yes),
+                ),
+                TrackerOptionItem(
+                    false.toString(),
+                    resourceManager.getString(R.string.no),
+                ),
+            ),
+    )

tracker/src/commonMain/kotlin/org/dhis2/tracker/search/ui/provider/TrackerCheckboxInputProvider.kt

@@ -8,7 +8,6 @@ import org.dhis2.tracker.ui.input.model.supportingText
 import org.hisp.dhis.mobile.ui.designsystem.component.CheckBoxData
 import org.hisp.dhis.mobile.ui.designsystem.component.InputCheckBox
 import org.hisp.dhis.mobile.ui.designsystem.component.InputStyle
-import org.hisp.dhis.mobile.ui.designsystem.component.Orientation
 
 @Composable
 fun TrackerCheckboxInputProvider(
@@ -40,7 +39,7 @@ fun TrackerCheckboxInputProvider(
         inputStyle = inputStyle,
         title = model.label,
         checkBoxData = data,
-        orientation = Orientation.VERTICAL,
+        orientation = model.orientation,
         state = model.inputState(),
         supportingText = model.supportingText(),
         legendData = model.legend,

tracker/src/commonMain/kotlin/org/dhis2/tracker/search/ui/provider/TrackerRadioButtonInputProvider.kt

@@ -7,7 +7,6 @@ import org.dhis2.tracker.ui.input.model.inputState
 import org.dhis2.tracker.ui.input.model.supportingText
 import org.hisp.dhis.mobile.ui.designsystem.component.InputRadioButton
 import org.hisp.dhis.mobile.ui.designsystem.component.InputStyle
-import org.hisp.dhis.mobile.ui.designsystem.component.Orientation
 import org.hisp.dhis.mobile.ui.designsystem.component.RadioButtonData
 
 @Composable
@@ -40,7 +39,7 @@ fun TrackerRadioButtonInputProvider(
         inputStyle = inputStyle,
         title = model.label,
         radioButtonData = data,
-        orientation = Orientation.VERTICAL,
+        orientation = model.orientation,
         state = model.inputState(),
         supportingText = model.supportingText(),
         legendData = model.legend,

tracker/src/commonMain/kotlin/org/dhis2/tracker/ui/input/model/TrackerInputModel.kt

@@ -2,6 +2,7 @@ package org.dhis2.tracker.ui.input.model
 
 import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
 import org.hisp.dhis.mobile.ui.designsystem.component.LegendData
+import org.hisp.dhis.mobile.ui.designsystem.component.Orientation
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextData
 import org.hisp.dhis.mobile.ui.designsystem.component.SupportingTextState
 
@@ -18,6 +19,7 @@ data class TrackerInputModel(
     val mandatory: Boolean,
     val editable: Boolean,
     val legend: LegendData?,
+    val orientation: Orientation,
     val optionSetConfiguration: TrackerOptionSetConfiguration? = null,
     val onItemClick: () -> Unit,
     val onValueChange: (String?) -> Unit,