Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AMPATH/etl-rest-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f988350d568842bd759d6efe1e7e5081cd1a085f
Choose a base ref
..
head repository: AMPATH/etl-rest-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8378da8a16c6414d6df88e6a0cced0077a6cb0a8
Choose a head ref
Showing with 10,648 additions and 0 deletions.
  1. +151 −0 app/reporting-framework/base-mysql.report.js
  2. +238 −0 ...ework/json-reports/plhiv-ncd-v2-reports/disaggregations/cardiovascular-disease/cvd-aggregate.json
  3. +282 −0 ...-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/cardiovascular-disease/cvd-base.json
  4. +204 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/diabetic/dm-aggregate.json
  5. +337 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/diabetic/dm-base.json
  6. +204 −0 ...rting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/hypertensive/htn-aggregate.json
  7. +342 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/hypertensive/htn-base.json
  8. +893 −0 ...ting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/kidney-disease/kd-aggregate.json
  9. +941 −0 ...reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/kidney-disease/kd-base.json
  10. +45 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/latest-hiv-ncd-triage.json
  11. +99 −0 ...k/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/anxiety-aggregate.json
  12. +169 −0 ...mework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/anxiety-base.json
  13. +99 −0 ...plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/bipolar-and-related-mh-aggregate.json
  14. +169 −0 ...orts/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/bipolar-and-related-mh-base.json
  15. +99 −0 ...son-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/depressive-aggregate.json
  16. +169 −0 ...ork/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/depressive-base.json
  17. +99 −0 .../plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/feeding-and-eating-mh-aggregate.json
  18. +169 −0 ...ports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/feeding-and-eating-mh-base.json
  19. +99 −0 ...lhiv-ncd-v2-reports/disaggregations/mental-health-disorder/general-mental-disorder-aggregate.json
  20. +169 −0 ...rts/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/general-mental-disorder-base.json
  21. +294 −0 ...mework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/mh-aggregate.json
  22. +481 −0 ...g-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/mh-base.json
  23. +99 −0 ...ework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/ocd-aggregate.json
  24. +169 −0 ...-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/ocd-base.json
  25. +99 −0 ...reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/personality-mh-aggregate.json
  26. +169 −0 ...json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/personality-mh-base.json
  27. +79 −0 ...ports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/status-sub-total-aggregate.json
  28. +137 −0 ...on-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/status-sub-total-base.json
  29. +74 −0 .../json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/total-mh-aggregate.json
  30. +129 −0 ...ework/json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/total-mh-base.json
  31. +174 −0 ...ework/json-reports/plhiv-ncd-v2-reports/disaggregations/neurological-disease/neuro-aggregate.json
  32. +289 −0 ...-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/neurological-disease/neuro-base.json
  33. +237 −0 ...ework/json-reports/plhiv-ncd-v2-reports/disaggregations/rheumatologic-disease/rheu-aggregate.json
  34. +289 −0 ...-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/rheumatologic-disease/rheu-base.json
  35. +2,532 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-indicators.json
  36. +103 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-patient-list-cols.json
  37. +27 −0 app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report.json
  38. +102 −0 app/routes/plhiv-ncd-v2-report.route.js
  39. +63 −0 service/eid/eid-facility-mappings.json
  40. +125 −0 service/plhiv-ncd-v2/plhiv-ncd-v2-summary.service.js
151 changes: 151 additions & 0 deletions app/reporting-framework/base-mysql.report.js
Original file line number Diff line number Diff line change
@@ -384,6 +384,56 @@ import * as txrtt_aggregate_report from './json-reports/tx-reports/tx-rtt/tx-rtt
import * as txrtt_base_report from './json-reports/tx-reports/tx-rtt/tx-rtt-report-base.json';
import * as txrtt_summary from './json-reports/txrtt-summary.json';

//plhiv-ncd report
import * as plhiv_ncd_v2_monthly_report from './json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report.json';

import * as htn_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/hypertensive/htn-base.json';
import * as htn_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/hypertensive/htn-aggregate.json';

import * as dm_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/diabetic/dm-base.json';
import * as dm_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/diabetic/dm-aggregate.json';

import * as mh_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/mh-base.json';
import * as mh_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/mh-aggregate.json';

import * as dep_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/depressive-base.json';
import * as dep_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/depressive-aggregate.json';

import * as anx_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/anxiety-base.json';
import * as anx_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/anxiety-aggregate.json';

import * as bip_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/bipolar-and-related-mh-base.json';
import * as bip_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/bipolar-and-related-mh-aggregate.json';

import * as per_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/personality-mh-base.json';
import * as per_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/personality-mh-aggregate.json';

import * as fed_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/feeding-and-eating-mh-base.json';
import * as fed_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/feeding-and-eating-mh-aggregate.json';

import * as ocd_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/ocd-base.json';
import * as ocd_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/ocd-aggregate.json';

