[2026.06.*] Pre-release merge

CHANGELOG.md

@@ -18,6 +18,7 @@
 
 - Update Titration nudge threshold for diabetic patients in SriLanka from `140/90` to `130/80`
 - Add BMI container to patient registration screen
+- Add BMI container to patient summary screen
 
 ## 2026.05.11
 

app/src/main/java/org/simple/clinic/medicalhistory/ui/BMIContainer.kt

@@ -22,6 +22,7 @@ import org.simple.clinic.common.ui.components.ButtonSize
 import org.simple.clinic.common.ui.components.TextButton
 import org.simple.clinic.common.ui.theme.SimpleTheme
 import org.simple.clinic.patientattribute.BMIReading
+import kotlin.math.roundToInt
 
 @Composable
 fun BMIContainer(
@@ -67,7 +68,7 @@ fun BMIContainer(
 
       val bmiText = buildAnnotatedString {
         if (isBmiRecorded) {
-          append(bmiReading.calculateBMI().toString())
+          append(bmiReading.calculateBMI()?.roundToInt().toString())
 
           append(" ")
 

app/src/main/java/org/simple/clinic/summary/PatientSummaryEffect.kt

@@ -93,6 +93,8 @@ data class UpdateTobaccoUse(
     val isUsingSmokelessTobacco: MedicalHistoryAnswer
 ) : PatientSummaryEffect()
 
+data object LoadBMIFeature : PatientSummaryEffect()
+
 sealed class PatientSummaryViewEffect : PatientSummaryEffect()
 
 data class HandleEditClick(
@@ -119,9 +121,9 @@ data class ShowScheduleAppointmentSheet(
     val currentFacility: Facility
 ) : PatientSummaryViewEffect()
 
-data object ShowDiagnosisRequiredError: PatientSummaryViewEffect()
+data object ShowDiagnosisRequiredError : PatientSummaryViewEffect()
 
-data object ShowDiagnosisOrReferralRequiredError: PatientSummaryViewEffect()
+data object ShowDiagnosisOrReferralRequiredError : PatientSummaryViewEffect()
 
 data object ShowHypertensionDiagnosisRequiredError : PatientSummaryViewEffect()
 

app/src/main/java/org/simple/clinic/summary/PatientSummaryEffectHandler.kt

@@ -104,6 +104,7 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
         .addConsumer(PatientSummaryViewEffect::class.java, viewEffectsConsumer::accept)
         .addTransformer(LoadPatientRegistrationData::class.java, checkPatientRegistrationData())
         .addTransformer(CheckIfCDSSPilotIsEnabled::class.java, checkIfCDSSPilotIsEnabled())
+        .addTransformer(LoadBMIFeature::class.java, loadBMIFeature())
         .addTransformer(LoadLatestScheduledAppointment::class.java, loadLatestScheduledAppointment())
         .addConsumer(UpdatePatientReassignmentStatus::class.java, { updatePatientReassignmentState(it.patientUuid, it.status) }, schedulersProvider.io())
         .addTransformer(CheckPatientReassignmentStatus::class.java, checkPatientReassignmentStatus())
@@ -390,9 +391,21 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
           .map {
             val currentFacilityId = currentFacility.get().uuid
             CDSSPilotStatusChecked(isPilotEnabledForFacility =
-            country.isoCountryCode == Country.ETHIOPIA ||
-                country.isoCountryCode == Country.SRI_LANKA ||
-                cdssPilotFacilities.get().contains(currentFacilityId)
+                country.isoCountryCode == Country.ETHIOPIA ||
+                    country.isoCountryCode == Country.SRI_LANKA ||
+                    cdssPilotFacilities.get().contains(currentFacilityId)
+            )
+          }
+    }
+  }
+
+  private fun loadBMIFeature(): ObservableTransformer<LoadBMIFeature, PatientSummaryEvent> {
+    return ObservableTransformer { effects ->
+      effects
+          .observeOn(schedulersProvider.io())
+          .map {
+            BMIFeatureLoaded(
+                isEnabled = feature.isEnabled(Feature.ShowBMIContainer)
             )
           }
     }
@@ -689,7 +702,7 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
                 loggedInUserUuid = currentUser.get().uuid,
                 uuid = uuidGenerator.v4(),
             )
-            BMISaved
+            BMISaved(createNewBMIEntry.reading)
           }
     }
   }

