refactor: [ANDROAPP-6170] Remove OpenYearMonthDayAgeCalendar UiEventType

Signed-off-by: andresmr <[email protected]>
dhis2 · May 28, 2024 · 9d1701b · 9d1701b
1 parent 69dffbb
commit 9d1701b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt b/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
@@ -35,7 +35,6 @@ import org.dhis2.ui.dialogs.bottomsheet.BottomSheetDialogUiModel
 import org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle.DiscardButton
 import org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle.MainButton
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.eventCaptureFragment.EventCaptureFormFragment
-import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.eventCaptureFragment.OnEditionListener
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.model.EventCompletionDialog
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.injection.EventDetailsComponent
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.injection.EventDetailsComponentProvider
@@ -90,7 +89,6 @@ class EventCaptureActivity :
     private var teiUid: String? = null
     private var enrollmentUid: String? = null
     private val relationshipMapButton: LiveData<Boolean> = MutableLiveData(false)
-    private var onEditionListener: OnEditionListener? = null
     private var adapter: EventCapturePagerAdapter? = null
     private var eventViewPager: ViewPager2? = null
     private var dashboardViewModel: DashboardViewModel? = null
@@ -243,9 +241,6 @@ class EventCaptureActivity :
 
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
-        if (onEditionListener != null) {
-            onEditionListener!!.onEditionListener()
-        }
         finishEditMode()
     }
 
@@ -505,10 +500,6 @@ class EventCaptureActivity :
         // there are no relationships on events
     }
 
-    fun setFormEditionListener(onEditionListener: OnEditionListener?) {
-        this.onEditionListener = onEditionListener
-    }
-
     override fun provideEventDetailsComponent(module: EventDetailsModule?): EventDetailsComponent? {
         return eventCaptureComponent!!.plus(module)
     }

diff --git a/...eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java b/...eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java
@@ -34,8 +34,7 @@
 
 import kotlin.Unit;
 
-public class EventCaptureFormFragment extends FragmentGlobalAbstract implements EventCaptureFormView,
-        OnEditionListener {
+public class EventCaptureFormFragment extends FragmentGlobalAbstract implements EventCaptureFormView {
 
     @Inject
     EventCaptureFormPresenter presenter;
@@ -102,7 +101,6 @@ public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedI
                 .setRecords(new EventRecords(eventUid, eventMode))
                 .openErrorLocation(getArguments().getBoolean(OPEN_ERROR_LOCATION, false))
                 .build();
-        activity.setFormEditionListener(this);
         super.onCreate(savedInstanceState);
     }
 
@@ -163,11 +161,6 @@ public void performSaveClick() {
         formView.onSaveClick();
     }
 
-    @Override
-    public void onEditionListener() {
-
-    }
-
     @Override
     public void hideSaveButton() {
         binding.actionButton.setVisibility(View.GONE);

diff --git a/...sescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/OnEditionListener.kt b/...sescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/OnEditionListener.kt
diff --git a/form/src/main/java/org/dhis2/form/ui/mapper/FormSectionMapper.kt b/form/src/main/java/org/dhis2/form/ui/mapper/FormSectionMapper.kt
@@ -27,7 +27,7 @@ class FormSectionMapper {
                                 null -> SectionState.FIXED
                             },
                             fields = fields,
-                            warningMessage = if (item.isOpen != false && fields.isEmpty()) {
+                            warningMessage = if (fields.isEmpty()) {
                                 R.string.form_without_fields
                             } else {
                                 null