Skip to content

Commit 0891ed5

Browse files
author
sagarwal
committed
Remove diabetesManagementEnabled arg from showDiagnosisError
1 parent e184c86 commit 0891ed5

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ data class ShowScheduleAppointmentSheet(
109109
val currentFacility: Facility
110110
) : PatientSummaryViewEffect()
111111

112-
data class ShowDiagnosisError(
113-
val diabetesManagementEnabled: Boolean
114-
) : PatientSummaryViewEffect()
112+
data object ShowDiagnosisError: PatientSummaryViewEffect()
115113

116114
data object ShowHypertensionDiagnosisError : PatientSummaryViewEffect()
117115

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,10 +577,10 @@ class PatientSummaryScreen :
577577
))
578578
}
579579

580-
override fun showDiagnosisError(diabetesManagementEnabled: Boolean) {
580+
override fun showDiagnosisError() {
581581
// Diagnosis error message could be obscured, scroll until the entire view is visible
582582
summaryViewsContainer.scrollToChild(medicalHistorySummaryView) {
583-
medicalHistorySummaryView.showDiagnosisError(diabetesManagementEnabled)
583+
medicalHistorySummaryView.showDiagnosisError()
584584
}
585585
}
586586

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ interface PatientSummaryUiActions {
2222
fun showUpdatePhoneDialog(patientUuid: UUID)
2323
fun showAddPhoneDialog(patientUuid: UUID)
2424
fun showLinkIdWithPatientView(patientUuid: UUID, identifier: Identifier)
25-
fun showDiagnosisError(diabetesManagementEnabled: Boolean)
25+
fun showDiagnosisError()
2626
fun showHypertensionDiagnosisError()
2727
fun openPatientContactSheet(patientUuid: UUID)
2828
fun navigateToTeleconsultRecordScreen(patientUuid: UUID, teleconsultRecordId: UUID)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PatientSummaryViewEffectHandler(
2020
currentFacility = viewEffect.currentFacility
2121
)
2222

23-
is ShowDiagnosisError -> uiActions.showDiagnosisError(viewEffect.diabetesManagementEnabled)
23+
is ShowDiagnosisError -> uiActions.showDiagnosisError()
2424
is ShowHypertensionDiagnosisError -> uiActions.showHypertensionDiagnosisError()
2525
is OpenContactPatientScreen -> uiActions.openPatientContactSheet(viewEffect.patientUuid)
2626
is NavigateToTeleconsultRecordScreen -> uiActions.navigateToTeleconsultRecordScreen(viewEffect.patientUuid, viewEffect.teleconsultRecordId)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ class MedicalHistorySummaryView(
186186
modelUpdateCallback = callback
187187
}
188188

189-
fun showDiagnosisError(diabetesManagementEnabled: Boolean) {
190-
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, diabetesManagementEnabled)
189+
fun showDiagnosisError() {
190+
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, true)
191191
}
192192

193193
fun showHypertensionDiagnosisError() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,10 @@ class PatientSummaryEffectHandlerTest {
376376
@Test
377377
fun `when show diagnosis error effect is received, then show diagnosis error`() {
378378
// when
379-
testCase.dispatch(ShowDiagnosisError(true))
379+
testCase.dispatch(ShowDiagnosisError)
380380

381381
// then
382-
verify(uiActions).showDiagnosisError(true)
382+
verify(uiActions).showDiagnosisError()
383383
verifyNoMoreInteractions(uiActions)
384384
testCase.assertNoOutgoingEvents()
385385
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class PatientSummaryUpdateTest {
232232
}
233233

234234
@Test
235-
fun `when there are patient summary changes and at least one measurement is present and no diagnosis is recorded and diabetes management is enabled, then clicking on back must show diagnosis error`() {
235+
fun `when no diagnosis is recorded and diabetes management is enabled, then clicking on back must show diagnosis error`() {
236236
val model = defaultModel.currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
237237

238238
updateSpec
@@ -254,12 +254,12 @@ class PatientSummaryUpdateTest {
254254
))
255255
.then(assertThatNext(
256256
hasNoModel(),
257-
hasEffects(ShowDiagnosisError(true) as PatientSummaryEffect)
257+
hasEffects(ShowDiagnosisError as PatientSummaryEffect)
258258
))
259259
}
260260

261261
@Test
262-
fun `when there are patient summary changes and at least one measurement is present and no diagnosis is recorded and diabetes management is disabled, then show diagnosis error`() {
262+
fun `when no diagnosis is recorded and diabetes management is disabled, then show diagnosis error`() {
263263
val model = defaultModel.currentFacilityLoaded(facilityWithDiabetesManagementDisabled)
264264

265265
updateSpec
@@ -281,7 +281,7 @@ class PatientSummaryUpdateTest {
281281
))
282282
.then(assertThatNext(
283283
hasNoModel(),
284-
hasEffects(ShowDiagnosisError(false) as PatientSummaryEffect)
284+
hasEffects(ShowHypertensionDiagnosisError)
285285
))
286286
}
287287

@@ -452,7 +452,7 @@ class PatientSummaryUpdateTest {
452452
}
453453

454454
@Test
455-
fun `when at least one measurement is present and diagnosis is not recorded and diabetes management is enabled, clicking on save must show diagnosis error`() {
455+
fun `when diagnosis is not recorded and diabetes management is enabled, clicking on save must show diagnosis error`() {
456456
val model = defaultModel.currentFacilityLoaded(facilityWithDiabetesManagementEnabled)
457457

458458
updateSpec
@@ -474,12 +474,12 @@ class PatientSummaryUpdateTest {
474474
))
475475
.then(assertThatNext(
476476
hasNoModel(),
477-
hasEffects(ShowDiagnosisError(true) as PatientSummaryEffect)
477+
hasEffects(ShowDiagnosisError as PatientSummaryEffect)
478478
))
479479
}
480480

481481
@Test
482-
fun `when at least one measurement is present and diagnosis is not recorded and diabetes management is disabled, clicking on save must show diagnosis error`() {
482+
fun `when diagnosis is not recorded and diabetes management is disabled, clicking on save must show diagnosis error`() {
483483
val model = defaultModel.currentFacilityLoaded(facilityWithDiabetesManagementDisabled)
484484

485485
updateSpec
@@ -501,7 +501,7 @@ class PatientSummaryUpdateTest {
501501
))
502502
.then(assertThatNext(
503503
hasNoModel(),
504-
hasEffects(ShowDiagnosisError(false) as PatientSummaryEffect)
504+
hasEffects(ShowHypertensionDiagnosisError)
505505
))
506506
}
507507

0 commit comments

Comments
 (0)