adding event driven indicators (#1332)

* adding event driven indicators * Update build-json-schema.js * Update build-json-schema.js --------- Co-authored-by: Drizzentic <[email protected]>
AMPATH · Oct 5, 2023 · e049e6e · e049e6e
1 parent abcfbb7
commit e049e6e
Show file tree

Hide file tree

Showing 55 changed files with 3,996 additions and 657 deletions.
diff --git a/app/reporting-framework/base-mysql.report.js b/app/reporting-framework/base-mysql.report.js
@@ -238,6 +238,9 @@ import * as reasons_for_initiation_prep_base from './json-reports/prep-monthly/d
 import * as new_for_prep_aggregate from './json-reports/prep-monthly/disaggregations/new/new-for-prep-aggregate.json';
 import * as new_for_prep_base from './json-reports/prep-monthly/disaggregations/new/new-for-prep-base.json';
 
+import * as prep_event_driven_aggregate from './json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-aggregate.json';
+import * as prep_event_driven_base from './json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-base.json';
+
 import * as restarting_prep_aggregate from './json-reports/prep-monthly/disaggregations/restarting/restarting-prep-aggregate.json';
 import * as restarting_prep_base from './json-reports/prep-monthly/disaggregations/restarting/restarting-prep-base.json';
 
@@ -1418,6 +1421,12 @@ export class BaseMysqlReport {
             newForPrepBase: this.cloneJsonSchema(new_for_prep_base)
           });
           break;
+        case 'eventDrivenPrepAggregate':
+          resolve({
+            main: this.cloneJsonSchema(prep_event_driven_aggregate),
+            eventDrivenPrepBase: this.cloneJsonSchema(prep_event_driven_base)
+          });
+          break;
         case 'restartingPrepAggregate':
           resolve({
             main: this.cloneJsonSchema(restarting_prep_aggregate),

diff --git a/...rk/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-aggregate.json b/...rk/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_yy_pbfw",
       "column": "sum(b.total_yy_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_other_reasons",
+      "column": "sum(b.total_reason_for_discontinuation_other_reasons)"
     }
   ],
   "groupBy": {

diff --git a/...amework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-base.json b/...amework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '5622') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_other_reasons",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '5622'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...ting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-aggregate.json b/...ting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_vv_pbfw",
       "column": "sum(b.total_vv_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_died",
+      "column": "sum(b.total_reason_for_discontinuation_died)"
     }
   ],
   "groupBy": {

diff --git a/...reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-base.json b/...reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1593') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_died",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1593'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...k/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-aggregate.json b/...k/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-aggregate.json
@@ -1081,6 +1081,11 @@
       "type": "simple_column",
       "alias": "total_st_pbfw",
       "column": "sum(b.total_st_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_discontinued_prep_this_month",
+      "column": "sum(b.total_discontinued_prep_this_month)"
     }
   ],
   "groupBy": {

diff --git a/...mework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-base.json b/...mework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -818,7 +818,7 @@
       "alias": "total_st_mahr",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4)), 1, NULL)"
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M'), 1, NULL)"
       }
     },
     {
@@ -1741,6 +1741,14 @@
         "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.population_type = 9), 1, NULL)"
       }
     },
+    {
+      "type": "derived_column",
+      "alias": "total_discontinued_prep_this_month",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1), 1, NULL)"
+      }
+    },
     {
       "type": "derived_column",
       "alias": "month",

diff --git a/...rk/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-aggregate.json b/...rk/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_mm_pbfw",
       "column": "sum(b.total_mm_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_low_risk",
+      "column": "sum(b.total_reason_for_discontinuation_low_risk)"
     }
   ],
   "groupBy": {

diff --git a/...amework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-base.json b/...amework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '9777') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_low_risk",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '9777'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-aggregate.json b/...json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_xx_pbfw",
       "column": "sum(b.total_xx_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_missed_drug_pickup",
+      "column": "sum(b.total_reason_for_discontinuation_missed_drug_pickup)"
     }
   ],
   "groupBy": {

diff --git a/...work/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-base.json b/...work/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1448') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_missed_drug_pickup",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1448'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...ework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-aggregate.json b/...ework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_pp_pbfw",
       "column": "sum(b.total_pp_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_non_adherence",
+      "column": "sum(b.total_reason_for_discontinuation_non_adherence)"
     }
   ],
   "groupBy": {

diff --git a/...-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-base.json b/...-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1434') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_non_adherence",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1434'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...ork/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-aggregate.json b/...ork/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_ss_pbfw",
       "column": "sum(b.total_ss_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_partner_refusal",
+      "column": "sum(b.total_reason_for_discontinuation_partner_refusal)"
     }
   ],
   "groupBy": {

diff --git a/...ramework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-base.json b/...ramework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1958') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_partner_refusal",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1958'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...rk/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-aggregate.json b/...rk/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_tt_pbfw",
       "column": "sum(b.total_tt_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_partner_violence",
+      "column": "sum(b.total_reason_for_discontinuation_partner_violence)"
     }
   ],
   "groupBy": {

diff --git a/...amework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-base.json b/...amework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '9761') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_partner_violence",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '9761'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...k/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-aggregate.json b/...k/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_nn_pbfw",
       "column": "sum(b.total_nn_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_side_effects",
+      "column": "sum(b.total_reason_for_discontinuation_side_effects)"
     }
   ],
   "groupBy": {

diff --git a/...mework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-base.json b/...mework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1664') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_side_effects",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1664'), 1, NULL)"
+      }
     }
   ],
   "filters": {

diff --git a/...ork/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-aggregate.json b/...ork/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-aggregate.json
@@ -1076,6 +1076,11 @@
       "type": "simple_column",
       "alias": "total_ll_pbfw",
       "column": "sum(b.total_ll_pbfw)"
+    },
+    {
+      "type": "simple_column",
+      "alias": "total_reason_for_discontinuation_tested_positive",
+      "column": "sum(b.total_reason_for_discontinuation_tested_positive)"
     }
   ],
   "groupBy": {

diff --git a/...ramework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-base.json b/...ramework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-base.json
@@ -6,7 +6,7 @@
   "uses": [],
   "sources": [
     {
-      "table": "etl.prep_monthly_report_dataset_v3",
+      "table": "etl.prep_monthly_report_dataset_v5",
       "alias": "pd"
     },
     {
@@ -1743,6 +1743,14 @@
       "expressionOptions": {
         "expression": "if(((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1169') AND pd.population_type = 9), 1, NULL)"
       }
+    },
+    {
+      "type": "derived_column",
+      "alias": "total_reason_for_discontinuation_tested_positive",
+      "expressionType": "simple_expression",
+      "expressionOptions": {
+        "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '1169'), 1, NULL)"
+      }
     }
   ],
   "filters": {