568 | Quest Patient List View with configurable views

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ jobs:
     env:
      FHIRCORE_USERNAME: ${{ secrets.FHIRCORE_USERNAME }}
      FHIRCORE_ACCESS_TOKEN: ${{ secrets.FHIRCORE_ACCESS_TOKEN }}
+     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
       - name: Checkout 🛎️

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added class for Measure report evaluation which will be used in ANC application
 - ANC | Added Condition resource to sync params list
 - Moved Token to secure storage from AccountManager
+- QUEST | Patient List, Load Config from server
+- QUEST | Added Patient Profile View
 
 ### Fixed
 

android/anc/src/main/assets/sample_family_member_registration.json

@@ -32,7 +32,7 @@
         {
           "linkId": "PR-name",
           "type": "group",
-          "text": "Family Head Information",
+          "text": "Demographic Information",
           "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name",
           "item": [
             {

android/anc/src/main/java/org/smartregister/fhircore/anc/ui/anccare/register/AncRegisterActivity.kt

@@ -76,7 +76,7 @@ class AncRegisterActivity : BaseRegisterActivity() {
       )
     )
 
-  override fun onSideMenuOptionSelected(item: MenuItem): Boolean {
+  override fun onMenuOptionSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       R.id.menu_item_family -> startActivity(Intent(this, FamilyRegisterActivity::class.java))
       R.id.menu_item_anc -> startActivity(Intent(this, AncRegisterActivity::class.java))

android/anc/src/main/java/org/smartregister/fhircore/anc/ui/family/register/FamilyRegisterActivity.kt

@@ -71,7 +71,7 @@ class FamilyRegisterActivity : BaseRegisterActivity() {
       )
     )
 
-  override fun onSideMenuOptionSelected(item: MenuItem): Boolean {
+  override fun onMenuOptionSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       R.id.menu_item_family -> startActivity(Intent(this, FamilyRegisterActivity::class.java))
       R.id.menu_item_anc -> startActivity(Intent(this, AncRegisterActivity::class.java))

android/anc/src/test/java/org/smartregister/fhircore/anc/ui/anccare/register/AncRegisterActivityTest.kt

@@ -118,7 +118,7 @@ internal class AncRegisterActivityTest : ActivityRobolectricTest() {
   fun testOnSideMenuOptionSelectedShouldVerifyActivityStarting() {
 
     val menuItemFamily = RoboMenuItem(R.id.menu_item_family)
-    ancRegisterActivity.onSideMenuOptionSelected(menuItemFamily)
+    ancRegisterActivity.onMenuOptionSelected(menuItemFamily)
 
     var expectedIntent = Intent(ancRegisterActivity, FamilyRegisterActivity::class.java)
     var actualIntent =
@@ -127,7 +127,7 @@ internal class AncRegisterActivityTest : ActivityRobolectricTest() {
     assertEquals(expectedIntent.component, actualIntent.component)
 
     val menuItemAnc = RoboMenuItem(R.id.menu_item_anc)
-    ancRegisterActivity.onSideMenuOptionSelected(menuItemAnc)
+    ancRegisterActivity.onMenuOptionSelected(menuItemAnc)
 
     expectedIntent = Intent(ancRegisterActivity, AncRegisterActivity::class.java)
     actualIntent =

android/anc/src/test/java/org/smartregister/fhircore/anc/ui/family/FamilyRegisterActivityTest.kt

@@ -124,7 +124,7 @@ internal class FamilyRegisterActivityTest : ActivityRobolectricTest() {
   fun testOnSideMenuOptionSelectedShouldVerifyActivityStarting() {
 
     val menuItemFamily = RoboMenuItem(R.id.menu_item_family)
-    familyRegisterActivity.onSideMenuOptionSelected(menuItemFamily)
+    familyRegisterActivity.onMenuOptionSelected(menuItemFamily)
 
     var expectedIntent = Intent(familyRegisterActivity, FamilyRegisterActivity::class.java)
     var actualIntent =
@@ -134,7 +134,7 @@ internal class FamilyRegisterActivityTest : ActivityRobolectricTest() {
     assertEquals(expectedIntent.component, actualIntent.component)
 
     val menuItemAnc = RoboMenuItem(R.id.menu_item_anc)
-    familyRegisterActivity.onSideMenuOptionSelected(menuItemAnc)
+    familyRegisterActivity.onMenuOptionSelected(menuItemAnc)
 
     expectedIntent = Intent(familyRegisterActivity, AncRegisterActivity::class.java)
     actualIntent =

android/eir/src/main/java/org/smartregister/fhircore/eir/ui/patient/register/PatientRegisterActivity.kt

@@ -47,7 +47,7 @@ class PatientRegisterActivity : BaseRegisterActivity() {
       )
     )
 
-  override fun onSideMenuOptionSelected(item: MenuItem): Boolean {
+  override fun onMenuOptionSelected(item: MenuItem): Boolean {
     return true
   }
 

android/eir/src/test/java/org/smartregister/fhircore/eir/ui/patient/register/PatientRegisterActivityTest.kt

@@ -18,24 +18,32 @@ package org.smartregister.fhircore.eir.ui.patient.register
 
 import android.app.Activity
 import androidx.core.content.ContextCompat
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Assert
 import org.junit.Before
 import org.junit.BeforeClass
+import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import org.robolectric.fakes.RoboMenuItem
 import org.smartregister.fhircore.eir.R
 import org.smartregister.fhircore.eir.activity.ActivityRobolectricTest
+import org.smartregister.fhircore.eir.coroutine.CoroutineTestRule
 import org.smartregister.fhircore.eir.shadow.EirApplicationShadow
 import org.smartregister.fhircore.eir.shadow.FakeKeyStore
 import org.smartregister.fhircore.eir.shadow.ShadowNpmPackageProvider
+import org.smartregister.fhircore.engine.ui.register.model.SideMenuOption
 
 @Config(shadows = [EirApplicationShadow::class, ShadowNpmPackageProvider::class])
 class PatientRegisterActivityTest : ActivityRobolectricTest() {
 
   private lateinit var patientRegisterActivity: PatientRegisterActivity
+  @get:Rule var coroutinesTestRule = CoroutineTestRule()
 
   @Before
   fun setUp() {
@@ -62,7 +70,22 @@ class PatientRegisterActivityTest : ActivityRobolectricTest() {
 
   @Test
   fun testOnSideMenuOptionSelectedShouldReturnTrue() {
-    Assert.assertTrue(patientRegisterActivity.onSideMenuOptionSelected(RoboMenuItem()))
+    Assert.assertTrue(patientRegisterActivity.onMenuOptionSelected(RoboMenuItem()))
+  }
+
+  @Test
+  fun testUpdateCountShouldSetRightValue() = runBlockingTest {
+    val spy = spyk(patientRegisterActivity)
+    every { spy.findSideMenuItem(any()) } returns
+      RoboMenuItem().apply { itemId = R.id.menu_item_covax }
+
+    val sideMenuOption =
+      SideMenuOption(R.id.menu_item_covax, R.string.covax_app, mockk(), countMethod = { 123 })
+    sideMenuOption.count = 0
+
+    spy.updateCount(sideMenuOption)
+
+    Assert.assertEquals(123, sideMenuOption.count)
   }
 
   @Test

android/eir/src/test/java/org/smartregister/fhircore/eir/ui/vaccine/RecordVaccineActivityTest.kt

@@ -95,34 +95,32 @@ class RecordVaccineActivityTest : ActivityRobolectricTest() {
   }
 
   @Test
-  fun testVerifyRecordedVaccineSavedDialogProperty() {
-    coroutinesTestRule.runBlockingTest {
-      val spyViewModel =
-        spyk((recordVaccineActivity.questionnaireViewModel as RecordVaccineViewModel))
-      recordVaccineActivity.questionnaireViewModel = spyViewModel
-
-      val callback = slot<Observer<PatientVaccineSummary>>()
-
-      coEvery { spyViewModel.performExtraction(any(), any(), any()) } returns
-        Bundle().apply { addEntry().apply { resource = getImmunization() } }
-
-      every { spyViewModel.getVaccineSummary(any()) } returns
-        mockk<LiveData<PatientVaccineSummary>>().apply {
-          every { observe(any(), capture(callback)) } answers
-            {
-              callback.captured.onChanged(PatientVaccineSummary(1, "vaccine"))
-            }
-        }
+  fun testVerifyRecordedVaccineSavedDialogProperty() = runBlockingTest {
+    val spyViewModel =
+      spyk((recordVaccineActivity.questionnaireViewModel as RecordVaccineViewModel))
+    recordVaccineActivity.questionnaireViewModel = spyViewModel
 
-      Assert.assertNull(ShadowAlertDialog.getLatestAlertDialog())
-      recordVaccineActivity.handleQuestionnaireResponse(mockk())
+    val callback = slot<Observer<PatientVaccineSummary>>()
 
-      val dialog = shadowOf(ShadowAlertDialog.getLatestAlertDialog())
+    coEvery { spyViewModel.performExtraction(any(), any(), any()) } returns
+      Bundle().apply { addEntry().apply { resource = getImmunization() } }
 
-      Assert.assertNotNull(dialog)
-      Assert.assertEquals("Initially received vaccine", dialog.title)
-      Assert.assertEquals("Second vaccine dose should be same as first", dialog.message)
-    }
+    every { spyViewModel.getVaccineSummary(any()) } returns
+      mockk<LiveData<PatientVaccineSummary>>().apply {
+        every { observe(any(), capture(callback)) } answers
+          {
+            callback.captured.onChanged(PatientVaccineSummary(1, "vaccine"))
+          }
+      }
+
+    Assert.assertNull(ShadowAlertDialog.getLatestAlertDialog())
+    recordVaccineActivity.handleQuestionnaireResponse(mockk())
+
+    val dialog = shadowOf(ShadowAlertDialog.getLatestAlertDialog())
+
+    Assert.assertNotNull(dialog)
+    Assert.assertEquals("Initially received vaccine", dialog.title)
+    Assert.assertEquals("Second vaccine dose should be same as first", dialog.message)
   }
 
   @Test

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

@@ -16,12 +16,18 @@
 
 package org.smartregister.fhircore.engine.configuration.app
 
+import android.content.Context
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.Serializable
+import org.smartregister.fhircore.engine.util.extension.decodeJson
+import org.smartregister.fhircore.engine.util.extension.loadBinaryResourceConfiguration
 
 @Serializable
 data class ApplicationConfiguration(
-  var oauthServerBaseUrl: String,
-  var fhirServerBaseUrl: String,
+  var id: String = "",
+  var theme: String = "",
+  var oauthServerBaseUrl: String = "",
+  var fhirServerBaseUrl: String = "",
   var clientId: String = "",
   var clientSecret: String = "",
   var scope: String = "openid",
@@ -44,6 +50,8 @@ data class ApplicationConfiguration(
  * @param syncInterval Sets the periodic sync interval in seconds. Default 30.
  */
 fun applicationConfigurationOf(
+  id: String = "",
+  theme: String = "",
   oauthServerBaseUrl: String = "",
   fhirServerBaseUrl: String = "",
   clientId: String = "",
@@ -53,6 +61,8 @@ fun applicationConfigurationOf(
   syncInterval: Long = 30
 ): ApplicationConfiguration =
   ApplicationConfiguration(
+    id = id,
+    theme = theme,
     oauthServerBaseUrl = oauthServerBaseUrl,
     fhirServerBaseUrl = fhirServerBaseUrl,
     clientId = clientId,
@@ -61,3 +71,15 @@ fun applicationConfigurationOf(
     languages = languages,
     syncInterval = syncInterval
   )
+
+private const val APPLICATION_CONFIG_FILE = "application_config.json"
+
+fun Context.loadApplicationConfiguration(id: String): ApplicationConfiguration {
+  return runBlocking { loadBinaryResourceConfiguration(id) }
+    ?: assets
+      .open(APPLICATION_CONFIG_FILE)
+      .bufferedReader()
+      .use { it.readText() }
+      .decodeJson<List<ApplicationConfiguration>>()
+      .first { it.id == id }
+}

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

@@ -18,23 +18,30 @@ package org.smartregister.fhircore.engine.configuration.view
 
 import android.content.Context
 import androidx.compose.runtime.Stable
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.Serializable
 import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.configuration.Configuration
+import org.smartregister.fhircore.engine.util.extension.decodeJson
+import org.smartregister.fhircore.engine.util.extension.loadBinaryResourceConfiguration
 
 @Serializable
 @Stable
 data class RegisterViewConfiguration(
+  var id: String,
   var appTitle: String,
   var filterText: String,
   var searchBarHint: String,
   var newClientButtonText: String,
+  var newClientButtonStyle: String,
   var showSearchBar: Boolean = true,
   var showFilter: Boolean = true,
   var switchLanguages: Boolean = true,
   var showScanQRCode: Boolean = true,
   var showNewClientButton: Boolean = true,
   var registrationForm: String = "patient-registration",
+  var showSideMenu: Boolean = true,
+  var showBottomMenu: Boolean = false
 ) : Configuration
 
 /**
@@ -54,28 +61,48 @@ data class RegisterViewConfiguration(
  */
 @Stable
 fun Context.registerViewConfigurationOf(
+  id: String = this.getString(R.string.default_app_title),
   appTitle: String = this.getString(R.string.default_app_title),
   filterText: String = this.getString(R.string.show_overdue),
   searchBarHint: String = this.getString(R.string.search_hint),
   newClientButtonText: String = this.getString(R.string.register_new_client),
+  newClientButtonStyle: String = "",
   showSearchBar: Boolean = true,
   showFilter: Boolean = true,
   switchLanguages: Boolean = true,
   showScanQRCode: Boolean = true,
   showNewClientButton: Boolean = true,
   languages: List<String> = listOf("en"),
-  registrationForm: String = "patient-registration"
+  registrationForm: String = "patient-registration",
+  showSideMenu: Boolean = true,
+  showBottomMenu: Boolean = false
 ): RegisterViewConfiguration {
   return RegisterViewConfiguration(
+    id = id,
     appTitle = appTitle,
     filterText = filterText,
     searchBarHint = searchBarHint,
     newClientButtonText = newClientButtonText,
+    newClientButtonStyle = newClientButtonStyle,
     showSearchBar = showSearchBar,
     showFilter = showFilter,
     switchLanguages = switchLanguages,
     showScanQRCode = showScanQRCode,
     showNewClientButton = showNewClientButton,
     registrationForm = registrationForm,
+    showSideMenu = showSideMenu,
+    showBottomMenu = showBottomMenu
   )
 }
+
+private const val REGISTER_VIEW_CONFIG_FILE = "register_view_config.json"
+
+fun Context.loadRegisterViewConfiguration(id: String): RegisterViewConfiguration {
+  return runBlocking { loadBinaryResourceConfiguration(id) }
+    ?: assets
+      .open(REGISTER_VIEW_CONFIG_FILE)
+      .bufferedReader()
+      .use { it.readText() }
+      .decodeJson<List<RegisterViewConfiguration>>()
+      .first { it.id == id }
+}

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

@@ -17,12 +17,20 @@
 package org.smartregister.fhircore.engine.ui.base
 
 import android.content.Context
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import java.util.Locale
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.extension.getTheme
 import org.smartregister.fhircore.engine.util.extension.setAppLocale
 
 abstract class BaseMultiLanguageActivity : AppCompatActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    val themePref = SharedPreferencesHelper.read(SharedPreferencesHelper.THEME, "")!!
+    theme.applyStyle(getTheme(themePref), true)
+  }
 
   override fun attachBaseContext(baseContext: Context) {
     val lang =