search scope must return search and capture org units

Signed-off-by: Pablo <[email protected]>
dhis2 · Apr 26, 2024 · 70e3b29 · 70e3b29
1 parent 74f69ea
commit 70e3b29
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/...ava/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt b/...ava/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt
@@ -239,7 +239,11 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
                         detailsEnabled = details.enabled,
                         onDateClick = {},
                         onDateSelected = { dateValues ->
-                            viewModel.onDateSet(dateValues.year, dateValues.month - 1, dateValues.day)
+                            viewModel.onDateSet(
+                                dateValues.year,
+                                dateValues.month - 1,
+                                dateValues.day,
+                            )
                         },
                         onClear = { viewModel.onClearEventReportDate() },
                         required = true,
@@ -298,7 +302,10 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
                     )
                 }
             } else if (!catCombo.isDefault) {
-                ProvideEmptyCategorySelector(name = catCombo.displayName ?: getString(R.string.cat_combo), option = getString(R.string.no_options))
+                ProvideEmptyCategorySelector(
+                    name = catCombo.displayName ?: getString(R.string.cat_combo),
+                    option = getString(R.string.no_options),
+                )
             }
             ProvideCoordinates(
                 coordinates = coordinates,
@@ -339,7 +346,20 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
             )
             .singleSelection()
             .orgUnitScope(
-                OrgUnitSelectorScope.ProgramCaptureScope(viewModel.eventOrgUnit.value.programUid!!),
+                when (getEventCreationType(requireArguments().getString(EVENT_CREATION_TYPE))) {
+                    EventCreationType.REFERAL ->
+                        OrgUnitSelectorScope.ProgramSearchScope(
+                            viewModel.eventOrgUnit.value.programUid!!,
+                        )
+
+                    EventCreationType.DEFAULT,
+                    EventCreationType.ADDNEW,
+                    EventCreationType.SCHEDULE,
+                    ->
+                        OrgUnitSelectorScope.ProgramCaptureScope(
+                            viewModel.eventOrgUnit.value.programUid!!,
+                        )
+                },
             )
             .onSelection { selectedOrgUnits ->
                 viewModel.setUpOrgUnit(selectedOrgUnit = selectedOrgUnits.firstOrNull()?.uid())