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

Implement tb and hiv registers #109

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Implement tb and hiv registers #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
85733c8
Implemented hiv and tb registers
cozej4 Jun 9, 2020
b6da339
Code cleaning
cozej4 Jun 9, 2020
8c57c88
Implemented hiv and tb outcome forms
cozej4 Jun 10, 2020
786856a
Code refactoring
cozej4 Jun 10, 2020
8afcc55
Code refactoring
cozej4 Jun 10, 2020
cefa365
refactored ec client classification
cozej4 Jun 11, 2020
779c780
Code refactoring
cozej4 Jun 11, 2020
b8def86
Refactored ec_client_classification
cozej4 Jun 11, 2020
a09538e
Code refactoring
cozej4 Jun 18, 2020
3bbacb7
Merged changes from master
cozej4 Jun 18, 2020
2fc5d3d
Implemented all clients registration form
cozej4 Jun 18, 2020
4c6f1e6
Refactored sync of family member and child to chw
cozej4 Jun 22, 2020
3e76609
Code cleaning
cozej4 Jun 22, 2020
f992531
Refactored sync of family planning to chw and code cleaning
cozej4 Jun 22, 2020
c76bc4f
Added hiv and tb community feedback to all clients fields and added e…
cozej4 Jun 25, 2020
0830bf4
Added hiv and tb community followup feedback event types to ec_clien…
cozej4 Jun 25, 2020
fb67550
Implemented viewing of hiv and tb community referral feedbacks from t…
cozej4 Jun 26, 2020
b7260ec
Optimising imports
cozej4 Jun 26, 2020
a687eed
Refactored tb and hiv register fragments referred clients filter queries
cozej4 Jun 26, 2020
852e6e7
Updated hiv and tb followup fragments due only text and due only quer…
cozej4 Jun 26, 2020
bdb865d
Implemented opening of independent clients profile activity
cozej4 Jun 26, 2020
1e608dd
Added hiv and tb registration forms
cozej4 Jun 29, 2020
a690891
Refactored hiv and tb outcome forms facility visit dates into strings
cozej4 Jun 29, 2020
cb3eb9a
Updated hf app logo to use tanzania court of arms logo
cozej4 Jun 30, 2020
f86f619
Refactored hiv and tb registers row item layouts
cozej4 Jul 1, 2020
e52dac4
refactored hiv and tb community feedback ec_client_fields
cozej4 Jul 1, 2020
14a93b5
Updated hiv outcome hiv facility visit date calculation
cozej4 Jul 2, 2020
a508e9d
Updated tb outcome tb facility visit date calculation
cozej4 Jul 2, 2020
9be4adc
Refactored hiv and tb registers main condition queries to exclude cli…
cozej4 Jul 2, 2020
2089b55
Refactored hiv and tb registration forms for hf
cozej4 Jul 2, 2020
881a36b
Updated dependencies
cozej4 Jul 17, 2020
bef7691
Refactored loading forms from assets or repository and minor code ref…
cozej4 Jul 30, 2020
de2a0e2
Updated chw-core dependency version
cozej4 Jul 30, 2020
c18c8d2
Fixed codacy issues
cozej4 Jul 30, 2020
4151734
Optimised imports
cozej4 Jul 30, 2020
3902f57
Merge branch 'master' into implement-tb-and-hiv-registers
ellykits Sep 10, 2020
18efe41
Fix failing builds
ellykits Sep 10, 2020
3eb7f11
Make login logo configurable
ellykits Sep 15, 2020
c50c9d4
Updated db migrations for db version 10
cozej4 Sep 21, 2020
819199f
Added swahili translations for hiv and tb forms
cozej4 Sep 21, 2020
0d22ff8
Added migrations for adding missing fields to ec_family_member
cozej4 Sep 21, 2020
363339e
Added migration for missing ec_family_member collumns
cozej4 Sep 21, 2020
3f5152a
default BUILD_FOR_BORESHA_AFYA_SOUTH to false
cozej4 Sep 21, 2020
f536d6f
Refactored tb outcome form translations
cozej4 Sep 21, 2020
543f6fa
Merged changes from master
cozej4 Jun 9, 2021
17a7284
Added register hiv index clients menu to the HIV profile fab
cozej4 Jun 10, 2021
eb67dbe
Finalized implementation of Index clients registrations
cozej4 Jun 11, 2021
7abd56b
Refactored ec_hiv_index fields names
cozej4 Jun 12, 2021
45b7e41
Refactored hiv index clients registration form fixed issues on saving…
cozej4 Jun 12, 2021
75caaab
Refactored ec_hiv_index fields
cozej4 Jun 12, 2021
4953578
Implemented HIV Index Register activity for showing all registered HI…
cozej4 Jun 12, 2021
1e1987d
Implemented HIV client Profile viewing index list
cozej4 Jun 17, 2021
fe4f53e
Refactored index contacts classes names
cozej4 Jun 17, 2021
31896ef
Code refactoring due hiv module classes rename
cozej4 Jun 17, 2021
bcfe2b8
Refactored implementation for hiv index contacts followup for hiv pos…
cozej4 Jul 3, 2021
1dcd942
Refacctored HF Index Testing Module Implementation
cozej4 Jul 18, 2021
e5dc156
Refactored class names
cozej4 Oct 3, 2021
f9a3a4d
Changed the default home screen to All clients register while using b…
cozej4 Oct 27, 2021
f0c421d
Implemented HTS Reigster and NACP suggested changes to the HF app
cozej4 Nov 6, 2021
178b709
Refactored build.gradle changeing the debug url
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
13 changes: 10 additions & 3 deletions opensrp-chw-hf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
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://boresha-afya-stage.smartregister.org/opensrp/"'
// buildConfigField "String", 'opensrp_url_debug', '"https://ba-unified-stage.smartregister.org/opensrp/"'
buildConfigField "boolean", 'SUPPORT_QR', 'true'
buildConfigField "int", "DATABASE_VERSION", '12'
Expand Down Expand Up @@ -75,6 +76,7 @@ android {
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Region","District","Ward" ,"Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Facility"'
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "true"
buildConfigField "String[]", 'FACILITY_LEVEL', '{"MOH Jhpiego Facility Name", "Health Facility", "Facility"}'
}

