Merge branch 'master-v1' into bug-fixing

opensrp · Jul 18, 2022 · d1766a3 · d1766a3
2 parents 0f6e324 + 8627061
commit d1766a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/opensrp-chw/src/ba/assets/json.form/female_family_planning_registration.json b/opensrp-chw/src/ba/assets/json.form/female_family_planning_registration.json
@@ -1,5 +1,5 @@
 {
-  "validate_on_submit": false,
+  "validate_on_submit": true,
   "show_errors_on_submit": false,
   "count": "3",
   "encounter_type": "Family Planning Registration",
@@ -779,13 +779,6 @@
               "rules-file": "family_planning_registration_calculation.yml"
             }
           }
-        },
-        "relevance": {
-          "rules-engine": {
-            "ex-rules": {
-              "rules-file": "family_planning_registration_relevance.yml"
-            }
-          }
         }
       },
       {

diff --git a/opensrp-chw/src/ba/assets/rule/family_planning_registration_calculation.yml b/opensrp-chw/src/ba/assets/rule/family_planning_registration_calculation.yml
@@ -68,4 +68,4 @@ description: calculate fp start date
 priority: 1
 condition: "true"
 actions:
-  - "calculation = step2_fp_method_accepted == 'Standard day method' ? step1_fp_reg_date : helper.getNonBlankValue([step3_fp_start_condom,step3_fp_start_cocpop,step3_fp_start_injectable,step3_fp_start_iucd,step3_fp_start_implant_nxt,step3_fp_start_implant_jad,step3_fp_start_female_ster,step3_fp_start_male_ster])"
+  - "calculation = step2_fp_method_accepted == 'Standard day method' ? step1_fp_reg_date : helper.getNonBlankValue([String.valueOf(step3_fp_start_condom),step3_fp_start_cocpop,step3_fp_start_injectable,step3_fp_start_iucd,step3_fp_start_implant_nxt,step3_fp_start_implant_jad,step3_fp_start_female_ster,step3_fp_start_male_ster])"