Skip to content

Commit f149c4f

Browse files
author
sagarwal
committed
Update medical summary view diagnosis options based on feature flag
1 parent 2e39093 commit f149c4f

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ fun DiagnosisContainer(
2121
hypertensionAnswer: Answer?,
2222
diabetesAnswer: Answer?,
2323
showDiabetesDiagnosisView: Boolean,
24+
isScreeningFeatureEnabled: Boolean,
2425
modifier: Modifier = Modifier,
2526
onAnswerChange: (MedicalHistoryQuestion, Answer) -> Unit,
2627
) {
@@ -30,10 +31,16 @@ fun DiagnosisContainer(
3031
.padding(dimensionResource(R.dimen.spacing_16))
3132
) {
3233

34+
val options = if (isScreeningFeatureEnabled) {
35+
listOf(Answer.Yes, Answer.No, Answer.Suspected)
36+
} else {
37+
listOf(Answer.Yes, Answer.No)
38+
}
39+
3340
MedicalHistoryDiagnosisQuestionItem(
3441
header = stringResource(R.string.medicalhistorysummaryview_hypertension_diagnosis),
3542
question = MedicalHistoryQuestion.DiagnosedWithHypertension,
36-
options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
43+
options = options,
3744
selectedAnswer = hypertensionAnswer,
3845
onAnswerChange = onAnswerChange
3946
)
@@ -49,7 +56,7 @@ fun DiagnosisContainer(
4956
MedicalHistoryDiagnosisQuestionItem(
5057
header = stringResource(R.string.medicalhistorysummaryview_diabetes_diagnosis),
5158
question = MedicalHistoryQuestion.DiagnosedWithDiabetes,
52-
options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
59+
options = options,
5360
selectedAnswer = diabetesAnswer,
5461
onAnswerChange = onAnswerChange
5562
)
@@ -66,6 +73,7 @@ fun DiagnosisContainerPreview(modifier: Modifier = Modifier) {
6673
hypertensionAnswer = Answer.Yes,
6774
diabetesAnswer = Answer.No,
6875
showDiabetesDiagnosisView = true,
76+
isScreeningFeatureEnabled = true,
6977
modifier = modifier,
7078
onAnswerChange = { _, _ -> }
7179
)

app/src/main/java/org/simple/clinic/summary/medicalhistory/MedicalHistorySummaryView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ class MedicalHistorySummaryView(
122122
isUsingSmokelessTobaccoAnswer = medicalHistory?.isUsingSmokelessTobacco,
123123
diabetesManagementEnabled = diabetesManagementEnabled,
124124
showSmokerQuestion = showSmokerQuestion,
125-
showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion
125+
showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion,
126+
isScreeningFeatureEnabled = features.isEnabled(Feature.Screening)
126127
) { question, answer ->
127128
answerToggled(question, answer)
128129
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ fun MedicalHistorySummary(
2828
diabetesManagementEnabled: Boolean,
2929
showSmokerQuestion: Boolean,
3030
showSmokelessTobaccoQuestion: Boolean,
31+
isScreeningFeatureEnabled: Boolean,
3132
modifier: Modifier = Modifier,
3233
onAnswerChange: (MedicalHistoryQuestion, Answer) -> Unit,
3334
) {
@@ -42,6 +43,7 @@ fun MedicalHistorySummary(
4243
hypertensionAnswer = hypertensionAnswer,
4344
diabetesAnswer = diabetesAnswer,
4445
showDiabetesDiagnosisView = diabetesManagementEnabled,
46+
isScreeningFeatureEnabled = isScreeningFeatureEnabled,
4547
onAnswerChange = onAnswerChange,
4648
)
4749

@@ -80,6 +82,7 @@ private fun MedicalHistorySummaryPreview() {
8082
diabetesManagementEnabled = true,
8183
showSmokerQuestion = false,
8284
showSmokelessTobaccoQuestion = false,
85+
isScreeningFeatureEnabled = true,
8386
onAnswerChange = { _, _ ->
8487
// no-op
8588
}
@@ -102,6 +105,7 @@ private fun MedicalHistorySummaryNoDiabetesManagementPreview() {
102105
diabetesManagementEnabled = false,
103106
showSmokerQuestion = false,
104107
showSmokelessTobaccoQuestion = false,
108+
isScreeningFeatureEnabled = true,
105109
onAnswerChange = { _, _ ->
106110
// no-op
107111
}
@@ -124,6 +128,7 @@ private fun MedicalHistorySummarySmokerPreview() {
124128
diabetesManagementEnabled = true,
125129
showSmokerQuestion = true,
126130
showSmokelessTobaccoQuestion = false,
131+
isScreeningFeatureEnabled = true,
127132
onAnswerChange = { _, _ ->
128133
// no-op
129134
}
@@ -146,6 +151,7 @@ private fun MedicalHistorySummaryTobaccoUsePreview() {
146151
diabetesManagementEnabled = true,
147152
showSmokerQuestion = true,
148153
showSmokelessTobaccoQuestion = true,
154+
isScreeningFeatureEnabled = true,
149155
onAnswerChange = { _, _ ->
150156
// no-op
151157
}

app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdateTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class NewMedicalHistoryUpdateTest {
2929
private val defaultModel = NewMedicalHistoryModel.default(
3030
country = country,
3131
showIsSmokingQuestion = false,
32-
showSmokelessTobaccoQuestion = false
32+
showSmokelessTobaccoQuestion = false,
33+
isScreeningFeatureEnabled = true,
3334
)
3435
private val facilityWithDiabetesManagementEnabled = TestData.facility(
3536
uuid = UUID.fromString("3c7bc1c8-1bb6-4c3a-b6d0-52700bdaac5c"),
@@ -231,7 +232,8 @@ class NewMedicalHistoryUpdateTest {
231232
val model = NewMedicalHistoryModel.default(
232233
country = bangladesh,
233234
showIsSmokingQuestion = false,
234-
showSmokelessTobaccoQuestion = false
235+
showSmokelessTobaccoQuestion = false,
236+
isScreeningFeatureEnabled = true
235237
)
236238
.ongoingPatientEntryLoaded(patientEntry)
237239
.currentFacilityLoaded(facilityWithDiabetesManagementEnabled)

0 commit comments

Comments
 (0)