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

Add malaria follow-up and PNC danger signs form #93

Merged
merged 15 commits into from
Apr 28, 2020
Merged

Add malaria follow-up and PNC danger signs form #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da5393b
:construction: Show PNC danger signs outcome form
allan-on Apr 19, 2020
d4786dd
Merge branch 'master' of github.com:OpenSRP/opensrp-client-chw-hf int…
allan-on Apr 22, 2020
524d664
:arrow_up: Update chw-core and native form dependencies
allan-on Apr 22, 2020
9f11122
:construction: Process danger signs event
allan-on Apr 22, 2020
2331652
Merge branch 'master' of github.com:OpenSRP/opensrp-client-chw-hf int…
allan-on Apr 22, 2020
5ea4c3a
:arrow_up: Update chw-core dependency
allan-on Apr 22, 2020
10639ff
:bug: Fix bug in PNC danger signs ec fields definitions
allan-on Apr 22, 2020
bfb73d3
Merge branch 'master' of github.com:OpenSRP/opensrp-client-chw-hf int…
allan-on Apr 22, 2020
d208121
:construction: Fix saving multiple selected checkbox values
allan-on Apr 22, 2020
592cc6d
:bug: Fix visit date calculation reference
allan-on Apr 22, 2020
d4bbccf
:construction: Add Malaria follow-up form, calculation & relevance
allan-on Apr 24, 2020
a13e684
:bug: Fix step in Malaria follow-up form
allan-on Apr 24, 2020
2d9fd28
:construction: Add ec client classification and fields for HF malaria…
allan-on Apr 24, 2020
e2c8ab2
:arrow_up: Update chw-core snapshot
allan-on Apr 27, 2020
f3d5633
Merge branch 'master' of github.com:OpenSRP/opensrp-client-chw-hf int…
allan-on Apr 28, 2020
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
10 changes: 6 additions & 4 deletions opensrp-chw-hf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation ('org.smartregister:opensrp-client-chw-core:1.1.63-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-chw-core:1.1.64-SNAPSHOT@aar') {
transitive = true
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
exclude group: 'org.smartregister', module: 'opensrp-client-chw-referral'
exclude group: 'com.rengwuxian.materialedittext', module: 'library'
}

implementation ('org.smartregister:opensrp-client-native-form:1.7.32-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:1.7.32-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -139,10 +139,12 @@ dependencies {
exclude group: 'io.ona.rdt-capture', module: 'lib'
}

implementation 'androidx.appcompat:appcompat:1.0.0' //Do not upgrade to 1.1.0 due to compatibility issues
implementation 'androidx.appcompat:appcompat:1.0.0'
//Do not upgrade to 1.1.0 due to compatibility issues
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0' //Do not upgrade to 1.1.0 due to compatibility issues
implementation 'androidx.recyclerview:recyclerview:1.0.0'
//Do not upgrade to 1.1.0 due to compatibility issues
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

androidTestImplementation 'androidx.test.ext:junit:1.1.1'
Expand Down
14 changes: 14 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 @@ -199,6 +199,20 @@
"creates_case": [
"ec_anc_danger_signs_outcome"
]
},
{
"field": "eventType",
"field_value": "PNC Danger Signs Outcome",
"creates_case": [
"ec_pnc_danger_signs_outcome"
]
},
{
"field": "eventType",
"field_value": "Malaria Follow-up HF",
"creates_case": [
"ec_malaria_followup_hf"
]
}
]
}
Expand Down
199 changes: 199 additions & 0 deletions opensrp-chw-hf/src/main/assets/ec_client_fields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,6 +1941,205 @@
}
}
]
},
{
"name": "ec_pnc_danger_signs_outcome",
"columns": [
{
"column_name": "base_entity_id",
"type": "Event",
"json_mapping": {
"field": "baseEntityId"
}
},
{
"column_name": "visit_date",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "pnc_danger_signs_visitdate"
}
},
{
"column_name": "danger_signs_present",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "danger_signs_present"
}
},
{
"column_name": "other_danger_signs",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
}
},
{
"column_name": "action_taken",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "action_taken_pnc_danger_signs"
}
},
{
"column_name": "managed_signs",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "managed_signs"
}
},
{
"column_name": "comment",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "comment_pnc_danger_signs"
}
}
]
},
{
"name": "ec_malaria_followup_hf",
"columns": [
{
"column_name": "base_entity_id",
"type": "Event",
"json_mapping": {
"field": "baseEntityId"
}
},
{
"column_name": "visit_date",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "date_malaria_visit_hf"
}
},
{
"column_name": "weight",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "weight_malaria_hf"
}
},
{
"column_name": "height",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "height_malaria_hf"
}
},
{
"column_name": "tests_ordered",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "test_malaria_hf"
}
},
{
"column_name": "no_mrdt_reason",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "no_mrdt_malaria_hf"
}
},
{
"column_name": "other_tests",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "other_test_malaria_hf"
}
},
{
"column_name": "test_results",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "test_results_malaria_hf"
}
},
{
"column_name": "other_test_results",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "other_test_results_malaria_hf"
}
},
{
"column_name": "diagnosis",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "diagnosis_malaria_hf"
}
},
{
"column_name": "other_diagnosis",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "other_diagnosis_malaria_hf"
}
},
{
"column_name": "treatment_prescribed",
"type": "Event",
"save_format": "json_array",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "treat_malaria_hf"
}
},
{
"column_name": "other_treatment_prescribed",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "treat_other_malaria_hf"
}
},
{
"column_name": "outcomes",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "outcome_malaria_hf"
}
},
{
"column_name": "remarks",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "remark_malaria_hf"
}
},
{
"column_name": "hcp_attending",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "hcp_attending"
}
}
]
}
]
}
Loading