app/src/main/java/org/simple/clinic/summary/PatientSummaryEvent.kt

@@ -187,11 +187,18 @@ data class BMIReadingAdded(
     val bmiReading: BMIReading
 ) : PatientSummaryEvent()
 
+data class BMISaved(
+    val bmiReading: BMIReading
+) : PatientSummaryEvent()
+
 data object AddBMIClicked : PatientSummaryEvent()
 
-data object AddCholesterolClicked: PatientSummaryEvent()
+data object AddCholesterolClicked : PatientSummaryEvent()
 
 data object CholesterolAdded : PatientSummaryEvent()
 
-data object BMISaved : PatientSummaryEvent()
+
+data class BMIFeatureLoaded(
+    val isEnabled: Boolean
+) : PatientSummaryEvent()
 

app/src/main/java/org/simple/clinic/summary/PatientSummaryInit.kt

@@ -9,7 +9,9 @@ class PatientSummaryInit : Init<PatientSummaryModel, PatientSummaryEffect> {
   override fun init(model: PatientSummaryModel): First<PatientSummaryModel, PatientSummaryEffect> {
     val effects = mutableSetOf(
         LoadPatientSummaryProfile(model.patientUuid),
-        CheckIfCDSSPilotIsEnabled
+        CheckIfCDSSPilotIsEnabled,
+        LoadBMIFeature,
+        LoadBMiReading(model.patientUuid),
     )
 
     if (!model.hasUserLoggedInStatus || !model.hasLoadedCurrentFacility) {

app/src/main/java/org/simple/clinic/summary/PatientSummaryModel.kt

@@ -6,6 +6,7 @@ import org.simple.clinic.cvdrisk.StatinInfo
 import org.simple.clinic.facility.Facility
 import org.simple.clinic.overdue.Appointment
 import org.simple.clinic.patient.PatientStatus
+import org.simple.clinic.patientattribute.BMIReading
 import org.simple.clinic.summary.teleconsultation.sync.MedicalOfficer
 import org.simple.clinic.user.User
 import org.simple.clinic.util.ParcelableOptional
@@ -30,6 +31,8 @@ data class PatientSummaryModel(
     val hasShownDiagnosisWarningDialog: Boolean,
     val statinInfo: StatinInfo?,
     val hasShownTobaccoUseDialog: Boolean,
+    val showBMIContainer: Boolean,
+    val bmiReading: BMIReading?
 ) : Parcelable, PatientSummaryChildModel {
 
   companion object {
@@ -50,6 +53,8 @@ data class PatientSummaryModel(
           hasShownDiagnosisWarningDialog = false,
           statinInfo = null,
           hasShownTobaccoUseDialog = false,
+          showBMIContainer = false,
+          bmiReading = null
       )
     }
   }
@@ -138,4 +143,13 @@ data class PatientSummaryModel(
   fun showTobaccoUseDialog(): PatientSummaryModel {
     return copy(hasShownTobaccoUseDialog = true)
   }
+
+  fun bmiVisibilityUpdated(isEnabled: Boolean): PatientSummaryModel {
+    return copy(showBMIContainer = isEnabled)
+  }
+
+  fun bmiReadingsLoaded(bmiReading: BMIReading?): PatientSummaryModel {
+    return copy(bmiReading = bmiReading)
+  }
+
 }

app/src/main/java/org/simple/clinic/summary/PatientSummaryScreen.kt

@@ -49,6 +49,7 @@ import org.simple.clinic.feature.Feature
 import org.simple.clinic.feature.Features
 import org.simple.clinic.home.HomeScreenKey
 import org.simple.clinic.medicalhistory.Answer
+import org.simple.clinic.medicalhistory.ui.BMIContainer
 import org.simple.clinic.mobius.DeferredEventSource
 import org.simple.clinic.mobius.ViewRenderer
 import org.simple.clinic.navigation.v2.HandlesBack
@@ -142,6 +143,9 @@ class PatientSummaryScreen :
   private val facilityNameAndDateTextView
     get() = binding.facilityNameAndDateTextView
 
+  private val bmiContainerComposeView
+    get() = binding.bmiContainerComposeView
+
   private val labelRegistered
     get() = binding.labelRegistered
 
@@ -197,6 +201,8 @@ class PatientSummaryScreen :
   private var showClinicalDecisionAlert by mutableStateOf(false)
   private var animateClinicalDecisionSupportAlert by mutableStateOf(false)
 
+  private var bmiReading by mutableStateOf<BMIReading?>(null)
+
   override fun defaultModel(): PatientSummaryModel {
     return PatientSummaryModel.from(screenKey.intention, screenKey.patientUuid)
   }
@@ -334,6 +340,17 @@ class PatientSummaryScreen :
         }
       }
     }
