Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Quest/Malawi Core] Add Viral Load Collection & Results at the overflow menu #115

Merged
merged 2 commits into from
Nov 12, 2024
Merged

[Quest/Malawi Core] Add Viral Load Collection & Results at the overflow menu #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10fb2bd
Add Viral Load Collection & Results at the overflow menu
calmwalija Oct 22, 2024
027a979
Changes requested
calmwalija Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...id/quest/src/main/java/org/smartregister/fhircore/quest/navigation/OverflowMenuFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ enum class OverflowMenuHost(val overflowMenuItems: List<OverflowMenuItem>) {
listOf(
OverflowMenuItem(R.id.client_visit, R.string.client_visit).apply { hidden = true },
OverflowMenuItem(R.id.guardian_visit, R.string.guardian_visit),
OverflowMenuItem(R.id.vl_collection, R.string.vl_collection),
OverflowMenuItem(R.id.viral_load_results, R.string.viral_load_results),
OverflowMenuItem(R.id.view_children, R.string.view_children_x),
OverflowMenuItem(R.id.view_guardians, R.string.view_guardians_x),
Expand All @@ -79,6 +80,8 @@ enum class OverflowMenuHost(val overflowMenuItems: List<OverflowMenuItem>) {
OverflowMenuItem(R.id.view_children, R.string.view_children_x),
OverflowMenuItem(R.id.view_guardians, R.string.view_guardians_x),
OverflowMenuItem(R.id.edit_profile, R.string.edit_profile),
OverflowMenuItem(R.id.vl_collection, R.string.vl_collection),
OverflowMenuItem(R.id.vl_results, R.string.vl_results),
OverflowMenuItem(R.id.clinic_history, R.string.clinic_history),
OverflowMenuItem(R.id.patient_transfer_out, R.string.transfer_out),
OverflowMenuItem(R.id.patient_change_status, R.string.change_status),
Expand Down
17 changes: 17 additions & 0 deletions .../main/java/org/smartregister/fhircore/quest/ui/patient/profile/PatientProfileViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,22 @@ constructor(
questionnaireType = QuestionnaireType.DEFAULT,
populationResources = profile.populationResources,
)
R.id.vl_collection ->
QuestionnaireActivity.launchQuestionnaire(
event.context,
questionnaireId = VIRAL_LOAD_COLLECTION_FORM,
clientIdentifier = patientId,
questionnaireType = QuestionnaireType.DEFAULT,
populationResources = profile.populationResources,
)
R.id.vl_results ->
QuestionnaireActivity.launchQuestionnaire(
event.context,
questionnaireId = VIRAL_LOAD_RESULTS_FORM,
clientIdentifier = patientId,
questionnaireType = QuestionnaireType.DEFAULT,
populationResources = profile.populationResources,
)
R.id.hiv_test_and_results ->
QuestionnaireActivity.launchQuestionnaire(
event.context,
Expand Down Expand Up @@ -512,6 +528,7 @@ constructor(
const val ANC_ENROLLMENT_FORM = "anc-patient-registration"
const val EDIT_PROFILE_FORM = "patient-edit-profile"
const val VIRAL_LOAD_RESULTS_FORM = "art-client-viral-load-test-results"
const val VIRAL_LOAD_COLLECTION_FORM = "art-client-viral-load-collection"
const val HIV_TEST_AND_RESULTS_FORM = "exposed-infant-hiv-test-and-results"
const val HIV_TEST_AND_NEXT_APPOINTMENT_FORM =
"contact-and-community-positive-hiv-test-and-next-appointment"
Expand Down
2 changes: 2 additions & 0 deletions android/quest/src/main/res/values/ids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@
<item name="patient_change_status" type="id"/>
<item name="patient_transfer_out" type="id"/>
<item name="tracing_history" type="id"/>
<item name="vl_collection" type="id"/>
<item name="vl_results" type="id"/>
</resources>
2 changes: 2 additions & 0 deletions android/quest/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
<string name="remove_active_person">Remove This Person</string>
<string name="change_status">Change Status</string>
<string name="transfer_out">Transfer Out</string>
<string name="vl_collection">Viral Load Collection</string>
<string name="vl_results">Viral Load Results</string>
calmwalija marked this conversation as resolved.
Show resolved Hide resolved

<!-- SideMenu option strings-->
<string name="device_to_device_sync">Device to device sync</string>
Expand Down
Loading