Merge branch 'master' into POC-130

Eriq-Kibet · web-flow · commit d5b1f094713b · 2023-02-13T13:14:35.000+03:00
diff --git a/app/reporting-framework/json-reports/prep-monthly-summary-base.json b/app/reporting-framework/json-reports/prep-monthly-summary-base.json
@@ -149,7 +149,7 @@
       "alias": "general_pop_active",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "IF((prep.population_type = 3  or prep.population_type = 1  or prep.population_type is null) and active_on_prep_this_month = 1 ,1, 0)"
+        "expression": "IF((prep.population_type = 3 or prep.population_type is null) and active_on_prep_this_month = 1 ,1, 0)"
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@`
`149`	`149`	`"alias": "general_pop_active",`
`150`	`150`	`"expressionType": "simple_expression",`
`151`	`151`	`"expressionOptions": {`
`152`		`- "expression": "IF((prep.population_type = 3 or prep.population_type = 1 or prep.population_type is null) and active_on_prep_this_month = 1 ,1, 0)"`
	`152`	`+ "expression": "IF((prep.population_type = 3 or prep.population_type is null) and active_on_prep_this_month = 1 ,1, 0)"`
`153`	`153`	`}`
`154`	`154`	`},`
`155`	`155`	`{`