From a9d6f4c55dde9b8dbdd04d9d6cf5ff2d355640ac Mon Sep 17 00:00:00 2001 From: Debbie Mong'are Date: Wed, 18 May 2022 17:48:08 +0300 Subject: [PATCH 1/2] update informant options in out of area death form --- .../crvs/assets/json.form/out_of_area_death_form.json | 9 ++++++--- .../src/crvs/resources/out_of_area_death_form.properties | 9 +++++---- .../crvs/resources/out_of_area_death_form_fr.properties | 9 +++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json b/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json index 2c1be23738..637137ee14 100644 --- a/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json +++ b/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json @@ -806,12 +806,15 @@ "{{out_of_area_death_form.step1.informant_relationship.values[0]}}", "{{out_of_area_death_form.step1.informant_relationship.values[1]}}", "{{out_of_area_death_form.step1.informant_relationship.values[2]}}", - "{{out_of_area_death_form.step1.informant_relationship.values[3]}}" + "{{out_of_area_death_form.step1.informant_relationship.values[3]}}", + "{{out_of_area_death_form.step1.informant_relationship.values[4]}}" + ], "keys": [ - "Sibling", - "Spouse", "Parent", + "Spouse", + "Sibling", + "Other Relative", "Other" ], "openmrs_choice_ids": { diff --git a/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties b/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties index 1831121f59..b63df93e61 100644 --- a/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties +++ b/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties @@ -7,7 +7,6 @@ out_of_area_death_form.step1.mccd_conducted.v_required.err = Select one value fr out_of_area_death_form.step1.sex.options.Female.text = Female out_of_area_death_form.step1.informant_address.label = Address out_of_area_death_form.step1.know_death_cause.hint = Do you know the cause of death ? -out_of_area_death_form.step1.informant_relationship.values[3] = Other out_of_area_death_form.step1.marital_status.values[3] = Single out_of_area_death_form.step1.sex.options.Male.text = Male out_of_area_death_form.step1.age.v_max.err = Age must be equal or less than 120 @@ -80,7 +79,11 @@ out_of_area_death_form.step1.death_certificate_number.label = Death certificate out_of_area_death_form.step1.dob.v_required.err = Please enter the date of birth out_of_area_death_form.step1.death_certificate_issue_date.label = Death certificate issuance date (if certificate received) out_of_area_death_form.step1.still_born_death.hint = Was this a stillborn Death? -out_of_area_death_form.step1.informant_relationship.values[0] = Sibling +out_of_area_death_form.step1.informant_relationship.values[0] = Parent +out_of_area_death_form.step1.informant_relationship.values[1] = Spouse +out_of_area_death_form.step1.informant_relationship.values[2] = Sibling +out_of_area_death_form.step1.informant_relationship.values[3] = Other Relative +out_of_area_death_form.step1.informant_relationship.values[4] = Other out_of_area_death_form.step1.received_death_certificate.hint = Does the family of the decedent have a death certificate (Y/N)? out_of_area_death_form.step1.death_manner.values[6] = Could not determine out_of_area_death_form.step1.age_at_death.label = Age at death @@ -91,7 +94,6 @@ out_of_area_death_form.step1.marital_status.values[0] = Co-Habiting out_of_area_death_form.step1.death_cause.hint = Cause of death out_of_area_death_form.step1.remove_reason.values[1] = Moved away out_of_area_death_form.step1.medically_treated.hint = Was the deceased admitted to a health facility in the past 4 weeks? -out_of_area_death_form.step1.informant_relationship.values[1] = Spouse out_of_area_death_form.step1.mccd_conducted.hint = Was MCCD conducted ? out_of_area_death_form.step1.still_born_death.values[1] = No out_of_area_death_form.step1.title = Add Child Under N - Out of Area Death @@ -121,7 +123,6 @@ out_of_area_death_form.step1.official_number.v_numeric.err = Please enter a vali out_of_area_death_form.step1.remove_reason.values[2] = Other out_of_area_death_form.step1.hidden_died_check.hint = out_of_area_death_form.step1.unique_id.hint = ID * -out_of_area_death_form.step1.informant_relationship.values[2] = Parent out_of_area_death_form.step1.physician_position.hint = Position of physician signing MCCD out_of_area_death_form.step1.informant_name.label = Name out_of_area_death_form.step1.death_certificate_number.v_numeric.err = Please enter a valid number diff --git a/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties b/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties index fae5fd4531..1e42b5e500 100644 --- a/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties +++ b/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties @@ -7,7 +7,6 @@ out_of_area_death_form.step1.mccd_conducted.v_required.err = Sélectionnez une v out_of_area_death_form.step1.sex.options.Female.text = Feminin out_of_area_death_form.step1.informant_address.label = Adresse out_of_area_death_form.step1.know_death_cause.hint = Connaissez-vous la cause du décès? -out_of_area_death_form.step1.informant_relationship.values[3] = Other out_of_area_death_form.step1.marital_status.values[3] = Célibataire out_of_area_death_form.step1.sex.options.Male.text = Masculin out_of_area_death_form.step1.age.v_max.err = L'âge doit être égal ou inférieur à 120 @@ -80,7 +79,11 @@ out_of_area_death_form.step1.death_certificate_number.label = Numéro du certifi out_of_area_death_form.step1.dob.v_required.err = Veuillez saisir la date de naissance out_of_area_death_form.step1.death_certificate_issue_date.label = Date d'émission du certificat de décès (si le certificat a été reçu) out_of_area_death_form.step1.still_born_death.hint = C'était un mort-né? -out_of_area_death_form.step1.informant_relationship.values[0] = Sibling +out_of_area_death_form.step1.informant_relationship.values[0] = Parent (père ou mère) +out_of_area_death_form.step1.informant_relationship.values[1] = Conjoint (mari ou femme) +out_of_area_death_form.step1.informant_relationship.values[2] = Frère ou sœur +out_of_area_death_form.step1.informant_relationship.values[3] = Autre lien de parenté +out_of_area_death_form.step1.informant_relationship.values[4] = Autre out_of_area_death_form.step1.received_death_certificate.hint = La famille du défunt (de la défunte) dispose-t-elle d'un certificat de décès (O/N)? out_of_area_death_form.step1.death_manner.values[6] = Impossible à déterminer out_of_area_death_form.step1.age_at_death.label = Âge au décès @@ -91,7 +94,6 @@ out_of_area_death_form.step1.marital_status.values[0] = Cohabite out_of_area_death_form.step1.death_cause.hint = Cause du décès out_of_area_death_form.step1.remove_reason.values[1] = Déménagé out_of_area_death_form.step1.medically_treated.hint = Le défunt (la défunte) a-t-il (elle) été admis(e) dans un établissement de santé au cours des 4 dernières semaines? -out_of_area_death_form.step1.informant_relationship.values[1] = Spouse out_of_area_death_form.step1.mccd_conducted.hint = La certification médicale de cause de décès a-t-elle été réalisée? out_of_area_death_form.step1.still_born_death.values[1] = Non out_of_area_death_form.step1.title = Ajouter un enfant de moins de N - Décès hors zone @@ -121,7 +123,6 @@ out_of_area_death_form.step1.remove_reason.values[2] = Autre out_of_area_death_form.step1.death_manner.label = Sélectionnez la manière de décès out_of_area_death_form.step1.hidden_died_check.hint = out_of_area_death_form.step1.unique_id.hint = ID * -out_of_area_death_form.step1.informant_relationship.values[2] = Parent out_of_area_death_form.step1.physician_position.hint = Fonction du médecin signataire du certificat médicale de cause de décès out_of_area_death_form.step1.informant_name.label = Nom out_of_area_death_form.step1.death_certificate_number.v_numeric.err = S'il vous plait, entrez un nombre valide From fd01cb732673f4ec6a0969147928a0f9454cd14d Mon Sep 17 00:00:00 2001 From: allay Date: Fri, 3 Jun 2022 16:03:02 +0300 Subject: [PATCH 2/2] :fire: Remove 'reason removed' in death out of area --- .../json.form/out_of_area_death_form.json | 46 ------------------- .../rule/out_of_area_death_form_relevance.yml | 7 --- .../out_of_area_death_form.properties | 2 - .../out_of_area_death_form_fr.properties | 2 - 4 files changed, 57 deletions(-) diff --git a/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json b/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json index 0d44d0ba56..d8b804f340 100644 --- a/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json +++ b/opensrp-chw/src/crvs/assets/json.form/out_of_area_death_form.json @@ -352,42 +352,6 @@ "Widowed": "widowed_id_openmrs" } }, - { - "key": "remove_reason", - "openmrs_entity_parent": "", - "openmrs_entity": "concept", - "openmrs_entity_id": "160417AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "openmrs_data_type": "select one", - "type": "spinner", - "hint": "{{out_of_area_death_form.step1.remove_reason.hint}}", - "hidden": "true", - "v_required": { - "value": "true", - "err": "{{out_of_area_death_form.step1.remove_reason.v_required.err}}" - }, - "values": [ - "{{out_of_area_death_form.step1.remove_reason.values[0]}}", - "{{out_of_area_death_form.step1.remove_reason.values[1]}}", - "{{out_of_area_death_form.step1.remove_reason.values[2]}}" - ], - "keys": [ - "Died", - "Moved away", - "Other" - ], - "openmrs_choice_ids": { - "Died": "160034AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Moved away": "160415AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Other": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "relevance": { - "rules-engine": { - "ex-rules": { - "rules-file": "out_of_area_death_form_relevance.yml" - } - } - } - }, { "key": "mccd_conducted", "openmrs_entity_parent": "", @@ -767,16 +731,6 @@ } } }, - { - "key": "hidden_died_check", - "openmrs_entity_parent": "", - "openmrs_entity": "concept", - "openmrs_entity_id": "", - "label": "{{out_of_area_death_form.step1.hidden_died_check.label}}", - "hint": "{{out_of_area_death_form.step1.hidden_died_check.hint}}", - "type": "edit_text", - "read_only": "true" - }, { "key": "informant_fields", "openmrs_entity_parent": "", diff --git a/opensrp-chw/src/crvs/assets/rule/out_of_area_death_form_relevance.yml b/opensrp-chw/src/crvs/assets/rule/out_of_area_death_form_relevance.yml index 68cf29300a..d1c3ffac24 100644 --- a/opensrp-chw/src/crvs/assets/rule/out_of_area_death_form_relevance.yml +++ b/opensrp-chw/src/crvs/assets/rule/out_of_area_death_form_relevance.yml @@ -125,13 +125,6 @@ condition: "(step1_sex=='Female' && step1_deceased_pregnant=='Yes')" actions: - "isRelevant = true" --- -name: step1_remove_reason -description: remove_reason -priority: 1 -condition: "!step1_hidden_died_check=='.'" -actions: - - "isRelevant = true" ---- name: step1_informant_fields description: informant_fields priority: 1 diff --git a/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties b/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties index b63df93e61..4f1669f7f8 100644 --- a/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties +++ b/opensrp-chw/src/crvs/resources/out_of_area_death_form.properties @@ -15,7 +15,6 @@ out_of_area_death_form.step1.mccd_conducted.values[0] = Yes out_of_area_death_form.step1.informant_phone.v_numeric.err = Please enter a valid number out_of_area_death_form.step1.death_certificate_number.hint = Death certificate number (if certificate received) out_of_area_death_form.step1.marital_status.hint = Marital Status -out_of_area_death_form.step1.hidden_died_check.label = out_of_area_death_form.step1.nationality.hint = Nationality (citizenship) out_of_area_death_form.step1.nationality.label = Nationality (citizenship) out_of_area_death_form.step1.marital_status.values[1] = Divorced @@ -121,7 +120,6 @@ out_of_area_death_form.step1.death_cause.label = Cause of death out_of_area_death_form.step1.age.v_min.err = Age must be greater than 0 out_of_area_death_form.step1.official_number.v_numeric.err = Please enter a valid number out_of_area_death_form.step1.remove_reason.values[2] = Other -out_of_area_death_form.step1.hidden_died_check.hint = out_of_area_death_form.step1.unique_id.hint = ID * out_of_area_death_form.step1.physician_position.hint = Position of physician signing MCCD out_of_area_death_form.step1.informant_name.label = Name diff --git a/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties b/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties index 1e42b5e500..9bd16fb336 100644 --- a/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties +++ b/opensrp-chw/src/crvs/resources/out_of_area_death_form_fr.properties @@ -15,7 +15,6 @@ out_of_area_death_form.step1.mccd_conducted.values[0] = Oui out_of_area_death_form.step1.informant_phone.v_numeric.err = S'il vous plait, entrez un nombre valide out_of_area_death_form.step1.death_certificate_number.hint = Numéro du certificat de décès (si le certificat a été reçu) out_of_area_death_form.step1.marital_status.hint = État matrimonial -out_of_area_death_form.step1.hidden_died_check.label = out_of_area_death_form.step1.nationality.hint = Nationalité out_of_area_death_form.step1.nationality.label = Nationalité out_of_area_death_form.step1.marital_status.values[1] = Divorcé @@ -121,7 +120,6 @@ out_of_area_death_form.step1.death_cause.label = Cause du décès out_of_area_death_form.step1.age.v_min.err = L'âge doit être supérieur à 0 out_of_area_death_form.step1.remove_reason.values[2] = Autre out_of_area_death_form.step1.death_manner.label = Sélectionnez la manière de décès -out_of_area_death_form.step1.hidden_died_check.hint = out_of_area_death_form.step1.unique_id.hint = ID * out_of_area_death_form.step1.physician_position.hint = Fonction du médecin signataire du certificat médicale de cause de décès out_of_area_death_form.step1.informant_name.label = Nom