Fixed not showing add to family planning option for patient who is al…

…ready opt-ed in
opensrp · Sep 9, 2022 · 9bc8b49 · 9bc8b49
1 parent 4cba138
commit 9bc8b49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.../main/java/org/smartregister/fhircore/quest/ui/patient/profile/PatientProfileViewModel.kt b/.../main/java/org/smartregister/fhircore/quest/ui/patient/profile/PatientProfileViewModel.kt
@@ -106,7 +106,9 @@ constructor(
           Pair(
             R.id.add_to_family_planning,
             profileData?.let {
-              !(it.tasks.none { it.action.matches(Regex(ACTIVE_ANC_REGEX)) } && (it.dob?.yearsPassed() in 15..48))
+              !(it.tasks.none { it.action.matches(Regex(ACTIVE_ANC_REGEX)) } &&
+                      it.conditions.none { it.code.text.equals("Family Planning") } &&
+                      (it.dob?.yearsPassed() in 15..48))
             }
               ?: false
           )

diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/shared/models/PatientProfileViewData.kt
@@ -19,6 +19,7 @@ package org.smartregister.fhircore.quest.ui.shared.models
 import java.util.Date
 import org.smartregister.fhircore.engine.domain.model.ActionableButtonData
 import org.smartregister.fhircore.quest.ui.family.profile.model.FamilyMemberViewState
+import org.hl7.fhir.r4.model.Condition
 
 sealed class ProfileViewData(
   open val logicalId: String = "",
@@ -39,6 +40,7 @@ sealed class ProfileViewData(
     val medicalHistoryData: List<PatientProfileRowItem> = emptyList(),
     val upcomingServices: List<PatientProfileRowItem> = emptyList(),
     val ancCardData: List<PatientProfileRowItem> = emptyList(),
+    val conditions: List<Condition> = listOf(),
   ) : ProfileViewData(name = name, logicalId = logicalId, identifier = identifier)
 
   data class FamilyProfileViewData(

diff --git a/...uest/src/main/java/org/smartregister/fhircore/quest/util/mappers/ProfileViewDataMapper.kt b/...uest/src/main/java/org/smartregister/fhircore/quest/util/mappers/ProfileViewDataMapper.kt
@@ -82,6 +82,7 @@ class ProfileViewDataMapper @Inject constructor(@ApplicationContext val context:
           age = inputModel.age,
           sex = inputModel.gender.translateGender(context),
           dob = inputModel.birthdate,
+          conditions = inputModel.conditions,
           tasks =
             inputModel.tasks.take(DEFAULT_TASKS_COUNT).map {
               ActionableButtonData(