Refactor questionnaire implementation

android/engine/build.gradle.kts

@@ -60,6 +60,7 @@ android {
   buildFeatures {
     compose = true
     viewBinding = true
+    dataBinding = true
   }
   composeOptions { kotlinCompilerExtensionVersion = "1.3.0" }
 

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/QuestionnaireConfig.kt

@@ -35,14 +35,11 @@ data class QuestionnaireConfig(
   val id: String,
   val title: String? = null,
   val saveButtonText: String? = null,
-  val setPractitionerDetails: Boolean = true,
-  val setOrganizationDetails: Boolean = true,
-  val setAppVersion: Boolean = true,
   val planDefinitions: List<String>? = null,
   var type: QuestionnaireType = QuestionnaireType.DEFAULT,
   val resourceIdentifier: String? = null,
-  val removeResource: Boolean? = null,
   val resourceType: ResourceType? = null,
+  val removeResource: Boolean? = null,
   val confirmationDialog: ConfirmationDialog? = null,
   val groupResource: GroupResourceConfig? = null,
   val taskId: String? = null,
@@ -53,6 +50,7 @@ data class QuestionnaireConfig(
   val configRules: List<RuleConfig>? = null,
   val extraParams: List<ActionParameter>? = null,
   val onSubmitActions: List<ActionConfig>? = null,
+  val barcodeLinkId: String = "patient-barcode",
 ) : java.io.Serializable, Parcelable {
 
   fun interpolate(computedValuesMap: Map<String, Any>) =

android/engine/src/main/java/org/smartregister/fhircore/engine/cql/LibraryEvaluator.kt

@@ -65,7 +65,7 @@ import timber.log.Timber
  * https://github.com/DBCG/CqlEvaluatorSampleApp See also https://www.hl7.org/fhir/
  */
 @Singleton
-class LibraryEvaluator @Inject constructor() {
+class LibraryEvaluator @Inject constructor(val defaultRepository: DefaultRepository) {
   private val fhirContext = FhirContext.forR4Cached()
   private val parser = fhirContext.newJsonParser()
   private var adapterFactory = AdapterFactory()
@@ -224,37 +224,40 @@ class LibraryEvaluator @Inject constructor() {
     libraryId: String,
     patient: Patient?,
     data: Bundle,
-    repository: DefaultRepository,
     outputLog: Boolean = false,
   ): List<String> {
     initialize()
 
-    val library = repository.fhirEngine.get<LibraryResource>(libraryId)
+    val library = defaultRepository.loadResource<LibraryResource>(libraryId)
 
     val helpers =
-      library.relatedArtifact
-        .filter { it.hasResource() && it.resource.startsWith("Library/") }
-        .mapNotNull {
-          repository.fhirEngine.get<LibraryResource>(it.resource.replace("Library/", ""))
+      library
+        ?.relatedArtifact
+        ?.filter { it.hasResource() && it.resource.startsWith("Library/") }
+        ?.mapNotNull {
+          defaultRepository.loadResource<LibraryResource>(it.resource.substringAfter("/"))
         }
 
-    loadConfigs(
-      library,
-      helpers,
-      Bundle(),
-      // TODO check and handle when data bundle has multiple Patient resources
-      createBundle(
-        listOfNotNull(
-          patient,
-          *data.entry.map { it.resource }.toTypedArray(),
-          *repository.search(library.dataRequirementFirstRep).toTypedArray(),
-        ),
-      ),
-    )
+    if (library != null && helpers != null) {
+      loadConfigs(
+        library = library,
+        helpers = helpers,
+        valueSet = Bundle(),
+        // TODO check and handle when data bundle has multiple Patient resources
+        data =
+          createBundle(
+            listOfNotNull(
+              patient,
+              *data.entry.map { it.resource }.toTypedArray(),
+              *defaultRepository.search(library.dataRequirementFirstRep).toTypedArray(),
+            ),
+          ),
+      )
+    }
 
     val result =
       libEvaluator!!.evaluate(
-        VersionedIdentifier().withId(library.name).withVersion(library.version),
+        VersionedIdentifier().withId(library?.name).withVersion(library?.version),
         patient?.let { Pair.of("Patient", it.logicalId) },
         null,
         null,
@@ -267,7 +270,7 @@ class LibraryEvaluator @Inject constructor() {
 
         if (p.name.equals(OUTPUT_PARAMETER_KEY) && it.isResource) {
           data.addEntry().apply { this.resource = p.resource }
-          repository.create(true, it as Resource)
+          defaultRepository.create(true, it as Resource)
         }
 
         when {

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt

@@ -142,6 +142,8 @@ constructor(
       else -> listOf()
     }
 
+  suspend inline fun <reified R : Resource> search(search: Search) = fhirEngine.search<R>(search)
+
   /**
    * Saves a resource in the database. It also updates the [Resource.meta.lastUpdated] and generates
    * the [Resource.id] if it is missing before saving the resource.
@@ -165,8 +167,10 @@ constructor(
 
   private fun preProcessResources(addResourceTags: Boolean, vararg resource: Resource) {
     resource.onEach { currentResource ->
-      currentResource.updateLastUpdated()
-      currentResource.generateMissingId()
+      currentResource.apply {
+        updateLastUpdated()
+        generateMissingId()
+      }
       if (addResourceTags) {
         val tags = configService.provideResourceTags(sharedPreferencesHelper)
         tags.forEach {
@@ -225,7 +229,8 @@ constructor(
       resource.updateLastUpdated()
       try {
         fhirEngine.get(resource.resourceType, resource.logicalId).run {
-          fhirEngine.update(updateFrom(resource))
+          val updateFrom = updateFrom(resource)
+          fhirEngine.update(updateFrom)
         }
       } catch (resourceNotFoundException: ResourceNotFoundException) {
         create(addMandatoryTags, resource)

android/engine/src/main/java/org/smartregister/fhircore/engine/domain/model/QuestionnaireType.kt

@@ -24,7 +24,7 @@ enum class QuestionnaireType {
 
   fun isDefault() = this == DEFAULT
 
-  fun isEditMode() = this == EDIT
+  fun isEditable() = this == EDIT
 
   fun isReadOnly() = this == READ_ONLY
 }

android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirTaskUtil.kt

@@ -139,7 +139,9 @@ constructor(@ApplicationContext val appContext: Context, val defaultRepository:
         )
       }
 
-    Timber.i("Found ${tasks.size} upcoming Tasks to be updated")
+    Timber.i(
+      "Found ${tasks.size} upcoming Tasks (with statuses REQUESTED, ACCEPTED or RECEIVED) to be updated",
+    )
 
     tasks.forEach { task ->
       val previousStatus = task.status
@@ -149,8 +151,10 @@ constructor(@ApplicationContext val appContext: Context, val defaultRepository:
 
       if (task.hasPartOf() && !task.preRequisiteConditionSatisfied()) task.status = previousStatus
 
-      if (task.status != previousStatus) defaultRepository.update(task)
-      Timber.d("Task with ID '${task.id}' status updated to ${task.status}")
+      if (task.status != previousStatus) {
+        defaultRepository.update(task)
+        Timber.d("Task with ID '${task.id}' status updated FROM $previousStatus TO ${task.status}")
+      }
     }
   }
 

android/engine/src/main/java/org/smartregister/fhircore/engine/ui/base/AlertDialogue.kt

@@ -16,11 +16,12 @@
 
 package org.smartregister.fhircore.engine.ui.base
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.app.DatePickerDialog
+import android.content.Context
 import android.content.DialogInterface
 import android.content.res.Resources
+import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.StringRes
@@ -29,6 +30,7 @@ import androidx.core.view.setPadding
 import java.util.Calendar
 import java.util.Date
 import org.smartregister.fhircore.engine.R
+import org.smartregister.fhircore.engine.util.extension.getActivity
 import org.smartregister.fhircore.engine.util.extension.hide
 import org.smartregister.fhircore.engine.util.extension.show
 
@@ -44,20 +46,8 @@ data class AlertDialogListItem(val key: String, val value: String)
 object AlertDialogue {
   private val ITEMS_LIST_KEY = "alert_dialog_items_list"
 
-  fun AlertDialog.getSingleChoiceSelectedKey() = getSingleChoiceSelectedItem()?.key
-
-  private fun AlertDialog.getSingleChoiceSelectedItem() =
-    if (this.listView.checkedItemCount != 1) {
-      null
-    } else {
-      getListItems()!![this.listView.checkedItemPosition]
-    }
-
-  private fun AlertDialog.getListItems() =
-    this.ownerActivity?.intent?.getSerializableExtra(ITEMS_LIST_KEY) as Array<AlertDialogListItem>?
-
   fun showAlert(
-    context: Activity,
+    context: Context,
     alertIntent: AlertIntent,
     message: CharSequence,
     title: String? = null,
@@ -71,7 +61,7 @@ object AlertDialogue {
     val dialog =
       AlertDialog.Builder(context, R.style.AlertDialogTheme)
         .apply {
-          val view = context.layoutInflater.inflate(R.layout.alert_dialog, null)
+          val view = LayoutInflater.from(context).inflate(R.layout.alert_dialog, null)
           setView(view)
           title?.let { setTitle(it) }
           setCancelable(cancellable)
@@ -97,15 +87,17 @@ object AlertDialogue {
     dialog.findViewById<TextView>(R.id.tv_alert_message)?.apply { this.text = message }
 
     options?.let {
-      context.intent.putExtra(ITEMS_LIST_KEY, it)
-      dialog.setOwnerActivity(context)
+      context.getActivity()?.run {
+        intent?.putExtra(ITEMS_LIST_KEY, it)
+        dialog.setOwnerActivity(this)
+      }
     }
 
     return dialog
   }
 
   fun showInfoAlert(
-    context: Activity,
+    context: Context,
     message: String,
     title: String? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit) = { d -> d.dismiss() },
@@ -121,7 +113,7 @@ object AlertDialogue {
     )
   }
 
-  fun showErrorAlert(context: Activity, message: String, title: String? = null): AlertDialog {
+  fun showErrorAlert(context: Context, message: String, title: String? = null): AlertDialog {
     return showAlert(
       context = context,
       alertIntent = AlertIntent.ERROR,
@@ -133,7 +125,7 @@ object AlertDialogue {
   }
 
   fun showErrorAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
   ): AlertDialog {
@@ -144,12 +136,12 @@ object AlertDialogue {
     )
   }
 
-  fun showProgressAlert(context: Activity, @StringRes message: Int): AlertDialog {
+  fun showProgressAlert(context: Context, @StringRes message: Int): AlertDialog {
     return showAlert(context, AlertIntent.PROGRESS, context.getString(message))
   }
 
   fun showConfirmAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit),
@@ -171,7 +163,7 @@ object AlertDialogue {
   }
 
   fun showCancelAlert(
-    context: Activity,
+    context: Context,
     @StringRes message: Int,
     @StringRes title: Int? = null,
     confirmButtonListener: ((d: DialogInterface) -> Unit),
@@ -196,51 +188,48 @@ object AlertDialogue {
   }
 
   fun showDatePickerAlert(
-    context: Activity,
-    confirmButtonListener: ((d: Date) -> Unit),
+    context: Context,
+    confirmButtonListener: (d: Date) -> Unit,
     confirmButtonText: String,
     max: Date?,
-    default: Date = Date(),
     title: String?,
     dangerActionColor: Boolean = true,
   ): DatePickerDialog {
     val dateDialog = DatePickerDialog(context)
 
-    dateDialog.apply {
-      max?.let { this.datePicker.maxDate = it.time }
-      val id = Resources.getSystem().getIdentifier("date_picker_header_date", "id", "android")
-      if (id != 0) {
-        this.datePicker.findViewById<TextView>(id).textSize = 14f
-      }
+    dateDialog
+      .apply {
+        max?.let { this.datePicker.maxDate = it.time }
+        val id = Resources.getSystem().getIdentifier("date_picker_header_date", "id", "android")
+        if (id != 0) {
+          this.datePicker.findViewById<TextView>(id).textSize = 14f
+        }
 
-      title?.let {
-        this.setCustomTitle(
-          TextView(context).apply {
-            this.text = it
-            this.setPadding(20)
-          },
-        )
-      }
+        title?.let {
+          this.setCustomTitle(
+            TextView(context).apply {
+              this.text = it
+              this.setPadding(20)
+            },
+          )
+        }
 
-      this.setButton(DialogInterface.BUTTON_POSITIVE, confirmButtonText) { d, _ ->
-        val date =
-          Calendar.getInstance().apply {
-            (d as DatePickerDialog).datePicker.let { this.set(it.year, it.month, it.dayOfMonth) }
-          }
-        confirmButtonListener.invoke(date.time)
+        this.setButton(DialogInterface.BUTTON_POSITIVE, confirmButtonText) { d, _ ->
+          val date =
+            Calendar.getInstance().apply {
+              (d as DatePickerDialog).datePicker.let { this.set(it.year, it.month, it.dayOfMonth) }
+            }
+          confirmButtonListener.invoke(date.time)
+        }
       }
-    }
-
-    dateDialog.create()
+      .create()
 
     if (dangerActionColor) {
       dateDialog
         .getButton(DialogInterface.BUTTON_POSITIVE)
         .setTextColor(context.resources.getColor(R.color.colorError))
     }
-
     dateDialog.show()
-
     return dateDialog
   }
 }