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

Jump to bottom

CRVS bug fixes #2067

Merged
merged 9 commits into from
Jun 23, 2022
Merged

CRVS bug fixes #2067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f2b794
Birth Certification, Out Area Child registration, Death Certification…
qaziabubakar-vd Jun 7, 2022
6c96022
Death Certification, Remove Family Member, Out of Area Death Registra…
qaziabubakar-vd Jun 8, 2022
490ad59
Add all the text to properties files and add the relvacne to the filed
qaziabubakar-vd Jun 13, 2022
e6c7895
resolve issues
qaziabubakar-vd Jun 20, 2022
65f0a20
Merge branch 'crvs-dev' into 2048-crvs-bugfixes
qaziabubakar Jun 23, 2022
6d97c7e
Fixed Father place of residency to not be mandatory
qaziabubakar Jun 23, 2022
a0e289c
Updated build.gradle
qaziabubakar Jun 23, 2022
6503ed2
:globe_with_meridians: Remove province translations in main & drc files
allan-on Jun 23, 2022
b622040
:globe_with_meridians: Update family register province translation
allan-on Jun 23, 2022
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
3 changes: 2 additions & 1 deletion opensrp-chw/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ android {
useLibrary 'org.apache.http.legacy'
compileSdkVersion androidCompileSdkVersion
buildToolsVersion androidBuildToolsVersion
android.ndkVersion '21.0.6113669'

lintOptions {
checkReleaseBuilds false
Expand Down Expand Up @@ -366,7 +367,7 @@ android {
}

dependencies {
implementation('org.smartregister:opensrp-client-chw-core:2.1.6-crvs-alpha-3-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-chw-core:2.1.6-crvs-alpha-4-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'androidx.legacy', module: 'legacy-support-v4'
Expand Down
46 changes: 46 additions & 0 deletions opensrp-chw/src/crvs/assets/json.form/birth_certification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,52 @@
}
}
},
{
"key": "birth_cert_num_volume",
allan-on marked this conversation as resolved.
Show resolved Hide resolved
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumVolume",
"type": "edit_text",
"hint": "Volume No.",

"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "Number must take the format of ##/####"
},

"v_max_length": {
"value": "9",
"err": "Characters must be less than or equal to 9"
allan-on marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
"key": "birth_cert_num_folio",
allan-on marked this conversation as resolved.
Show resolved Hide resolved
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumFolio",
"type": "edit_text",
"hint": "Folio No.",

"v_max_length": {
"value": "6",
"err": "Characters must be less than or equal to 6"
}
},
{
"key": "birth_cert_num_acte",
allan-on marked this conversation as resolved.
Show resolved Hide resolved
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "birthCertNumActe",
"type": "edit_text",
"hint": "Acte No.",

"v_max_length": {
"value": "5",
"err": "Characters must be less than or equal to 5"
}
},
{
"key": "birth_cert_num",
"openmrs_entity_parent": "",
Expand Down
47 changes: 46 additions & 1 deletion opensrp-chw/src/crvs/assets/json.form/birth_certification_changed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
"key": "birth_cert_num",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "162052AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why ws this entity_id removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relevance is added

"openmrs_data_type": "text",
"type": "edit_text",
"hint": "{{birth_certification_changed.step1.birth_cert_num.hint}}",
Expand All @@ -180,6 +179,52 @@
}
}
},
{
"key": "birth_cert_num_volume",
allan-on marked this conversation as resolved.
Show resolved Hide resolved
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumVolume",
"type": "edit_text",
"hint": "Volume No.",

"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "Number must take the format of ##/####"
},