+
+    bmiContainerComposeView.setContent {
+      SimpleTheme {
+        BMIContainer(
+            bmiReading = bmiReading,
+            onAddOrClick = {
+              additionalEvents.notify(AddBMIClicked)
+            }
+        )
+      }
+    }
   }
 
   private fun handleScreenResult(requestKey: Parcelable, result: Succeeded) {
@@ -829,6 +846,15 @@ class PatientSummaryScreen :
     this.statinInfo = statinInfo
   }
 
+  override fun showBMIContainer(bmiReading: BMIReading?) {
+    bmiContainerComposeView.visibility = VISIBLE
+    this.bmiReading = bmiReading
+  }
+
+  override fun hideBMIContainer() {
+    bmiContainerComposeView.visibility = GONE
+  }
+
   override fun showReassignPatientWarningSheet(
       patientUuid: UUID,
       currentFacility: Facility,

app/src/main/java/org/simple/clinic/summary/PatientSummaryScreenUi.kt

@@ -1,6 +1,7 @@
 package org.simple.clinic.summary
 
 import org.simple.clinic.cvdrisk.StatinInfo
+import org.simple.clinic.patientattribute.BMIReading
 
 interface PatientSummaryScreenUi {
   fun renderPatientSummaryToolbar(patientSummaryProfile: PatientSummaryProfile)
@@ -21,4 +22,6 @@ interface PatientSummaryScreenUi {
   fun hideClinicalDecisionSupportAlert()
   fun hideClinicalDecisionSupportAlertWithoutAnimation()
   fun updateStatinAlert(statinInfo: StatinInfo)
+  fun showBMIContainer(bmiReading: BMIReading?)
+  fun hideBMIContainer()
 }

app/src/main/java/org/simple/clinic/summary/PatientSummaryUpdate.kt

@@ -110,11 +110,18 @@ class PatientSummaryUpdate(
       is AddTobaccoUseClicked -> dispatch(ShowTobaccoStatusDialog)
       is TobaccoUseAnswered -> dispatch(UpdateTobaccoUse(model.patientUuid, event.isSmoker, event.isUsingSmokelessTobacco))
       is BMIReadingAdded -> dispatch(CreateNewBMIEntry(model.patientUuid, event.bmiReading))
-      is AddBMIClicked -> dispatch(LoadBMiReading(model.patientUuid))
+      is AddBMIClicked -> dispatch(OpenBMIEntrySheet(model.bmiReading))
       is AddCholesterolClicked -> dispatch(OpenCholesterolEntrySheet(model.patientUuid))
       CholesterolAdded -> dispatch(CalculateLabBasedCVDRisk(model.patientSummaryProfile!!.patient))
-      is BMIReadingLoaded -> dispatch(OpenBMIEntrySheet(event.bmiReading))
-      is BMISaved -> dispatch(CalculateNonLabBasedCVDRisk(model.patientSummaryProfile!!.patient))
+      is BMIReadingLoaded -> next(model.bmiReadingsLoaded(event.bmiReading))
+      is BMISaved -> {
+        next(
+            model.copy(bmiReading = event.bmiReading),
+            setOf(CalculateNonLabBasedCVDRisk(model.patientSummaryProfile!!.patient))
+        )
+      }
+
+      is BMIFeatureLoaded -> next(model.bmiVisibilityUpdated(event.isEnabled))
     }
   }
 

app/src/main/java/org/simple/clinic/summary/PatientSummaryViewRenderer.kt

@@ -26,6 +26,7 @@ class PatientSummaryViewRenderer(
         setupUiForAssignedFacility(model)
         renderPatientDiedStatus(model)
         renderPatientSummaryToolbar(model.patientSummaryProfile)
+        renderBMIContainer(model)
       }
 
       if (model.hasLoadedCurrentFacility) {
@@ -158,4 +159,12 @@ class PatientSummaryViewRenderer(
       ui.hideClinicalDecisionSupportAlertWithoutAnimation()
     }
   }
+
+  private fun renderBMIContainer(model: PatientSummaryModel) {
+    if (model.showBMIContainer) {
+      ui.showBMIContainer(model.bmiReading)
+    } else {
+      ui.hideBMIContainer()
+    }
+  }
 }

