added visit number to profile view (#91)

* added visit number to profile view

* Update PersonalData.kt

Author: BuchiNy

android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/CarePlanExtension.kt

@@ -82,6 +82,14 @@ fun CarePlan.CarePlanActivityComponent.shouldShowOnProfile(): Boolean {
     .not()
 }
 
+fun CarePlan.extractVisitNumber(): String? {
+  val visitNumberCoding =
+    this.category.firstOrNull {
+      (it.coding.firstOrNull()?.system ?: "") == "https://d-tree.org/fhir/care-plan-visit-number"
+    }
+  return visitNumberCoding?.coding?.firstOrNull()?.code
+}
+
 fun CarePlan.CarePlanStatus.toCoding() = Coding(this.system, this.toCode(), this.display)
 
 fun CarePlan.isLastTask(task: Task) =

android/engine/src/main/res/values/strings.xml

@@ -168,4 +168,5 @@
     <string name="upload_strategy">Upload Strategy</string>
     <string name="ok">Ok</string>
     <string name="opening_form">Opening form...</string>
+    <string name="visit">Visit</string>
 </resources>

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/patient/profile/components/PersonalData.kt

@@ -16,7 +16,6 @@
 
 package org.smartregister.fhircore.quest.ui.patient.profile.components
 
-import android.graphics.Color
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -100,6 +99,9 @@ fun PersonalData(
       ) {
         OtherDetailsItem(title = stringResource(R.string.sex), value = patientProfileViewData.sex)
         OtherDetailsItem(title = stringResource(R.string.age), value = patientProfileViewData.age)
+        patientProfileViewData.visitNumber?.let {
+          OtherDetailsItem(title = stringResource(R.string.visit), value = it)
+        }
       }
     }
   }
@@ -124,6 +126,7 @@ fun PersonalDataPreview() {
       sex = "Female",
       age = "48y",
       dob = "08 Dec",
+      visitNumber = "1",
       identifier = "123455",
     )
   PersonalData(patientProfileViewData = patientProfileData)

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/ProfileViewData.kt

@@ -63,6 +63,7 @@ sealed class ProfileViewData(
     val addressTracingCatchment: String = "",
     val addressPhysicalLocator: String = "",
     val currentCarePlan: CarePlan? = null,
+    val visitNumber: String? = null,
     val phoneContacts: List<String> = emptyList(),
     val observations: List<Observation> = emptyList(),
     val practitioners: List<Practitioner> = emptyList(),

android/quest/src/main/java/org/smartregister/fhircore/quest/util/mappers/ProfileViewDataMapper.kt

@@ -39,6 +39,7 @@ import org.smartregister.fhircore.engine.ui.theme.SuccessColor
 import org.smartregister.fhircore.engine.util.extension.asDdMmYyyy
 import org.smartregister.fhircore.engine.util.extension.canBeCompleted
 import org.smartregister.fhircore.engine.util.extension.extractId
+import org.smartregister.fhircore.engine.util.extension.extractVisitNumber
 import org.smartregister.fhircore.engine.util.extension.getQuestionnaire
 import org.smartregister.fhircore.engine.util.extension.getQuestionnaireName
 import org.smartregister.fhircore.engine.util.extension.makeItReadable
@@ -92,6 +93,7 @@ class ProfileViewDataMapper @Inject constructor(@ApplicationContext val context:
           observations = inputModel.observations,
           guardians = inputModel.guardians,
           currentCarePlan = inputModel.currentCarePlan,
+          visitNumber = inputModel.currentCarePlan?.extractVisitNumber(),
           tasks =
             inputModel.tasks.map {
               PatientProfileRowItem(