"v_max_length": {
"value": "9",
"err": "Characters must be less than or equal to 9"
allan-on marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
"key": "birth_cert_num_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumFolio",
"type": "edit_text",
"hint": "Folio No.",

"v_max_length": {
"value": "6",
"err": "Characters must be less than or equal to 6"
}
},
{
"key": "birth_cert_num_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "birthCertNumActe",
"type": "edit_text",
"hint": "Acte No.",

"v_max_length": {
"value": "5",
"err": "Characters must be less than or equal to 5"
}
},
{
"key": "system_birth_notification",
"openmrs_entity_parent": "",
Expand Down
73 changes: 73 additions & 0 deletions opensrp-chw/src/crvs/assets/json.form/death_certification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,79 @@
}
}
},
{
"key": "death_certificate_number_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberFolio",
"label": "Folio No.",
"hint": "Folio No.",
"type": "edit_text",
"v_max_length": {
"value": "6",
"err": "Characters must be less than or equal to 6"
},
"v_required": {
"value": "true",
"err": "{{death_certification.step1.mandatory_field.v_required.err}}"
},
"relevance": {
"step1:received_death_certificate": {
"type": "string",
"ex": "equalTo(., \"Yes\")"
}
}
},{
"key": "death_certificate_number_volume",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberVolume",
"label": "Volume No.",
"hint": "Volume No.",
"type": "edit_text",
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "Number must take the format of ##/####"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the error text/string to the relevant properties files to support translation

},

"v_required": {
"value": "true",
"err": "{{death_certification.step1.mandatory_field.v_required.err}}"
},
"relevance": {
"step1:received_death_certificate": {
"type": "string",
"ex": "equalTo(., \"Yes\")"
}
}
},
{
"key": "death_certificate_number_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberActe",
"label": "Acte No.",
"hint": "Acte No.",
"type": "edit_text",
"v_max_length": {
"value": "5",
"err": "Characters must be less than or equal to 5"
},
"v_numeric": {
"value": "true",
"err": "{{death_certification.step1.death_certificate_number.v_numeric.err}}"
},
"v_required": {
"value": "true",
"err": "{{death_certification.step1.mandatory_field.v_required.err}}"
},
"relevance": {
"step1:received_death_certificate": {
"type": "string",
"ex": "equalTo(., \"Yes\")"
}
}
},
{
"key": "death_notification_done",
"openmrs_entity_parent": "",
Expand Down
66 changes: 66 additions & 0 deletions opensrp-chw/src/crvs/assets/json.form/family_details_remove_member.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,72 @@
}
}
},
{
"key": "remove_member_number_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "removeMemberNumberActe",
"label": "Acte No.",
"hint": "Acte No.",
"type": "edit_text",
"v_numeric": {
"value": "true",
"err": "{{family_details_remove_member.step1.informant_phone.v_numeric.err}}"
},
"v_max_length": {
"value": "5",
"err": "Characters must be less than or equal to 5"
},
"relevance": {
"step1:remove_reason": {
"type": "string",
"ex": "equalTo(., \"Died\")"
}
}
},
{
"key": "remove_member_number_volume",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "removeMemberNumberVolume",
"label": "Volume No.",
"hint": "Volume No.",
"type": "edit_text",
"v_max_length": {
"value": "9",
"err": "Characters must be less than or equal to 9"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the error texts to the relevant properties files

},
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "Number must take the format of ##/####"
},

"relevance": {
"step1:remove_reason": {
"type": "string",
"ex": "equalTo(., \"Died\")"
}
}
},
{
"key": "remove_member_number_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "removeMemberNumberFolio",
"label": "Folio No.",
"hint": "Folio No.",
"type": "edit_text",
"v_max_length": {
"value": "6",
"err": "Characters must be less than or equal to 6"
},
"relevance": {
"step1:remove_reason": {
"type": "string",
"ex": "equalTo(., \"Died\")"
}
}
},
{
"key": "official_position",
"openmrs_entity_parent": "",
Expand Down
94 changes: 94 additions & 0 deletions opensrp-chw/src/crvs/assets/json.form/family_register.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,100 @@
"Communication, social and personal services": "165415AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Other": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
}
},

