Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
update forms,relevance,config files
  • Loading branch information
bennsimon committed Sep 3, 2020
1 parent 07aac6f commit d7dffcd
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 26 deletions.
21 changes: 9 additions & 12 deletions opensrp-giz-malawi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ android {
}



testOptions {
unitTests {
returnDefaultValues = true
Expand All @@ -201,15 +200,15 @@ tasks.withType(Test) {
dependencies {
implementation 'com.evrencoskun.library:tableview:0.8.8'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
implementation('org.smartregister:opensrp-client-opd:0.0.14.7-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-opd:0.0.15-SNAPSHOT@aar') {
transitive = true
exclude group: 'org.smartregister', module: 'opensrp-client-core'
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
exclude group: 'com.android.support', module: 'appcompat-v7'
}

implementation('org.smartregister:opensrp-client-child:0.3.3-LOCAL-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-child:0.3.4-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'org.smartregister', module: 'opensrp-client-core'
Expand All @@ -219,7 +218,7 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
}

api('org.smartregister:opensrp-client-anc:2.0.3.47-LOCAL-SNAPSHOT@aar') {
api('org.smartregister:opensrp-client-anc:2.0.1-LOCAL-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'org.smartregister', module: 'opensrp-client-core'
Expand All @@ -228,7 +227,7 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
//
api('org.smartregister:opensrp-client-native-form:2.0.0.1-LOCAL-SNAPSHOT@aar') {
api('org.smartregister:opensrp-client-native-form:2.0.0-LOCAL-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'com.android.support', module: 'recyclerview-v7'
Expand All @@ -241,9 +240,9 @@ dependencies {
exclude group: 'io.ona.rdt-capture', module: 'lib'
}

api ('org.smartregister:opensrp-client-core:1.11.7.5-LOCAL-SNAPSHOT@aar') {
api('org.smartregister:opensrp-client-core:1.11.7.5-LOCAL-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module:'compressor'
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'com.github.bmelnychuk', module: 'atv'
exclude group: 'com.google.guava', module: 'guava'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -255,7 +254,7 @@ dependencies {
exclude group: 'com.android.support', module: 'design'
}

implementation('org.smartregister:opensrp-client-maternity:0.0.4.10-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-maternity:0.0.5-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'org.smartregister', module: 'opensrp-client-core'
Expand All @@ -264,9 +263,8 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
}

//implementation('org.smartregister:opensrp-client-pnc:0.0.1.9.1-SNAPSHOT@aar') {
api (project(':opensrp-pnc')) {
transitive = true
implementation('org.smartregister:opensrp-client-pnc:0.0.2-SNAPSHOT@aar') {
transitive = true
exclude group: 'id.zelory', module: 'compressor'
exclude group: 'org.smartregister', module: 'opensrp-client-core'
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
Expand Down Expand Up @@ -313,7 +311,6 @@ dependencies {
}



implementation 'com.android.support:appcompat-v7:28.0.0'
annotationProcessor 'com.jakewharton:butterknife:7.0.0'
implementation 'net.zetetic:android-database-sqlcipher:4.1.3@aar'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
---
group:
sub_group: pregnancy_data_&_medical_history
fields:
- template: "Intake Time: {intake_time}"
relevance: "intake_time != ''"

- template: "Gravida: {gravidity}"
relevance: "gravidity != ''"

- template: "Para: {parity}"
relevance: "parity != ''"

- template: "Last Menstrual period: {lmp}"
relevance: "lmp != ''"

- template: "Gestation age in weeks: {ga_weeks_entered}"
relevance: "ga_weeks_entered != ''"

- template: "Gestation age in days: {ga_dys_entered}"
relevance: "ga_days_entered != ''"

- template: "When did labour begin? (Onset of Labour): {onset_labour}"
relevance: "onset_labour != ''"

- template: "Have there been any complications in previous pregnancies?: {previous_complications}"
relevance: "parity > 0"

- template: "Specify: {previous_complications_other}"
relevance: "previous_complications_other != ''"

- template: "What modes of delivery were used in any of the previous pregnancies?: {previous_delivery_mode}"
relevance: "parity > 1"

- template: "What were the outcomes of the previous pregnancies?: {previous_pregnancy_outcomes}"
relevance: "parity > 1"

- template: "Family medical history: {family_history}"
relevance: "family_history != ''"

- template: "Specify: {family_history_other}"
relevance: "family_history_other != ''"

- template: "Gestation Week: {ga_calculated}"
relevance: "ga_calculated != ''"

---
sub_group: hiv_status_&_treatment
fields:
- template: "Previous HIV Status: {hiv_status_previous}"
relevance: "hiv_status_previous != ''"

- template: "Current HIV Status: {hiv_status_current}"
relevance: "hiv_status_current != ''"

- template: "Is the woman on ART Treatment: {on_art_treatment}"
relevance: "on_art_treatment != ''"

- template: "ART Clinic Number: {art_clinic_number}"
relevance: "art_clinic_number != ''"

- template: "ART treatment start period: {hiv_treatment_srt}"
relevance: "hiv_treatment_srt != ''"

- template: "Why is the woman not on ART?: {not_art_reason}"
relevance: "not_art_reason != ''"

- template: "Reason why woman is not on ART: {not_art_reasons_other}"
relevance: "not_art_reasons_other != ''"


---
sub_group: demographic_information
fields:
- template: "Highest level of school: {educ_level}"
relevance: "educ_level != ''"

- template: "Marital Status: {marital_status}"
relevance: "marital_status != ''"

- template: "Occupation: {occupation}"
relevance: "occupation != ''"

- template: "Other Occupation: {occupation_other}"
relevance: "occupation_other != ''"

- template: "Religion: {religion}"
relevance: "religion != ''"

- template: "Other Religion: {religion_other}"
relevance: "religion_other != ''"
128 changes: 128 additions & 0 deletions opensrp-giz-malawi/src/main/assets/config/pnc-profile-overview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
---
group:
subGroup: pregnancy_data_&_medical_history
relevance: "pmi_base_entity_id != null"
fields:

- template: "Gravida: {gravidity}"
relevance: "gravidity != ''"
isRedFont: "gravidity >= 5"

- template: "Para: {parity}"
relevance: "parity != ''"
isRedFont: "parity >= 5"

- template: "Last menstrual period date: {lmp_unknown} {lmp}"
relevance: "lmp_unknown != '' || lmp != ''"

- template: "Gestation age: {gest_age} "
relevance: "gest_age != ''"

- template: "Onset of Labour: {onset_labour}{onset_labour_time}"
relevance: "onset_labour != '' || onset_labour_time != ''"

- template: "Any past pregnancy problems?: {previous_complications}"
relevance: "previous_complications != ''"

- template: "Any past pregnancy problems(Other)?: {previous_complications_other}"
relevance: "previous_complications_other != ''"

- template: "Family medical history: {family_history}"
relevance: "family_history != ''"

- template: "Family medical history (Other): {family_history_other}"
relevance: "family_history_other != ''"

- template: "How many does of TDV did the mother receive?: {mother_tdv_doses}"
relevance: "mother_tdv_doses != ''"

- template: "Children Protected at birth (PAB): {protected_at_birth}"
relevance: "protected_at_birth != ''"

---
subGroup: delivery_&_outcome_details
relevance: "pmi_base_entity_id != null"
fields:

- template: "Date of delivery: {delivery_date}"
relevance: "delivery_date != ''"

- template: "Place of delivery: {delivery_place}"
relevance: "delivery_place != ''"

- template: "Staff conducting the delivery: {delivery_person}"
relevance: "delivery_person != ''"

- template: "Staff conducting the delivery (Other): {delivery_person_other}"
relevance: "delivery_person_other != ''"

- template: "Mode of delivery: {delivery_mode}"
relevance: "delivery_mode != ''"

- template: "Mode of delivery (Other): {delivery_mode_other}"
relevance: "delivery_mode_other != ''"

- template: "Obstetric complications: {obstretic_complications}"
relevance: "obstretic_complications != ''"
isRedFont: "obstretic_complications != 'None'"

- template: "Obstetric complications (Other): {obstretic_complications_other}"
relevance: "obstretic_complications_other != ''"

- template: "Obstetric care: {obstretic_care}"
relevance: "obstretic_care != ''"

- template: "Obstetric care (Other): {obstretic_care_other}"
relevance: "obstretic_care_other != ''"

- template: "Referred out: {referred_out}"
relevance: "referred_out != ''"

- template: "Vitamin A: {vit_a}"
relevance: "vit_a != ''"

- template: "Discharges status: {discharge_status}"
relevance: "discharge_status != ''"

---
subGroup: hiv_status_&_treatment
relevance: "pmi_base_entity_id != null"
fields:

- template: "HIV status at registration: {hiv_status}"
relevance: "hiv_status != ''"
isRedFont: "hiv_status == 'positive'"

- template: "Is the woman on ART treatment?: {on_art_treatment}"
relevance: "on_art_treatment != ''"

---
subGroup: demographic_information
fields:
- template: "Highest level of school: {educ_level}"
relevance: "educ_level != ''"

- template: "Marital Status: {marital_status}"
relevance: "marital_status != ''"

- template: "Occupation: {occupation}"
relevance: "occupation != ''"

- template: "Other Occupation: {occupation_other}"
relevance: "occupation_other != ''"

- template: "Religion: {religion}"
relevance: "religion != ''"

- template: "Other Religion: {religion_other}"
relevance: "religion_other != ''"
---
subGroup: livebirths

---
subGroup: stillbirths
fields:

- template: "Number of babies stillborn: {baby_count_stillborn}"
relevance: "baby_count_stillborn != ''"
isRedFont: "baby_count_stillborn > 0"
8 changes: 4 additions & 4 deletions opensrp-giz-malawi/src/main/assets/ec_client_fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@
"column_name": "occupation_other",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"field": "obs.formSubmissionField",
"concept": "occupation_other"
}
},
Expand All @@ -1175,7 +1175,7 @@
"column_name": "religion_other",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"field": "obs.formSubmissionField",
"concept": "religion_other"
}
}
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"column_name": "occupation_other",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"field": "obs.formSubmissionField",
"concept": "occupation_other"
}
},
Expand All @@ -1236,7 +1236,7 @@
"column_name": "religion_other",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"field": "obs.formSubmissionField",
"concept": "religion_other"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,14 +497,10 @@
"hint": "Specify",
"edit_type": "name",
"relevance": {
"step2:occupation": {
"ex-checkbox": [
{
"or": [
"other"
]
}
]
"rules-engine": {
"ex-rules": {
"rules-file": "maternity/registration_relevance_rules.yml"
}
}
},
"v_required": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,12 @@ name: step3_gest_age
description: gest_age
priority: 1
condition: "step3_lmp_unknown.isEmpty() && step3_lmp != ''"
actions:
- "isRelevant = true"
---
name: step2_occupation_other
description: occupation_other
priority: 1
condition: "step2_occupation.contains('other')"
actions:
- "isRelevant = true"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: step2_occupation_other
description: occupation_other
priority: 1
condition: "step2_occupation.contains('other')"
actions:
- "isRelevant = true"
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ public Map<String, String> createEditMap(Map<String, String> editMap) {
return editMap;
}

@Override
public String[] getColumns() {
return new String[0];
}

@Override
public AdvancedMatrixCursor createMatrixCursor(Response<String> response) {

Expand Down
Loading

0 comments on commit d7dffcd

Please sign in to comment.