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.

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

Implement index testing, HIV and TB registers #1878

Draft
wants to merge 125 commits into
base: master-v1
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
e75a969
Updated dependencies
cozej4 May 15, 2020
caf0666
Code refactoring
cozej4 May 16, 2020
45edf1e
Added TB clients icons and navigation menu item
cozej4 May 16, 2020
e144d6e
Updated chw application flavor interface to include hasTB and hasHIV
cozej4 May 16, 2020
c248863
Added hivRegisterActivity to the list of registeredActivities
cozej4 May 16, 2020
57a7cb5
Added ec_hiv_register to client fields
cozej4 May 18, 2020
19cd605
Code refactoring
cozej4 May 18, 2020
7bcfb42
Implemented hiv registration forms
cozej4 May 19, 2020
34cfed6
Updated BA ChwApplication flavor
cozej4 May 19, 2020
c2adb72
Updated hiv queries
cozej4 May 19, 2020
9e762f7
Code refactoring
cozej4 May 19, 2020
5608625
Code refactoring
cozej4 May 19, 2020
844d06b
Implemented profile menu actions for launching HIV registration form
cozej4 May 19, 2020
f3b78e6
Refactored openeing of hiv profile
cozej4 May 21, 2020
85a5ed9
Added tb registration forms
cozej4 May 21, 2020
a091fb4
Code refactoring
cozej4 May 21, 2020
2372aa1
setup tb library on chw application
cozej4 May 21, 2020
125194f
Implement TB register
cozej4 May 21, 2020
a1f5e73
Refactored TB registration forms
cozej4 May 22, 2020
62ec8bc
Code refactoring
cozej4 May 22, 2020
9bcb190
Code refactoring
cozej4 May 22, 2020
e0649c9
Code refactoring
cozej4 May 22, 2020
3e2ae7d
Added hiv and tb followup rule files
cozej4 May 22, 2020
289c406
Implemented TB and HIV clients profiles
cozej4 May 22, 2020
5abb6eb
Optimising imports
cozej4 May 22, 2020
e7d0e2b
Code refactoring
cozej4 May 23, 2020
2ded6e9
Implemented TB Followup form
cozej4 May 23, 2020
49cc471
Implemented HIV followup visit forms
cozej4 May 23, 2020
d26b141
Code refactoring
cozej4 May 23, 2020
d0fe3f6
Implemented opening of HIV and TB Followup forms from their profiles
cozej4 May 24, 2020
07c8465
Refactored Hiv register fragment
cozej4 May 24, 2020
d964054
Code refactoring
cozej4 May 24, 2020
f4602b4
Refactored TbRegisterFragment into chw-core
cozej4 May 24, 2020
1450324
Code refactoring
cozej4 May 24, 2020
bbf0796
Implemented hiv and TB visits schedulers
cozej4 May 24, 2020
9e88def
Refactored hiv and tb followup rules
cozej4 May 24, 2020
3363081
Code refactoring
cozej4 May 24, 2020
0255aba
Code refactoring
cozej4 May 24, 2020
416e654
Updated tb registration form
cozej4 May 25, 2020
3e8248a
Code refactoring
cozej4 May 26, 2020
891228b
Code cleaning
cozej4 May 26, 2020
432c129
Minor bugs fix
cozej4 May 26, 2020
874d4d0
Implemented TB and HIV profiles fab floating menus
cozej4 May 26, 2020
e38ddc9
Code cleaning
cozej4 May 26, 2020
a049064
Updated referral types for various registers by moving hiv and tb ref…
cozej4 May 26, 2020
8a7079b
Implemented TB case closure forms
cozej4 May 27, 2020
1b721d3
Code refactoring
cozej4 May 27, 2020
7004585
Migrated tb forms to comply with latest neat form libary
cozej4 May 27, 2020
268cbcf
Migrated hiv forms to comply with latest neat form libary
cozej4 May 27, 2020
6975d96
Merged changes from master
cozej4 May 27, 2020
71653b9
Code refactoring to comply with the lates client core and chw core
cozej4 May 27, 2020
149c388
Code refactoring
cozej4 May 27, 2020
89af554
Migrated referral forms, hiv and tb forms to the latest neat library …
cozej4 May 27, 2020
5d72f77
Code cleaning
cozej4 May 28, 2020
f999176
Refactored starting of hiv form activities
cozej4 May 28, 2020
8d94136
Refactored starting of TB form activity
cozej4 May 28, 2020
d2cfa61
Merged changes from show-notifications-row-on-member-profile
cozej4 May 28, 2020
7792f39
Added hiv swahili forms
cozej4 May 29, 2020
bce9126
Added tb swahili forms and hiv forms refactor
cozej4 May 29, 2020
4471d58
Refactored th and hiv forms
cozej4 May 29, 2020
4d64464
Fixed an issue in updating tb menu items
cozej4 May 29, 2020
12a70a5
Upated showing of menu items in all clients register and pnc member p…
cozej4 May 29, 2020
885124f
Updated tb and hiv registers due button filter
cozej4 May 29, 2020
c4419ad
Updated opening of hiv and tb profiles from all clients register
cozej4 May 29, 2020
2e0b60a
Code refactoring
cozej4 Jun 9, 2020
d7c06e0
Merged changes from master
cozej4 Jun 11, 2020
75ddc7c
Code refactoring
cozej4 Jun 17, 2020
cf81f01
Code refactoring
cozej4 Jun 17, 2020
b937bf5
Refactored All clients register to chw core
cozej4 Jun 18, 2020
77f0227
Code refactoring
cozej4 Jun 22, 2020
e82b007
added swahili version of hiv and tb community followup feedback forms…
cozej4 Jun 26, 2020
5396210
Disabled due buttons on hiv and tb community followup register fragments
cozej4 Jun 26, 2020
b536848
Fixed an issue in loading reasons for issuing community referral in …
cozej4 Jun 26, 2020
c8efe97
Fixed a bug in updating all clients registration information
cozej4 Jun 29, 2020
61ceeb9
Refactored ec client classification for TB and HIV community outcome …
cozej4 Jun 29, 2020
26238a1
Implemented opening of hiv and tb profile activities from view update…
cozej4 Jun 29, 2020
a7d8525
Updated updates register icon
cozej4 Jun 29, 2020
bfbd109
Merged changes from master
cozej4 Jun 30, 2020
e89d3d4
Refactored hiv and tb registers main condition queries to exclude cli…
cozej4 Jul 2, 2020
a0b2a7a
Fixed a bug in get Main condition for hiv register fragment
cozej4 Jul 2, 2020
9646f8d
Implemented menu items for hiv and tb registration from tb and hiv pr…
cozej4 Jul 2, 2020
397431f
Added ec client classification for hiv and tb notification dismissal …
cozej4 Jul 3, 2020
9afe046
Refactored opening forms from repository or assets
cozej4 Jul 14, 2020
a62ca8e
Merged changes from master
cozej4 Jul 14, 2020
9aad572
Refactored opening of hiv and tb forms from repository or assets. Ref…
cozej4 Jul 15, 2020
228de7b
Merge branch 'master' into implement-hiv-and-tb-registers
cozej4 Jul 17, 2020
39d5b1e
Fixed codacy issues
cozej4 Jul 17, 2020
6f75e32
updated dependencies and ba version code and version name
cozej4 Jul 17, 2020
c9875ac
Update HIV and TB visit schedulers
ellykits Jul 17, 2020
6948033
Merged changes from master
cozej4 Jul 30, 2020
17bacbd
Code cleaning
cozej4 Jul 30, 2020
6f32d70
Code refactoring due to changes made on client-core 1.15.1-SNAPSHOT
cozej4 Jul 30, 2020
1c72680
Fixed codacy issues
cozej4 Jul 30, 2020
6698b6f
Merge branch 'implement-hiv-and-tb-registers' of github.com:OpenSRP/o…
ellykits Sep 10, 2020
1ecafc4
Merge branch 'master' into implement-hiv-and-tb-registers
ellykits Sep 10, 2020
2924108
Fix failing builds
ellykits Sep 10, 2020
160054f
Merge branch 'master' into implement-hiv-and-tb-registers
ellykits Sep 15, 2020
3c6c9c1
Updated Repository Migrations for upgrading database to version 21
cozej4 Sep 21, 2020
9eca8e7
Refactored hiv and tb swahili registration forms
cozej4 Sep 21, 2020
df8659b
Fixed travic issues
cozej4 Sep 22, 2020
4780630
Merge branch 'master' into implement-hiv-and-tb-registers
cozej4 Sep 22, 2020
013c377
Added implementation for updating hiv and tb menu items on DefaultFam…
cozej4 Sep 22, 2020
2bc0315
Code refactoring
cozej4 Sep 22, 2020
5c95177
Fixed travic issues
cozej4 Sep 23, 2020
101503d
Merged changes from master
cozej4 Sep 23, 2020
abc64f0
Merge branch 'master' into implement-hiv-and-tb-registers
cozej4 Sep 29, 2020
2f7c5d4
Added kujaku maven repositories
cozej4 Sep 29, 2020
ffbaa7a
refactored navigation menu flavor to add hasComunityResponders implem…
cozej4 Sep 29, 2020
1b9222e
Updated chw-core dependency
cozej4 Sep 29, 2020
ab80c98
Updated chw-core dependency
cozej4 Sep 29, 2020
b43cdf1
Updated chw core dependency
cozej4 Sep 29, 2020
273fbdf
Implemented hiv index testing register
Sep 4, 2021
40be161
Merged master-v1 into implement-index-testing-hiv-and-tb-registers
Sep 4, 2021
d07c6bb
Fixed some merging errors
cozej4 Sep 4, 2021
bcb9770
Added index testing ec_client_fields and ec_client_classification
cozej4 Sep 5, 2021
0871951
Added hiv index testing forms
cozej4 Sep 5, 2021
1ad7828
Refactored HivIndexContact Register and Profile Activity
cozej4 Sep 5, 2021
72eacfa
updated dependencies
cozej4 Sep 7, 2021
fe4ec71
Various bugs fixes
cozej4 Oct 26, 2021
3744eb0
Refactored json forms swahili na english naming, e.g Nearest Facility…
cozej4 Oct 26, 2021
38ec18d
Changed default activity after login in for the boresha south build f…
cozej4 Oct 26, 2021
d8d4406
Refactored reasons for registrations, updated 'Women who sell sex' to…
cozej4 Oct 26, 2021
4c53501
Implemented mentioning other occupations in family and all clients re…
cozej4 Oct 26, 2021
e59f225
Implemented more UAT changes proposed by NACP
cozej4 Nov 1, 2021
ac288e7
Refactored Opening HIV Registration forms. Separated the forms for ma…
cozej4 Nov 6, 2021
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
12 changes: 6 additions & 6 deletions opensrp-chw/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ android {
buildConfigField "int", "SCHEDULE_SERVICE_MINUTES", '360'
buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
buildConfigField "boolean", "USE_UNIFIED_REFERRAL_APPROACH", "true"
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "false"
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "true"
testCoverageEnabled true
}
}
Expand Down Expand Up @@ -178,17 +178,17 @@ android {
versionName "1.0.9"
buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/ba/"'
buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"http://50.116.15.4:8082/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://ba-unified-stage.smartregister.org/opensrp/"'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Region","District","Ward" , "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Ward", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Ward", "Facility", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Village Sublocations"'
buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Village"'
// Kujaku variables
buildConfigField "long", "MAPBOX_DOWNLOAD_TILE_LIMIT", "6001"

buildConfigField "int", "DATABASE_VERSION", '23'
buildConfigField "int", "DATABASE_VERSION", '24'
}
chad {
dimension = 'baseDimension'
Expand Down Expand Up @@ -294,7 +294,7 @@ android {
}

dependencies {
implementation('org.smartregister:opensrp-client-chw-core:1.5.27-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-chw-core:1.5.28-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'androidx.legacy', module: 'legacy-support-v4'
Expand Down Expand Up @@ -323,7 +323,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'org.mockito:mockito-android:3.0.0'

implementation 'com.github.lecho:hellocharts-android:v1.5.8'
implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'

testImplementation "org.koin:koin-test:2.0.1"
testImplementation 'junit:junit:4.13'
Expand Down
122 changes: 122 additions & 0 deletions opensrp-chw/src/ba/assets/ec_client_classification.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,128 @@
"creates_case": [
"ec_not_yet_done_referral"
]
},
{
"field": "eventType",
"field_value": "Hiv Registration",
"creates_case": [
"ec_hiv_register"
]
},
{
"field": "eventType",
"field_value": "HIV Followup",
"creates_case": [
"ec_hiv_register"
]
},
{
"field": "eventType",
"field_value": "Tb Registration",
"creates_case": [
"ec_tb_register"
]
},
{
"field": "eventType",
"field_value": "TB Case Closure",
"creates_case": [
"ec_tb_register"
]
},
{
"field": "eventType",
"field_value": "HIV Community Followup",
"creates_case": [
"ec_hiv_community_followup"
]
},
{
"field": "eventType",
"field_value": "TB Community Followup",
"creates_case": [
"ec_tb_community_followup"
]
},
{
"field": "eventType",
"field_value": "HIV Community Followup Feedback",
"creates_case": [
"ec_hiv_community_feedback"
]
},
{
"field": "eventType",
"field_value": "TB Community Followup Feedback",
"creates_case": [
"ec_tb_community_feedback"
]
},
{
"field": "eventType",
"field_value": "HIV Outcome",
"creates_case": [
"ec_hiv_outcome",
"ec_hiv_register"
]
},
{
"field": "eventType",
"field_value": "TB Outcome",
"creates_case": [
"ec_tb_outcome",
"ec_tb_register"
]
},
{
"field": "eventType",
"field_value": "HIV Notification Dismissal",
"creates_case": [
"ec_hiv_outcome"
]
},
{
"field": "eventType",
"field_value": "TB Notification Dismissal",
"creates_case": [
"ec_tb_outcome"
]
},
{
"field": "eventType",
"field_value": "Hiv Index Contact Registration",
"creates_case": [
"ec_hiv_index"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact CHW Followup",
"creates_case": [
"ec_hiv_index"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact Testing Followup",
"creates_case": [
"ec_hiv_index"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact Community Followup Referral",
"creates_case": [
"ec_hiv_index",
"ec_hiv_index_contact_community_followup"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact Community Followup Notification Dismissal",
"creates_case": [
"ec_hiv_index_contact_community_followup"
]
}
]
}
Expand Down
Loading