Reset data filter queries on filter questionnaire launch (#3432)

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
opensrp · Aug 6, 2024 · 490c294 · 490c294
1 parent c186468
commit 490c294
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
@@ -186,6 +186,13 @@ open class AppMainActivity : BaseMultiLanguageActivity(), QuestionnaireHandler,
     findNavController(R.id.nav_host).removeOnDestinationChangedListener(sentryNavListener)
   }
 
+  override fun onQuestionnaireLaunched(questionnaireConfig: QuestionnaireConfig) {
+    // Data filter QRs are not persisted; reset filters when questionnaire is launched
+    if (!questionnaireConfig.saveQuestionnaireResponse) {
+      appMainViewModel.resetRegisterFilters.value = true
+    }
+  }
+
   override suspend fun onSubmitQuestionnaire(activityResult: ActivityResult) {
     if (activityResult.resultCode == RESULT_OK) {
       val questionnaireResponse: QuestionnaireResponse? =

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.core.os.bundleOf
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkManager
@@ -110,6 +111,8 @@ constructor(
 
   val appDrawerUiState = mutableStateOf(AppDrawerUIState())
 
+  val resetRegisterFilters = MutableLiveData(false)
+
   val unSyncedResourcesCount = mutableIntStateOf(0)
 
   val applicationConfiguration: ApplicationConfiguration by lazy {

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/AppDrawer.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/AppDrawer.kt
@@ -482,8 +482,8 @@ private fun SideMenuItem(
     modifier =
       modifier
         .fillMaxWidth()
-        .padding(vertical = padding.dp)
         .clickable { onSideMenuClick() }
+        .padding(vertical = padding.dp)
         .testTag(SIDE_MENU_ITEM_MAIN_ROW_TEST_TAG)
         .padding(horizontal = 16.dp),
     verticalAlignment = Alignment.CenterVertically,

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/register/RegisterFragment.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/register/RegisterFragment.kt
@@ -260,6 +260,14 @@ class RegisterFragment : Fragment(), OnSyncListener {
           .launchIn(lifecycleScope)
       }
     }
+
+    appMainViewModel.resetRegisterFilters.observe(viewLifecycleOwner) { resetFilters ->
+      if (resetFilters) {
+        registerViewModel.registerFilterState.value = RegisterFilterState()
+        refreshRegisterData()
+        appMainViewModel.resetRegisterFilters.value = false
+      }
+    }
   }
 
   override fun onPause() {

diff --git a/...id/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt b/...id/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/QuestionnaireHandler.kt
@@ -48,8 +48,11 @@ interface QuestionnaireHandler {
           )
           .putExtras(extraIntentBundle),
       )
+      onQuestionnaireLaunched(questionnaireConfig)
     }
   }
 
+  fun onQuestionnaireLaunched(questionnaireConfig: QuestionnaireConfig)
+
   suspend fun onSubmitQuestionnaire(activityResult: ActivityResult)
 }