Add final fixes before moving to production

jecihjoy · Jul 10, 2018 · 9355c46 · 9355c46
1 parent 1887794
commit 9355c46
Show file tree

Hide file tree

Showing 246 changed files with 5,998 additions and 101 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/app/config/config.service.js b/app/config/config.service.js
diff --git a/app/database-access/mysql-connection.service.js b/app/database-access/mysql-connection.service.js
diff --git a/app/database-access/query.service.js b/app/database-access/query.service.js
diff --git a/app/reporting-framework/base-mysql.report.js b/app/reporting-framework/base-mysql.report.js
@@ -34,6 +34,15 @@ import * as referral_patient_list_template from './json-reports/referral-patient
 import * as referral_dataset_base from './json-reports/referral-dataset-base.json';
 import * as referral_aggregate from './json-reports/referral-aggregate.json';
 
+import * as starting_art_aggregation_age15 from './json-reports/starting-art-aggregation-age15.json';
+import * as starting_art_base_age15 from './json-reports/starting-art-base-age15.json';
+import * as starting_art_disaggregation_age15 from './json-reports/starting-art-disaggregation-age15.json';
+
+import * as starting_art_aggregation_age_green from './json-reports/starting-art-aggregation-age-green.json';
+import * as starting_art_base_age_green from './json-reports/starting-art-base-age-green.json';
+import * as starting_art_disaggregation_age_green from './json-reports/starting-art-disaggregation-age-green.json';
+import * as starting_art_disaggregation_age_only_green from './json-reports/starting-art-disaggregation-age-only-green.json';
+
 export class BaseMysqlReport {
     constructor(reportName, params) {
         this.reportName = reportName;
@@ -54,10 +63,10 @@ export class BaseMysqlReport {
                     // generate query
                     that.generateReportQuery(that.reportSchemas, that.params)
                         .then((sqlQuery) => {
-                            
+
                             // allow user to use 'null' as parameter values
-                            sqlQuery=sqlQuery.replace(/\'null\'/g,"null");
-                            that.reportQuery = sqlQuery;                                              
+                            sqlQuery = sqlQuery.replace(/\'null\'/g, "null");
+                            that.reportQuery = sqlQuery;
                             // run query
                             that.executeReportQuery(that.reportQuery)
                                 .then((result) => {
@@ -182,6 +191,36 @@ export class BaseMysqlReport {
                         referralDatasetbase: referral_dataset_base
                     });
                     break;
+                case 'StartingARTAggregationAge15':
+                    resolve({
+                        main: starting_art_aggregation_age15,
+                        StartingARTSetBaseAge15: starting_art_base_age15
+                    });
+                    break;
+                case 'StartingARTDisaggregationAge15':
+                    resolve({
+                        main: starting_art_disaggregation_age15,
+                        StartingARTSetBaseAge15: starting_art_base_age15
+                    });
+                    break;
+                case 'StartingARTAggregationAgeGreen':
+                    resolve({
+                        main: starting_art_aggregation_age_green,
+                        StartingARTSetBaseAgeGreen: starting_art_base_age_green
+                    });
+                    break;
+                case 'StartingARTDisaggregationAgeGreen':
+                    resolve({
+                        main: starting_art_disaggregation_age_green,
+                        StartingARTSetBaseAgeGreen: starting_art_base_age_green
+                    });
+                    break;
+                case 'StartingARTDisaggregationAgeOnlyGreen':
+                    resolve({
+                        main: starting_art_disaggregation_age_only_green,
+                        StartingARTSetBaseAgeGreen: starting_art_base_age_green
+                    });
+                    break;
                 default:
                     reject('Unknown report ', reportName);
                     break;

diff --git a/app/reporting-framework/hiv/moh-731-2017.json b/app/reporting-framework/hiv/moh-731-2017.json
@@ -100,42 +100,42 @@
             {
                 "label": "Starting ART - 10 to 14yrs(M)",
                 "ref": "HV03-018",
-                "indicator": "dc__gender__M__age_range__10_to_14__started_art"
+                "indicator": "dc__age_range__10_to_14__gender__M__started_art"
             },
             {
                 "label": "Starting ART - 10 to 14yrs(F)",
                 "ref": "HV03-019",
-                "indicator": "dc__gender__F__age_range__10_to_14__started_art"
+                "indicator": "dc__age_range__10_to_14__gender__F__started_art"
             },
             {
                 "label": "Starting ART - 15 to 19yrs(M)",
                 "ref": "HV03-020",
-                "indicator": "dc__gender__M__age_range__15_to_19__started_art"
+                "indicator": "dc__age_range__15_to_19__gender__M__started_art"
             },
             {
                 "label": "Starting ART - 15 to 19yrs(F)",
                 "ref": "HV03-021",
-                "indicator": "dc__gender__F__age_range__15_to_19__started_art"
+                "indicator": "dc__age_range__15_to_19__gender__F__started_art"
             },
             {
                 "label": "Starting ART - 20 to 24yrs(M)",
                 "ref": "HV03-022",
-                "indicator": "dc__gender__M__age_range__20_to_24__started_art"
+                "indicator": "dc__age_range__20_to_24__gender__M__started_art"
             },
             {
                 "label": "Starting ART - 20 to 24yrs(F)",
                 "ref": "HV03-023",
-                "indicator": "dc__gender__F__age_range__20_to_24__started_art"
+                "indicator": "dc__age_range__20_to_24__gender__F__started_art"
             },
             {
                 "label": "Starting ART - 25 and older(M)",
                 "ref": "HV03-024",
-                "indicator": "dc__gender__M__age_range__older_than_24__started_art"
+                "indicator": "dc__age_range__older_than_24__gender__M__started_art"
             },
             {
                 "label": "Starting ART - 25 and older(F)",
                 "ref": "HV03-025",
-                "indicator": "dc__gender__F__age_range__older_than_24__started_art"
+                "indicator": "dc__age_range__older_than_24__gender__F__started_art"
             },
             {
                 "label": "Starting on ART - Total (Sum HV03-016 to HV03-025)",

diff --git a/app/reporting-framework/hiv/moh-731-legacy.json b/app/reporting-framework/hiv/moh-731-legacy.json
@@ -125,32 +125,32 @@
          {
             "label": "Starting ART -Below 1yr(M)",
             "ref": "HV03-20",
-            "indicator": "dc__gender__M__age_range__0_to_1__started_art"
+            "indicator": "dc__age_range__0_to_1__gender__M__started_art"
          },
          {
             "label": "Starting ART -Below 1yr(F)",
             "ref": "HV03-20",
-            "indicator": "dc__gender__F__age_range__0_to_1__started_art"
+            "indicator": "dc__age_range__0_to_1__gender__F__started_art"
          },
          {
             "label": "Starting ART -Below 15yrs(M)",
             "ref": "HV03-21",
-            "indicator": "dc__gender__M__age_range__below_15_years__started_art"
+            "indicator": "dc__age_range__below_15_years__gender__M__started_art"
          },
          {
             "label": "Starting ART -Below 15yrs(F)",
             "ref": "HV03-22",
-            "indicator": "dc__gender__F__age_range__below_15_years__started_art"
+            "indicator": "dc__age_range__below_15_years__gender__F__started_art"
          },
          {
             "label": "Starting ART -15yr and Older(M)",
             "ref": "HV03-23",
-            "indicator": "dc__gender__M__age_range__older_than_15__started_art"
+            "indicator": "dc__age_range__older_than_15__gender__M__started_art"
          },
          {
             "label": "Starting ART -15yr and Older(F)",
             "ref": "HV03-24",
-            "indicator": "dc__gender__F__age_range__older_than_15__started_art"
+            "indicator": "dc__age_range__older_than_15__gender__F__started_art"
          },
          {
             "label": "Starting on ART -Total (Sum HV03-21 to HV03-24)",

diff --git a/app/reporting-framework/hiv/moh-731.report.js b/app/reporting-framework/hiv/moh-731.report.js
diff --git a/app/reporting-framework/json-reports/ever-on-art-aggregate.json b/app/reporting-framework/json-reports/ever-on-art-aggregate.json
diff --git a/app/reporting-framework/json-reports/ever-on-art-base.json b/app/reporting-framework/json-reports/ever-on-art-base.json
diff --git a/app/reporting-framework/json-reports/ever-on-art-disaggregation.json b/app/reporting-framework/json-reports/ever-on-art-disaggregation.json
diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate-age-disaggregation.json b/app/reporting-framework/json-reports/main-dataset-aggregate-age-disaggregation.json
@@ -74,14 +74,6 @@
                 "expression": "count(hmsd.pre_art)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "current_in_care",

diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate-age15-disaggregation.json b/app/reporting-framework/json-reports/main-dataset-aggregate-age15-disaggregation.json
@@ -66,14 +66,6 @@
                 "expression": "count(hmsd.pre_art)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "current_in_care",

diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate-age18-disaggregation.json b/app/reporting-framework/json-reports/main-dataset-aggregate-age18-disaggregation.json
@@ -66,14 +66,6 @@
                 "expression": "count(hmsd.pre_art)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "current_in_care",

diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate-bluecard.json b/app/reporting-framework/json-reports/main-dataset-aggregate-bluecard.json
@@ -66,13 +66,6 @@
             "expressionOptions": {
                 "expression": "count(hmsd.pre_art)"
             }
-        }, {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
         }, {
             "type": "derived_column",
             "alias": "current_in_care",

diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate-no-disaggregation.json b/app/reporting-framework/json-reports/main-dataset-aggregate-no-disaggregation.json
@@ -66,14 +66,6 @@
                 "expression": "count(hmsd.pre_art)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "started_art_pregnant",

diff --git a/app/reporting-framework/json-reports/main-dataset-aggregate.json b/app/reporting-framework/json-reports/main-dataset-aggregate.json
@@ -74,14 +74,6 @@
                 "expression": "count(hmsd.pre_art)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "count(hmsd.started_art)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "current_in_care",

diff --git a/app/reporting-framework/json-reports/main-dataset-base-age15.json b/app/reporting-framework/json-reports/main-dataset-base-age15.json
@@ -108,7 +108,7 @@
             "alias": "enrolled_this_month",
             "expressionType": "simple_expression",
             "expressionOptions": {
-                "expression": "case when enrolled_this_month=1 then 1 else null end"
+                "expression": "case when enrolled_this_month=1 AND NOT (enrollment_date > arv_first_regimen_start_date) then 1 else null end"
             }
         },
         {
@@ -127,14 +127,6 @@
                 "expression": "if(arv_first_regimen is null and status='active',1,null)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "if(started_art_this_month=1  AND hmsd.location_id = arv_first_regimen_location_id,1,null)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "active_on_art",

diff --git a/app/reporting-framework/json-reports/main-dataset-base-age18.json b/app/reporting-framework/json-reports/main-dataset-base-age18.json
@@ -108,7 +108,7 @@
             "alias": "enrolled_this_month",
             "expressionType": "simple_expression",
             "expressionOptions": {
-                "expression": "case when enrolled_this_month=1 then 1 else null end"
+                "expression": "case when enrolled_this_month=1 AND NOT (enrollment_date > arv_first_regimen_start_date) then 1 else null end"
             }
         },
         {
@@ -127,14 +127,6 @@
                 "expression": "if(arv_first_regimen is null and status='active',1,null)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "if(started_art_this_month=1  AND hmsd.location_id = arv_first_regimen_location_id,1,null)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "active_on_art",

diff --git a/app/reporting-framework/json-reports/main-dataset-base-blue-card.json b/app/reporting-framework/json-reports/main-dataset-base-blue-card.json
@@ -108,7 +108,7 @@
             "alias": "enrolled_this_month",
             "expressionType": "simple_expression",
             "expressionOptions": {
-                "expression": "case when enrolled_this_month=1 then 1 else null end"
+                "expression": "case when enrolled_this_month=1 AND NOT (enrollment_date > arv_first_regimen_start_date) then 1 else null end"
             }
         },
         {
@@ -127,14 +127,6 @@
                 "expression": "if(arv_first_regimen is null and status='active',1,null)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "if(started_art_this_month=1  AND hmsd.location_id = arv_first_regimen_location_id,1,null)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "active_on_art",

diff --git a/app/reporting-framework/json-reports/main-dataset-base.json b/app/reporting-framework/json-reports/main-dataset-base.json
@@ -124,15 +124,15 @@
             "alias": "enrolled_this_month",
             "expressionType": "simple_expression",
             "expressionOptions": {
-                "expression": "case when enrolled_this_month=1 then 1 else null end"
+                "expression": "case when enrolled_this_month=1 AND NOT (enrollment_date > arv_first_regimen_start_date) then 1 else null end"
             }
         },
         {
             "type": "derived_column",
             "alias": "art_revisit_this_month",
             "expressionType": "simple_expression",
             "expressionOptions": {
-                "expression": "case when art_revisit_this_month=1 then 1 else null end"
+                "expression": "case when art_revisit_this_month=1 and status = 'active' then 1 else null end"
             }
         },
         {
@@ -151,14 +151,6 @@
                 "expression": "if(arv_first_regimen is null and status='active',1,null)"
             }
         },
-        {
-            "type": "derived_column",
-            "alias": "started_art",
-            "expressionType": "simple_expression",
-            "expressionOptions": {
-                "expression": "if(started_art_this_month=1  AND hmsd.location_id = arv_first_regimen_location_id,1,null)"
-            }
-        },
         {
             "type": "derived_column",
             "alias": "started_art_pregnant",

diff --git a/app/reporting-framework/json-reports/moh-731-bluecard.json b/app/reporting-framework/json-reports/moh-731-bluecard.json
@@ -5,6 +5,8 @@
         "regimenDataSetAggregate",
         "retentionDataSetAggregate",
         "mainDatasetAggregateNoDisaggregation",
+        "StartingARTAggregationAge15",
+        "StartingARTDisaggregationAge15",
         "pepDatasetAggregate",
         "everOnARTAggregate",
         "everOnARTDisaggregation"

diff --git a/app/reporting-framework/json-reports/moh-731-greencard.json b/app/reporting-framework/json-reports/moh-731-greencard.json
@@ -6,6 +6,9 @@
         "mainDatasetAggregateNoDisaggregation",
         "mainDatasetAggregateAgeDisaggregation",
         "mainDatasetAggregateAge15Disaggregation",
+        "StartingARTAggregationAgeGreen",
+        "StartingARTDisaggregationAgeGreen",
+        "StartingARTDisaggregationAgeOnlyGreen",
         "mainDatasetAggregateAge18Disaggregation",
         "pepDatasetAggregate"
     ]

diff --git a/app/reporting-framework/json-reports/patient-list-template.json b/app/reporting-framework/json-reports/patient-list-template.json
diff --git a/app/reporting-framework/json-reports/pep-dataset-aggregate.json b/app/reporting-framework/json-reports/pep-dataset-aggregate.json
diff --git a/app/reporting-framework/json-reports/pep-dataset-base.json b/app/reporting-framework/json-reports/pep-dataset-base.json
diff --git a/app/reporting-framework/json-reports/referral-aggregate.json b/app/reporting-framework/json-reports/referral-aggregate.json
diff --git a/app/reporting-framework/json-reports/referral-dataset-base.json b/app/reporting-framework/json-reports/referral-dataset-base.json
diff --git a/app/reporting-framework/json-reports/referral-patient-list-template.json b/app/reporting-framework/json-reports/referral-patient-list-template.json
diff --git a/app/reporting-framework/json-reports/regimen-dataset-aggregate.json b/app/reporting-framework/json-reports/regimen-dataset-aggregate.json
diff --git a/app/reporting-framework/json-reports/regimen-dataset-base.json b/app/reporting-framework/json-reports/regimen-dataset-base.json
diff --git a/app/reporting-framework/json-reports/retention-dataset-aggregate.json b/app/reporting-framework/json-reports/retention-dataset-aggregate.json
diff --git a/app/reporting-framework/json-reports/retention-dataset-base.json b/app/reporting-framework/json-reports/retention-dataset-base.json