Expand All @@ -94,6 +96,7 @@ android {
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Ward" , "Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country","Region","District","Ward" ,"Council", "Facility", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
buildConfigField "String", 'DEFAULT_LOCATION', '"Facility"'
buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "true"
buildConfigField "String[]", 'FACILITY_LEVEL', '{"MOH Jhpiego Facility Name", "Health Facility", "Facility"}'
testCoverageEnabled true
}
Expand Down Expand Up @@ -143,11 +146,15 @@ android {
abortOnError false
}

dataBinding {
enabled = true
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation('org.smartregister:opensrp-client-chw-core:1.5.27-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-chw-core:1.5.28-SNAPSHOT@aar') {
// implementation(project(":opensrp-chw-core")) {
transitive = true
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -172,7 +179,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.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 'junit:junit:4.13'
testImplementation 'org.mockito:mockito-core:3.1.0'
Expand Down
55 changes: 55 additions & 0 deletions opensrp-chw-hf/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@drawable/ic_launcher"
android:usesCleartextTraffic="true"
android:supportsRtl="true"
android:theme="@style/HFTheme"
tools:replace="android:theme">
Expand Down Expand Up @@ -108,6 +109,10 @@
android:name="org.smartregister.chw.hf.activity.ReferralTaskViewActivity"
android:screenOrientation="portrait"
android:theme="@style/HFTheme.NoActionBar" />
<activity
android:name="org.smartregister.chw.hf.activity.CommunityFollowupFeedbackViewActivity"
android:screenOrientation="portrait"
android:theme="@style/HFTheme.NoActionBar" />
<activity
android:name=".activity.AncRegisterActivity"
android:screenOrientation="portrait"
Expand All @@ -128,6 +133,17 @@
<activity
android:name=".activity.AllClientsRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />
<activity
android:name=".activity.AllClientsMemberProfileActivity"
android:label="@string/title_family_detail"
android:parentActivityName=".activity.AllClientsRegisterActivity"
android:theme="@style/FamilyTheme.NoActionBar" />
<activity
android:name=".activity.IndividualProfileRemoveActivity"
android:theme="@style/HFTheme.NoActionBar" />
<activity
android:name="org.smartregister.opd.activity.BaseOpdFormActivity"
android:theme="@style/HFTheme.NoActionBar" />
<activity
android:name=".activity.MalariaRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />
Expand Down Expand Up @@ -194,6 +210,45 @@
android:theme="@style/HFTheme.NoActionBar" />


<activity
android:name=".activity.HivRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.HtsRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.HivIndexContactsContactsRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.IndexContactsListActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.HivProfileActivity"
android:parentActivityName=".activity.HivRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.HivIndexContactProfileActivity"
android:parentActivityName=".activity.HivIndexContactsContactsRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.HivFormsActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.TbRegisterActivity"
android:theme="@style/HFTheme.NoActionBar" />

<activity
android:name=".activity.TbProfileActivity"
android:theme="@style/HFTheme.NoActionBar" />


<service android:name="org.smartregister.immunization.service.intent.VaccineIntentService" />
<service android:name="org.smartregister.immunization.service.intent.RecurringIntentService" />
<service android:name="org.smartregister.sync.intent.PullUniqueIdsIntentService" />
Expand Down
100 changes: 100 additions & 0 deletions opensrp-chw-hf/src/main/assets/ec_client_classification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,106 @@
"creates_case": [
"ec_family_planning_update"
]
},
{
"field": "eventType",
"field_value": "Hiv Registration",
"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 Outcome",
"creates_case": [
"ec_hiv_register",
"ec_hiv_outcome"
]
},
{
"field": "eventType",
"field_value": "TB Outcome",
"creates_case": [
"ec_tb_register",
"ec_tb_outcome"
]
},
{
"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": "Close Hiv Feedback",
"creates_case": [
"ec_hiv_community_feedback"
]
},
{
"field": "eventType",
"field_value": "Close Tb Feedback",
"creates_case": [
"ec_tb_community_feedback"
]
},
{
"field": "eventType",
"field_value": "Hiv Index Contact Registration",
"creates_case": [
"ec_hiv_index_hf"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact Testing Followup",
"creates_case": [
"ec_hiv_index_hf"
]
},
{
"field": "eventType",
"field_value": "HIV Index Contact Community Followup Referral",
"creates_case": [
"ec_hiv_index_hf"
]
}
]
}
Expand Down
Loading