Skip to content

Commit

Permalink
POC-544-v2: Added Prettier Complience
Browse files Browse the repository at this point in the history
  • Loading branch information
henrykorir committed Feb 5, 2024
1 parent 4858d6e commit 9b622ab
Show file tree
Hide file tree
Showing 28 changed files with 3,205 additions and 3,234 deletions.
8 changes: 2 additions & 6 deletions app/reporting-framework/base-mysql.report.js
Original file line number Diff line number Diff line change
Expand Up @@ -1912,9 +1912,7 @@ export class BaseMysqlReport {
case 'genMDPlhivAggregate':
resolve({
main: this.cloneJsonSchema(genMD_plhiv_aggregate),
genMDPlhivBase: this.cloneJsonSchema(
genMD_plhiv_base
)
genMDPlhivBase: this.cloneJsonSchema(genMD_plhiv_base)
});
break;
case 'stMDPlhivAggregate':
Expand All @@ -1926,9 +1924,7 @@ export class BaseMysqlReport {
case 'totMDPlhivAggregate':
resolve({
main: this.cloneJsonSchema(totMD_plhiv_aggregate),
totMDPlhivBase: this.cloneJsonSchema(
totMD_plhiv_base
)
totMDPlhivBase: this.cloneJsonSchema(totMD_plhiv_base)
});
break;
case 'cvdPlhivAggregate':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,8 @@
"expressionOptions": {
"expression": "sum(b.sub_tot_nw_cvd)"
}
}
},

,
{
"type": "derived_column",
"alias": "sub_tot_ct_cvd_m",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@
"expressionOptions": {
"expression": "IF(((nmrd.gender = 'F' OR nmrd.gender = 'M') AND nmrd.has_cvd = 1 AND hmrd.started_art_this_month = 1), 1, 0)"
}
}
},

,
{
"type": "derived_column",
"alias": "sub_tot_ct_cvd_m",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,100 +1,99 @@
{
"name": "anxPlhivAggregate",
"version": "1.0",
"tag": "",
"description": "",
"uses": [
{
"name": "anxPlhivBase",
"version": "1.0",
"type": "dataset_def"
}
],
"sources": [
{
"dataSet": "anxPlhivBase",
"alias": "b"
}
],
"columns": [
{
"type": "derived_column",
"alias": "join_location",
"expressionType": "simple_expression",
"expressionOptions": {
"expression": "1"
}
},
{
"type": "simple_column",
"alias": "location_id",
"column": "b.location_id"
},
{
"type": "simple_column",
"alias": "location_uuid",
"column": "b.location_uuid"
},
{
"type": "simple_column",
"alias": "location",
"column": "b.location"
},
{
"type": "simple_column",
"alias": "nw_anx_mh_f",
"column": "sum(b.nw_anx_mh_f)"
},
{
"type": "simple_column",
"alias": "nw_anx_mh_m",
"column": "sum(b.nw_anx_mh_m)"
},
{
"type": "simple_column",
"alias": "tot_nw_anx_mh",
"column": "sum(b.tot_nw_anx_mh)"
},
{
"type": "simple_column",
"alias": "ct_anx_mh_f",
"column": "sum(b.ct_anx_mh_f)"
},
{
"type": "simple_column",
"alias": "ct_anx_mh_m",
"column": "sum(b.ct_anx_mh_m)"
},
{
"type": "simple_column",
"alias": "tot_ct_anx_mh",
"column": "sum(b.tot_ct_anx_mh)"
"name": "anxPlhivAggregate",
"version": "1.0",
"tag": "",
"description": "",
"uses": [
{
"name": "anxPlhivBase",
"version": "1.0",
"type": "dataset_def"
}
],
"sources": [
{
"dataSet": "anxPlhivBase",
"alias": "b"
}
],
"columns": [
{
"type": "derived_column",
"alias": "join_location",
"expressionType": "simple_expression",
"expressionOptions": {
"expression": "1"
}
],
"groupBy": {
"groupParam": "groupByParam",
"columns": ["b.location_id"],
"excludeParam": "excludeParam"
},
"transFormDirectives": {
"joinColumn": "location_id",
"joinColumnParam": "",
"skipColumns": [""],
"disaggregationColumns": []
{
"type": "simple_column",
"alias": "location_id",
"column": "b.location_id"
},
{
"type": "simple_column",
"alias": "location_uuid",
"column": "b.location_uuid"
},
{
"type": "simple_column",
"alias": "location",
"column": "b.location"
},
"dynamicJsonQueryGenerationDirectives": {
"patientListGenerator": {
"useTemplate": "patient-list-with-contacts-template",
"useTemplateVersion": "1.0",
"generatingDirectives": {
"joinDirectives": {
"joinType": "INNER",
"joinCondition": "<<base_column>> = <<template_column>>",
"baseColumn": "person_id",
"templateColumn": "person_id"
}
{
"type": "simple_column",
"alias": "nw_anx_mh_f",
"column": "sum(b.nw_anx_mh_f)"
},
{
"type": "simple_column",
"alias": "nw_anx_mh_m",
"column": "sum(b.nw_anx_mh_m)"
},
{
"type": "simple_column",
"alias": "tot_nw_anx_mh",
"column": "sum(b.tot_nw_anx_mh)"
},
{
"type": "simple_column",
"alias": "ct_anx_mh_f",
"column": "sum(b.ct_anx_mh_f)"
},
{
"type": "simple_column",
"alias": "ct_anx_mh_m",
"column": "sum(b.ct_anx_mh_m)"
},
{
"type": "simple_column",
"alias": "tot_ct_anx_mh",
"column": "sum(b.tot_ct_anx_mh)"
}
],
"groupBy": {
"groupParam": "groupByParam",
"columns": ["b.location_id"],
"excludeParam": "excludeParam"
},
"transFormDirectives": {
"joinColumn": "location_id",
"joinColumnParam": "",
"skipColumns": [""],
"disaggregationColumns": []
},
"dynamicJsonQueryGenerationDirectives": {
"patientListGenerator": {
"useTemplate": "patient-list-with-contacts-template",
"useTemplateVersion": "1.0",
"generatingDirectives": {
"joinDirectives": {
"joinType": "INNER",
"joinCondition": "<<base_column>> = <<template_column>>",
"baseColumn": "person_id",
"templateColumn": "person_id"
}
}
}
}
}
Loading

0 comments on commit 9b622ab

Please sign in to comment.