filter only art

Author: sevenreup

android/engine/src/main/java/org/smartregister/fhircore/engine/ui/questionnaire/items/CustomQuestItemDataProvider.kt

@@ -16,17 +16,23 @@
 
 package org.smartregister.fhircore.engine.ui.questionnaire.items
 
+import ca.uhn.fhir.rest.gclient.TokenClientParam
+import ca.uhn.fhir.rest.param.ParamPrefixEnum
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.get
 import com.google.android.fhir.search.Operation
 import com.google.android.fhir.search.StringFilterModifier
+import com.google.android.fhir.search.filter.TokenParamFilterCriterion
 import com.google.android.fhir.search.search
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import javax.inject.Inject
 import org.hl7.fhir.r4.model.Binary
+import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.Patient
 import org.hl7.fhir.r4.model.Reference
+import org.smartregister.fhircore.engine.domain.model.HealthStatus
 import org.smartregister.fhircore.engine.domain.model.LocationHierarchy
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
@@ -35,6 +41,7 @@ import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.extractAge
 import org.smartregister.fhircore.engine.util.extension.extractName
 import org.smartregister.fhircore.engine.util.extension.extractOfficialIdentifier
+import org.smartregister.fhircore.engine.util.extension.plusYears
 import timber.log.Timber
 
 class CustomQuestItemDataProvider
@@ -70,6 +77,13 @@ constructor(
   }
 
   suspend fun searchPatients(query: String): List<PickerPatient> {
+    val codings = listOf(HealthStatus.NEWLY_DIAGNOSED_CLIENT, HealthStatus.CLIENT_ALREADY_ON_ART).map { Coding().apply {
+      system = SystemConstants.PATIENT_TYPE_FILTER_TAG_VIA_META_CODINGS_SYSTEM
+      code = it.name.lowercase().replace("_", "-")
+    } }.map<Coding,
+            TokenParamFilterCriterion.() -> Unit> { c->
+      {value = of(c)}
+    }
     val patients =
       fhirEngine.search<Patient> {
         filter(Patient.ACTIVE, { value = of(true) })
@@ -80,6 +94,7 @@ constructor(
           { value = of("female") },
           operation = Operation.OR,
         )
+        filter(TokenClientParam("_tag"), *codings.toTypedArray(), operation = Operation.OR)
         if (query.contains(Regex("[0-9]"))) {
           filter(Patient.IDENTIFIER, { value = of(query) })
         } else {
@@ -114,5 +129,5 @@ data class PickerPatient(
   val id: String?,
   val gender: String,
   val age: String,
-  val reference: Reference
+  val reference: Reference,
 )

android/engine/src/main/java/org/smartregister/fhircore/engine/ui/questionnaire/items/patient/PatientPicker.kt

@@ -75,7 +75,7 @@ class PatientPicker(
       CustomQuestPatientPickerDialogBinding.inflate(LayoutInflater.from(context), null, false)
     val dialog = AlertDialog.Builder(context).setView(dialogBinding.root).create()
     dialogBinding.submitButton.setOnClickListener {
-      val inputText = dialogBinding.inputEditText.text.toString()
+      val inputText = dialogBinding.patientSearchEditText.text.toString()
       viewModel.submitText(inputText)
     }
 
@@ -145,7 +145,7 @@ class PatientPicker(
 
 class ItemsAdapter(
   private val items: List<PickerPatient>,
-  val onPatientSelected: (PickerPatient) -> Unit
+  val onPatientSelected: (PickerPatient) -> Unit,
 ) : RecyclerView.Adapter<ItemsAdapter.ViewHolder>() {
 
   class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

android/engine/src/main/res/layout/custom_quest_patient_picker_dialog.xml

@@ -5,17 +5,34 @@
     android:orientation="vertical"
     android:padding="16dp">
 
-    <EditText
-        android:id="@+id/inputEditText"
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Search Patient"
+        style="?textAppearanceHeadline6"
+        android:layout_marginBottom="10dp"/>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/patient_search_input_layout"
+        style="?attr/questionnaireTextInputLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Enter text" />
+        android:hint="Enter name or ART number">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/patient_search_edit_text"
+            style="?attr/questionnaireMultiLineTextInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="top" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Button
         android:id="@+id/submitButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Submit" />
+        android:text="Search" />
 
     <ProgressBar
         android:id="@+id/progressBar"