feat: [ANDROAPP-5794] sonar fix

dhis2 · Feb 23, 2024 · afd699e · afd699e
1 parent 31ae15a
commit afd699e
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 64 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt b/app/src/main/java/org/dhis2/usescases/events/ScheduledEventActivity.kt
@@ -17,6 +17,7 @@ import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventDa
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventInputDateUiModel
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvideInputDate
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvidePeriodSelector
+import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.willShowCalendar
 import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity
 import org.dhis2.usescases.general.ActivityGlobalAbstract
 import org.dhis2.utils.DateUtils
@@ -109,7 +110,7 @@ class ScheduledEventActivity : ActivityGlobalAbstract(), ScheduledEventContract.
                         dateValue = DateUtils.uiDateFormat().format(event.dueDate() ?: ""),
                     )
 
-                    if (programStage.periodType() == null || (programStage.periodType() != null && programStage.periodType() == PeriodType.Daily)) {
+                    if (willShowCalendar(programStage.periodType())) {
                         ProvideInputDate(
                             EventInputDateUiModel(
                                 eventDate = eventDate,

diff --git a/...g/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/InputFieldsProvider.kt b/...g/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/InputFieldsProvider.kt
@@ -30,6 +30,7 @@ import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.common.Geometry
 import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.mobile.ui.designsystem.component.Coordinates
 import org.hisp.dhis.mobile.ui.designsystem.component.DateTimeActionType
 import org.hisp.dhis.mobile.ui.designsystem.component.DropdownInputField
@@ -439,6 +440,10 @@ fun ProvideRadioButtons(
     }
 }
 
+fun willShowCalendar(periodType: PeriodType?): Boolean {
+    return (periodType == null || periodType == PeriodType.Daily)
+}
+
 const val INPUT_EVENT_INITIAL_DATE = "INPUT_EVENT_INITIAL_DATE"
 const val EMPTY_CATEGORY_SELECTOR = "EMPTY_CATEGORY_SELECTOR"
 const val CATEGORY_SELECTOR = "CATEGORY_SELECTOR"

diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingDialogUi.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dialogs/scheduling/SchedulingDialogUi.kt
@@ -13,12 +13,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import org.dhis2.R
+import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventCatCombo
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventCatComboUiModel
+import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventDate
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.models.EventInputDateUiModel
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvideCategorySelector
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvideInputDate
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.ProvidePeriodSelector
-import org.hisp.dhis.android.core.period.PeriodType
+import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.providers.willShowCalendar
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.mobile.ui.designsystem.component.BottomSheetShell
 import org.hisp.dhis.mobile.ui.designsystem.component.Button
@@ -91,67 +93,14 @@ fun SchedulingDialogUi(
                     },
                 )
                 if (scheduleNew) {
-                    if (programStages.size > 1) {
-                        InputDropDown(
-                            title = stringResource(id = R.string.program_stage),
-                            state = InputShellState.UNFOCUSED,
-                            dropdownItems = programStages.map { DropdownItem(it.displayName().orEmpty()) },
-                            selectedItem = DropdownItem(selectedProgramStage.displayName().orEmpty()),
-                            onResetButtonClicked = {},
-                            onItemSelected = { item ->
-                                programStages.find { it.displayName() == item.label }
-                                    ?.let { viewModel.updateStage(it) }
-                            },
-                        )
-                    }
-
-                    if (selectedProgramStage.periodType() == null || (selectedProgramStage.periodType() != null && selectedProgramStage.periodType() == PeriodType.Daily)) {
-                        ProvideInputDate(
-                            EventInputDateUiModel(
-                                eventDate = date,
-                                detailsEnabled = true,
-                                onDateClick = {},
-                                onDateSelected = { viewModel.onDateSet(it.year, it.month, it.day) },
-                                onClear = { viewModel.onClearEventReportDate() },
-                            ),
-                        )
-                    } else {
-                        ProvidePeriodSelector(
-                            uiModel = EventInputDateUiModel(
-                                eventDate = date,
-                                detailsEnabled = true,
-                                onDateClick = { viewModel.showPeriodDialog() },
-                                onDateSelected = {},
-                                onClear = { viewModel.onClearEventReportDate() },
-                                required = true,
-                                showField = date.active,
-                                selectableDates = viewModel.getSelectableDates(),
-                            ),
-                            modifier = Modifier,
-                        )
-                    }
-
-                    if (!catCombo.isDefault) {
-                        catCombo.categories.forEach { category ->
-                            ProvideCategorySelector(
-                                eventCatComboUiModel = EventCatComboUiModel(
-                                    category = category,
-                                    eventCatCombo = catCombo,
-                                    detailsEnabled = true,
-                                    currentDate = date.currentDate,
-                                    selectedOrgUnit = orgUnitUid,
-                                    onClearCatCombo = { viewModel.onClearCatCombo() },
-                                    onOptionSelected = {
-                                        val selectedOption = Pair(category.uid, it?.uid())
-                                        viewModel.setUpCategoryCombo(selectedOption)
-                                    },
-                                    required = true,
-                                    noOptionsText = stringResource(R.string.no_options),
-                                    catComboText = stringResource(R.string.cat_combo),
-                                ),
-                            )
-                        }
-                    }
+                    ProvideScheduleNewEventForm(
+                        programStages = programStages,
+                        viewModel = viewModel,
+                        selectedProgramStage = selectedProgramStage,
+                        date = date,
+                        catCombo = catCombo,
+                        orgUnitUid = orgUnitUid,
+                    )
                 }
             }
         },