app/src/main/res/layout/screen_patient_summary.xml

@@ -96,6 +96,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+      <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/bmiContainerComposeView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_8"
+        android:layout_marginEnd="@dimen/spacing_8"
+        android:visibility="gone" />
+
       <TextView
         android:id="@+id/labelRegistered"
         android:layout_width="match_parent"

app/src/test/java/org/simple/clinic/summary/PatientSummaryEffectHandlerTest.kt

@@ -4,6 +4,7 @@ import io.reactivex.Completable
 import io.reactivex.Observable
 import org.junit.After
 import org.junit.Test
+import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
@@ -90,6 +91,7 @@ class PatientSummaryEffectHandlerTest {
       remoteConfigService = NoOpRemoteConfigService(DefaultValueConfigReader()),
       overrides = mapOf(
           Feature.Screening to true,
+          Feature.ShowBMIContainer to true
       )
   )
 
@@ -1118,7 +1120,6 @@ class PatientSummaryEffectHandlerTest {
     // when
     testCase.dispatch(LoadBMiReading(patientUuid = patientUuid))
 
-    // then
     //then
     testCase.assertOutgoingEvents(BMIReadingLoaded(null))
   }
@@ -1130,8 +1131,16 @@ class PatientSummaryEffectHandlerTest {
 
     testCase.dispatch(CreateNewBMIEntry(patientUuid, bmiReading))
 
-    // then
     //then
-    testCase.assertOutgoingEvents(BMISaved)
+    testCase.assertOutgoingEvents(BMISaved(bmiReading))
+  }
+
+  @Test
+  fun `when load bmi feature effect is received, then bmi feature should be loaded`() {
+    // when
+    testCase.dispatch(LoadBMIFeature)
+
+    //then
+    testCase.assertOutgoingEvents(BMIFeatureLoaded(true))
   }
 }

app/src/test/java/org/simple/clinic/summary/PatientSummaryInitTest.kt

@@ -30,7 +30,9 @@ class PatientSummaryInitTest {
                     CheckForInvalidPhone(patientUuid),
                     LoadMedicalOfficers,
                     LoadPatientRegistrationData(patientUuid),
-                    CheckIfCDSSPilotIsEnabled
+                    CheckIfCDSSPilotIsEnabled,
+                    LoadBMIFeature,
+                    LoadBMiReading(patientUuid)
                 )
             )
         )
@@ -63,7 +65,9 @@ class PatientSummaryInitTest {
                 hasModel(model),
                 hasEffects(
                     LoadPatientSummaryProfile(patientUuid) as PatientSummaryEffect,
-                    CheckIfCDSSPilotIsEnabled
+                    CheckIfCDSSPilotIsEnabled,
+                    LoadBMIFeature,
+                    LoadBMiReading(patientUuid)
                 )
             )
         )
@@ -95,7 +99,9 @@ class PatientSummaryInitTest {
             assertThatFirst(
                 hasModel(model),
                 hasEffects(
-                    LoadPatientSummaryProfile(patientUuid) as PatientSummaryEffect
+                    LoadPatientSummaryProfile(patientUuid) as PatientSummaryEffect,
+                    LoadBMIFeature,
+                    LoadBMiReading(patientUuid)
                 )
             )
         )