fix feedback on delete program enrollments (#3537)

* fix feedback on delete program enrollments * fix lint error --------- Co-authored-by: Siddharth Agarwal <[email protected]>
dhis2 · Mar 14, 2024 · 79e5e8c · 79e5e8c
1 parent d8de29e
commit 79e5e8c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/DashboardViewModel.kt
@@ -139,7 +139,10 @@ class DashboardViewModel(
         }
     }
 
-    fun deleteEnrollment(onAuthorityError: () -> Unit) {
+    fun deleteEnrollment(
+        onSuccess: (Boolean?) -> Unit,
+        onAuthorityError: () -> Unit,
+    ) {
         viewModelScope.launch(dispatcher.io()) {
             val result = async {
                 dashboardModel.value.takeIf { it is DashboardEnrollmentModel }?.let {
@@ -148,7 +151,8 @@ class DashboardViewModel(
                 }
             }
             try {
-                result.await()
+                val hasMoreEnrollments = result.await()
+                onSuccess(hasMoreEnrollments)
             } catch (e: AuthorityException) {
                 onAuthorityError()
             } catch (e: Exception) {

diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardContracts.java
@@ -16,8 +16,6 @@ public interface View extends AbstractActivityContracts.View {
 
         void handleTeiDeletion();
 
-        void handleEnrollmentDeletion(Boolean hasMoreEnrollments);
-
         void authorityErrorMessage();
 
         void updateNoteBadge(int numberOfNotes);

diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
@@ -432,7 +432,7 @@ class TeiDashboardMobileActivity :
         finish()
     }
 
-    override fun handleEnrollmentDeletion(hasMoreEnrollments: Boolean) {
+    fun handleEnrollmentDeletion(hasMoreEnrollments: Boolean) {
         if (hasMoreEnrollments) {
             startActivity(intent(this, teiUid, null, null))
             finish()
@@ -694,7 +694,16 @@ class TeiDashboardMobileActivity :
                 ),
                 mainButtonText = getString(R.string.remove),
                 onMainButtonClick = {
-                    dashboardViewModel.deleteEnrollment { authorityErrorMessage() }
+                    binding.toolbarProgress.show()
+                    dashboardViewModel.deleteEnrollment(
+                        onSuccess = {
+                            binding.toolbarProgress.hide()
+                            handleEnrollmentDeletion(it == true)
+                        },
+                        onAuthorityError = {
+                            authorityErrorMessage()
+                        },
+                    )
                 },
             ).show(
                 supportFragmentManager,

diff --git a/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DeleteBottomSheetDialog.kt b/ui-components/src/main/java/org/dhis2/ui/dialogs/bottomsheet/DeleteBottomSheetDialog.kt
@@ -81,7 +81,10 @@ DeleteBottomSheetDialog(
                                     },
                                     text = mainButtonText,
                                     colorStyle = ColorStyle.ERROR,
-                                    onClick = onMainButtonClick,
+                                    onClick = {
+                                        dismiss()
+                                        onMainButtonClick()
+                                    },
                                     modifier = Modifier
                                         .fillMaxWidth(),
                                 )