@@ -172,3 +121,75 @@ fun buttonTitle(scheduleNew: Boolean): String = when (scheduleNew) {
     true -> stringResource(id = R.string.schedule)
     false -> stringResource(id = R.string.done)
 }
+
+@Composable
+fun ProvideScheduleNewEventForm(
+    programStages: List<ProgramStage>,
+    viewModel: SchedulingViewModel,
+    selectedProgramStage: ProgramStage,
+    date: EventDate,
+    catCombo: EventCatCombo,
+    orgUnitUid: String?,
+) {
+    if (programStages.size > 1) {
+        InputDropDown(
+            title = stringResource(id = R.string.program_stage),
+            state = InputShellState.UNFOCUSED,
+            dropdownItems = programStages.map { DropdownItem(it.displayName().orEmpty()) },
+            selectedItem = DropdownItem(selectedProgramStage.displayName().orEmpty()),
+            onResetButtonClicked = {},
+            onItemSelected = { item ->
+                programStages.find { it.displayName() == item.label }
+                    ?.let { viewModel.updateStage(it) }
+            },
+        )
+    }
+
+    if (willShowCalendar(selectedProgramStage.periodType())) {
+        ProvideInputDate(
+            EventInputDateUiModel(
+                eventDate = date,
+                detailsEnabled = true,
+                onDateClick = {},
+                onDateSelected = { viewModel.onDateSet(it.year, it.month, it.day) },
+                onClear = { viewModel.onClearEventReportDate() },
+            ),
+        )
+    } else {
+        ProvidePeriodSelector(
+            uiModel = EventInputDateUiModel(
+                eventDate = date,
+                detailsEnabled = true,
+                onDateClick = { viewModel.showPeriodDialog() },
+                onDateSelected = {},
+                onClear = { viewModel.onClearEventReportDate() },
+                required = true,
+                showField = date.active,
+                selectableDates = viewModel.getSelectableDates(),
+            ),
+            modifier = Modifier,
+        )
+    }
+
+    if (!catCombo.isDefault) {
+        catCombo.categories.forEach { category ->
+            ProvideCategorySelector(
+                eventCatComboUiModel = EventCatComboUiModel(
+                    category = category,
+                    eventCatCombo = catCombo,
+                    detailsEnabled = true,
+                    currentDate = date.currentDate,
+                    selectedOrgUnit = orgUnitUid,
+                    onClearCatCombo = { viewModel.onClearCatCombo() },
+                    onOptionSelected = {
+                        val selectedOption = Pair(category.uid, it?.uid())
+                        viewModel.setUpCategoryCombo(selectedOption)
+                    },
+                    required = true,
+                    noOptionsText = stringResource(R.string.no_options),
+                    catComboText = stringResource(R.string.cat_combo),
+                ),
+            )
+        }
+    }
+}
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/inputfield/DateProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/inputfield/DateProvider.kt
@@ -53,7 +53,9 @@ fun ProvideInputDate(
             },
         )
     }
-    val yearIntRange = if (fieldUiModel.allowFutureDates == true) IntRange(1924, 2124) else (IntRange(1924, Calendar.getInstance().get(Calendar.YEAR)))
+    val yearIntRange = if (fieldUiModel.allowFutureDates == true) IntRange(1924, 2124) else (IntRange(1924,
+        Calendar.getInstance()[Calendar.YEAR]
+    ))
     val selectableDates = if (fieldUiModel.allowFutureDates == true) {
         SelectableDates(initialDate = DEFAULT_MIN_DATE, endDate = DEFAULT_MAX_DATE)
     } else {