Adds search parameters with and / or logic (#57)

* Adds search parameters with and / or logic * Uses inline functions for search query * Adds filter paramers * Update Spotless fixes * Remove unused menu items'
opensrp · Apr 20, 2021 · eb690f8 · eb690f8
1 parent 382530f
commit eb690f8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/app/src/main/java/org/smartregister/fhircore/activity/PatientListActivity.kt b/app/src/main/java/org/smartregister/fhircore/activity/PatientListActivity.kt
@@ -18,9 +18,12 @@ package org.smartregister.fhircore.activity
 
 import android.content.Intent
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.widget.Button
+import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.TextView
 import android.widget.Toast
@@ -84,6 +87,19 @@ class PatientListActivity : AppCompatActivity() {
       syncResources()
     }
 
+    findViewById<EditText>(R.id.edit_text_search)
+      .addTextChangedListener(
+        object : TextWatcher {
+          override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+          override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            patientListViewModel.getSearchResults(s?.toString())
+          }
+
+          override fun afterTextChanged(s: Editable?) {}
+        }
+      )
+
     setupDrawerContent()
   }
 

diff --git a/app/src/main/java/org/smartregister/fhircore/viewmodel/PatientListViewModel.kt b/app/src/main/java/org/smartregister/fhircore/viewmodel/PatientListViewModel.kt
@@ -57,14 +57,22 @@ class PatientListViewModel(application: Application, private val fhirEngine: Fhi
     return liveObservations
   }
 
-  fun getSearchResults() {
+  fun getSearchResults(query: String? = null) {
     viewModelScope.launch {
       val searchResults: List<Patient> =
         fhirEngine.search {
           filter(Patient.ADDRESS_CITY) {
             prefix = ParamPrefixEnum.EQUAL
             value = "NAIROBI"
           }
+          apply {
+            if (query?.isNotBlank() == true) {
+              filter(Patient.FAMILY) {
+                prefix = ParamPrefixEnum.EQUAL
+                value = query.trim()
+              }
+            }
+          }
           sort(Patient.GIVEN, Order.ASCENDING)
           count = 100
           from = 0