import * as genMD_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/general-mental-disorder-base.json';
import * as genMD_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/general-mental-disorder-aggregate.json';

import * as stMD_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/status-sub-total-base.json';
import * as stMD_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/status-sub-total-aggregate.json';

import * as totMD_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/total-mh-base.json';
import * as totMD_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/mental-health-disorder/total-mh-aggregate.json';

import * as cvd_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/cardiovascular-disease/cvd-base.json';
import * as cvd_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/cardiovascular-disease/cvd-aggregate.json';

import * as neu_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/neurological-disease/neuro-base.json';
import * as neu_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/neurological-disease/neuro-aggregate.json';

import * as rhe_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/rheumatologic-disease/rheu-base.json';
import * as rhe_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/rheumatologic-disease/rheu-aggregate.json';

import * as kd_plhiv_base from './json-reports/plhiv-ncd-v2-reports/disaggregations/kidney-disease/kd-base.json';
import * as kd_plhiv_aggregate from './json-reports/plhiv-ncd-v2-reports/disaggregations/kidney-disease/kd-aggregate.json';
//ahd report
import * as ahd_monthly_summary from './json-reports/ahd_reports/ahd-monthly.json';
import * as ahd_monthly_aggregate from './json-reports/ahd_reports/ahd-monthly-aggregate.json';
@@ -1836,6 +1886,107 @@ export class BaseMysqlReport {
main: this.cloneJsonSchema(txrtt_summary)
});
break;
case 'plhiv-ncd-v2-monthly-report':
resolve({
main: this.cloneJsonSchema(plhiv_ncd_v2_monthly_report)
});
break;
case 'htnPlhivAggregate':
resolve({
main: this.cloneJsonSchema(htn_plhiv_aggregate),
htnPlhivBase: this.cloneJsonSchema(htn_plhiv_base)
});
break;
case 'dmPlhivAggregate':
resolve({
main: this.cloneJsonSchema(dm_plhiv_aggregate),
dmPlhivBase: this.cloneJsonSchema(dm_plhiv_base)
});
break;

case 'depPlhivAggregate':
resolve({
main: this.cloneJsonSchema(dep_plhiv_aggregate),
depPlhivBase: this.cloneJsonSchema(dep_plhiv_base)
});
break;

case 'anxPlhivAggregate':
resolve({
main: this.cloneJsonSchema(anx_plhiv_aggregate),
anxPlhivBase: this.cloneJsonSchema(anx_plhiv_base)
});
break;

case 'bipPlhivAggregate':
resolve({
main: this.cloneJsonSchema(bip_plhiv_aggregate),
bipPlhivBase: this.cloneJsonSchema(bip_plhiv_base)
});
break;

case 'perPlhivAggregate':
resolve({
main: this.cloneJsonSchema(per_plhiv_aggregate),
perPlhivBase: this.cloneJsonSchema(per_plhiv_base)
});
break;
case 'fedPlhivAggregate':
resolve({
main: this.cloneJsonSchema(fed_plhiv_aggregate),
fedPlhivBase: this.cloneJsonSchema(fed_plhiv_base)
});
break;

case 'ocdPlhivAggregate':
resolve({
main: this.cloneJsonSchema(ocd_plhiv_aggregate),
ocdPlhivBase: this.cloneJsonSchema(ocd_plhiv_base)
});
break;

case 'genMDPlhivAggregate':
resolve({
main: this.cloneJsonSchema(genMD_plhiv_aggregate),
genMDPlhivBase: this.cloneJsonSchema(genMD_plhiv_base)
});
break;
case 'stMDPlhivAggregate':
resolve({
main: this.cloneJsonSchema(stMD_plhiv_aggregate),
stMDPlhivBase: this.cloneJsonSchema(stMD_plhiv_base)
});
break;
case 'totMDPlhivAggregate':
resolve({
main: this.cloneJsonSchema(totMD_plhiv_aggregate),
totMDPlhivBase: this.cloneJsonSchema(totMD_plhiv_base)
});
break;
case 'cvdPlhivAggregate':
resolve({
main: this.cloneJsonSchema(cvd_plhiv_aggregate),
cvdPlhivBase: this.cloneJsonSchema(cvd_plhiv_base)
});
break;
case 'neuPlhivAggregate':
resolve({
main: this.cloneJsonSchema(neu_plhiv_aggregate),
neuPlhivBase: this.cloneJsonSchema(neu_plhiv_base)
});
break;
case 'rhePlhivAggregate':
resolve({
main: this.cloneJsonSchema(rhe_plhiv_aggregate),
rhePlhivBase: this.cloneJsonSchema(rhe_plhiv_base)
});
break;
case 'kdPlhivAggregate':
resolve({
main: this.cloneJsonSchema(kd_plhiv_aggregate),
kdPlhivBase: this.cloneJsonSchema(kd_plhiv_base)
});
break;
default:
reject('Unknown report ', reportName);
break;
Loading