Skip to content

Commit

Permalink
Merge pull request #2067 from opensrp/2048-crvs-bugfixes
Browse files Browse the repository at this point in the history
CRVS bug fixes
  • Loading branch information
allan-on authored Jun 23, 2022
2 parents 608dec3 + b622040 commit 28d75d6
Show file tree
Hide file tree
Showing 22 changed files with 719 additions and 87 deletions.
80 changes: 80 additions & 0 deletions opensrp-chw/src/crvs/assets/json.form/birth_certification.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,86 @@
}
}
},
{
"key": "birth_cert_num_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "birthCertNumActe",
"type": "edit_text",
"hint": "{{birth_certification.step1.birth_cert_num_acte.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification.step1.birth_cert_num_acte.v_required.err}}"
},
"v_numeric": {
"value": "true",
"err": "{{birth_certification.step1.birth_cert_num_acte.v_numeric.error}}"
},
"v_max_length": {
"value": "5",
"err": "{{birth_certification.step1.birth_cert_num_acte.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_relevance.yml"
}
}
}
},
{
"key": "birth_cert_num_volume",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumVolume",
"type": "edit_text",
"hint": "{{birth_certification.step1.birth_cert_num_volume.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification.step1.birth_cert_num_volume.v_required.err}}"
},
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "{{birth_certification.step1.birth_cert_num_volume.v_regex.error}}"
},
"v_max_length": {
"value": "9",
"err": "{{birth_certification.step1.birth_cert_num_volume.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_relevance.yml"
}
}
}
},
{
"key": "birth_cert_num_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumFolio",
"type": "edit_text",
"hint": "{{birth_certification.step1.birth_cert_num_folio.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification.step1.birth_cert_num_folio.v_required.err}}"
},
"v_max_length": {
"value": "6",
"err": "{{birth_certification.step1.birth_cert_num_folio.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_relevance.yml"
}
}
}

},
{
"key": "birth_cert_num",
"openmrs_entity_parent": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,86 @@
}
}
},
{
"key": "birth_cert_num_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "birthCertNumActe",
"type": "edit_text",
"hint": "{{birth_certification_changed.step1.birth_cert_num_acte.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification_changed.step1.birth_cert_num_acte.v_required.err}}"
},
"v_numeric": {
"value": "true",
"err": "{{birth_certification_changed.step1.birth_cert_num_acte.v_numeric.error}}"
},
"v_max_length": {
"value": "5",
"err": "{{birth_certification_changed.step1.birth_cert_num_acte.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_intro_relevance_rule.yml"
}
}
}
},
{
"key": "birth_cert_num_volume",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumVolume",
"type": "edit_text",
"hint": "{{birth_certification_changed.step1.birth_cert_num_volume.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification_changed.step1.birth_cert_num_volume.v_required.err}}"
},
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "{{birth_certification_changed.step1.birth_cert_num_volume.v_regex.error}}"
},

"v_max_length": {
"value": "9",
"err": "{{birth_certification_changed.step1.birth_cert_num_volume.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_intro_relevance_rule.yml"
}
}
}
},
{
"key": "birth_cert_num_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "text",
"openmrs_entity_id": "birthCertNumFolio",
"type": "edit_text",
"hint": "{{birth_certification_changed.step1.birth_cert_num_folio.hint}}",
"v_required": {
"value": "true",
"err": "{{birth_certification_changed.step1.birth_cert_num_folio.v_required.err}}"
},
"v_max_length": {
"value": "6",
"err": "{{birth_certification_changed.step1.birth_cert_num_folio.v_max_length.error}}"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "birth_certification_intro_relevance_rule.yml"
}
}
}
},
{
"key": "system_birth_notification",
"openmrs_entity_parent": "",
Expand Down
6 changes: 1 addition & 5 deletions opensrp-chw/src/crvs/assets/json.form/child_enrollment.json
Original file line number Diff line number Diff line change
Expand Up @@ -818,11 +818,7 @@
"openmrs_entity_id": "motherUsualResidence",
"type": "edit_text",
"hint": "{{child_enrollment.step1.father_usual_residence.hint}}",
"edit_type": "name",
"v_required": {
"value": "true",
"err": "{{child_enrollment.step1.father_usual_residence.error}}"
}
"edit_type": "name"
},
{
"key": "father_birth_place",
Expand Down
78 changes: 77 additions & 1 deletion opensrp-chw/src/crvs/assets/json.form/death_certification.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,83 @@
}
}
},
{
"key": "death_certificate_number_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberActe",
"label": "Acte No.",
"hint": "{{death_certification.step1.death_certificate_number_acte.hint}}",
"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_certificate_number_volume",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberVolume",
"label": "Volume No.",
"hint": "{{death_certification.step1.death_certificate_number_volume.hint}}",
"type": "edit_text",
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "{{death_certification.step1.death_certificate_number_volume.v_regex.error}}"
},
"v_max_length": {
"value": "9",
"err": "{{death_certification.step1.death_certificate_number_volume.v_max_length.error}}"
},
"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_folio",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "deathCertificationNumberFolio",
"label": "Folio No.",
"hint": "{{death_certification.step1.death_certificate_number_folio.hint}}",
"type": "edit_text",
"v_max_length": {
"value": "6",
"err": "{{death_certification.step1.death_certificate_number_folio.v_max_length.error}}"
},
"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 Expand Up @@ -205,7 +282,6 @@
"{{death_certification.step1.informant_relationship.values[2]}}",
"{{death_certification.step1.informant_relationship.values[3]}}",
"{{death_certification.step1.informant_relationship.values[4]}}"

],
"keys": [
"Parent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,71 @@
}
}
},
{
"key": "remove_member_number_acte",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "removeMemberNumberActe",
"label": "Acte No.",
"hint": "{{family_details_remove_member.step1.remove_member_number_acte.hint}}",
"type": "edit_text",
"v_numeric": {
"value": "true",
"err": "{{family_details_remove_member.step1.informant_phone.v_numeric.err}}"
},
"v_max_length": {
"value": "5",
"err": "{{family_details_remove_member.step1.informant_phone.v_max_length.err}}"
},
"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": "{{family_details_remove_member.step1.remove_member_number_volume.hint}}",
"type": "edit_text",
"v_max_length": {
"value": "9",
"err": "{{family_details_remove_member.step1.remove_member_number_volume.v_max_length.error}}"
},
"v_regex": {
"value": "([0-9]{1,4}\\/[0-9]{1,4})",
"err": "{{family_details_remove_member.step1.remove_member_number_volume.v_regex.error}}"
},
"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": "{{family_details_remove_member.step1.remove_member_number_folio.hint}}",
"type": "edit_text",
"v_max_length": {
"value": "6",
"err": "{{family_details_remove_member.step1.remove_member_number_folio.v_max_length.error}}"
},
"relevance": {
"step1:remove_reason": {
"type": "string",
"ex": "equalTo(., \"Died\")"
}
}
},
{
"key": "official_position",
"openmrs_entity_parent": "",
Expand Down
Loading

0 comments on commit 28d75d6

Please sign in to comment.