{
"key": "fam_add_province",
"openmrs_entity_parent": "",
"openmrs_entity": "person_attribute",
"openmrs_entity_id": "fam_add_province",
"openmrs_data_type": "",
"type": "spinner",
"hint": "{{family_register.step1.fam_add_province.hint}}",
"values": [
"{{family_register.step1.fam_add_province.values[0]}}",
"{{family_register.step1.fam_add_province.values[1]}}",
"{{family_register.step1.fam_add_province.values[2]}}",
"{{family_register.step1.fam_add_province.values[3]}}",
"{{family_register.step1.fam_add_province.values[4]}}",
"{{family_register.step1.fam_add_province.values[5]}}",
"{{family_register.step1.fam_add_province.values[6]}}",
"{{family_register.step1.fam_add_province.values[7]}}",
"{{family_register.step1.fam_add_province.values[8]}}",
"{{family_register.step1.fam_add_province.values[9]}}",
"{{family_register.step1.fam_add_province.values[10]}}",
"{{family_register.step1.fam_add_province.values[11]}}",
"{{family_register.step1.fam_add_province.values[12]}}",
"{{family_register.step1.fam_add_province.values[13]}}",
"{{family_register.step1.fam_add_province.values[14]}}",
"{{family_register.step1.fam_add_province.values[15]}}",
"{{family_register.step1.fam_add_province.values[16]}}",
"{{family_register.step1.fam_add_province.values[17]}}",
"{{family_register.step1.fam_add_province.values[18]}}",
"{{family_register.step1.fam_add_province.values[19]}}",
"{{family_register.step1.fam_add_province.values[20]}}",
"{{family_register.step1.fam_add_province.values[21]}}",
"{{family_register.step1.fam_add_province.values[22]}}",
"{{family_register.step1.fam_add_province.values[23]}}",
"{{family_register.step1.fam_add_province.values[24]}}",
"{{family_register.step1.fam_add_province.values[25]}}"
],
"keys": [
"Bas Uele Province",
"Equateur Province",
"Haut Katanga Province",
"Haut Lomami Province",
"Haut Uele Province",
"Ituri Province",
"Kasai Province",
"Kasai Central Province",
"Kasai Oriental Province",
"Kinshasa Province",
"Kongo Central Province",
"Kwango Province",
"Kwilu Province",
"Lomami Province",
"Lualaba Province",
"Maindombe Province",
"Maniema Province",
"Mongala Province",
"Nord Kivu Province",
"Nord Ubangi Province",
"Sankuru Province",
"Sud Kivu Province",
"Sud Ubangi Province",
"Tanganyika Province",
"Tshopo Province",
"Tshuapa Province"
],
"openmrs_choice_ids": {
"Bas Uele Province": "bas_uele_province",
"Equateur Province": "equateur_province",
"Haut Katanga Province": "haut_katanga_province",
"Haut Lomami Province": "haut_lomami_province",
"Haut Uele Province": "haut_uele_province",
"Ituri Province": "ituri_province",
"Kasai Province": "kasai province",
"Kasai Central Province": "kasai_central_province",
"Kasai Oriental Province": "kasai_oriental_province",
"Kinshasa Province": "kinshasa_province",
"Kongo Central Province": "kongo_central_province",
"Kwango Province": "kwango_province",
"Kwilu Province": "kwilu_province",
"Lomami Province": "lomami_province",
"Lualaba Province": "lualaba_province",
"Maindombe Province": "maindombe_province",
"Maniema Province": "maniema_province",
"Mongala Province": "mongala_province",
"Nord Kivu Province": "nord_kivu_province",
"Nord Ubangi Province": "nord_ubangi_province",
"Sankuru Province": "sankuru_province",
"Sud Kivu Province": "sud_kivu_province",
"Sud Ubangi Province": "sud_ubangi_province",
"Tanganyika Province": "tanganyika_province",
"Tshopo Province": "tshopo_province",
"Tshuapa Province": "tshuapa_province"
}
}
]
},
Expand Down
Loading