From e049e6eb6426189e96144085f2ef2c319f139c4f Mon Sep 17 00:00:00 2001 From: sharleenawinja <105132006+sharleenawinja@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:55:07 +0300 Subject: [PATCH] adding event driven indicators (#1332) * adding event driven indicators * Update build-json-schema.js * Update build-json-schema.js --------- Co-authored-by: Drizzentic --- app/reporting-framework/base-mysql.report.js | 9 + .../any-other-reason-aggregate.json | 5 + .../discontinued/any-other-reason-base.json | 10 +- .../discontinued/died-aggregate.json | 5 + .../discontinued/died-base.json | 10 +- .../discontinued-prep-aggregate.json | 5 + .../discontinued/discontinued-prep-base.json | 12 +- .../low-risk-for-hiv-aggregate.json | 5 + .../discontinued/low-risk-for-hiv-base.json | 10 +- .../missed-drug-pickups-aggregate.json | 5 + .../missed-drug-pickups-base.json | 10 +- .../discontinued/non-adherence-aggregate.json | 5 + .../discontinued/non-adherence-base.json | 10 +- .../partner-refusal-aggregate.json | 5 + .../discontinued/partner-refusal-base.json | 10 +- .../partner-violence-aggregate.json | 5 + .../discontinued/partner-violence-base.json | 10 +- .../prep-side-effects-aggregate.json | 5 + .../discontinued/prep-side-effects-base.json | 10 +- .../tested-positive-aggregate.json | 5 + .../discontinued/tested-positive-base.json | 10 +- .../too-many-hiv-tests-aggregate.json | 5 + .../discontinued/too-many-hiv-tests-base.json | 10 +- .../discontinued/transfer-outs-aggregate.json | 5 + .../discontinued/transfer-outs-base.json | 10 +- ...pression-of-hiv-positive-partner-base.json | 2 +- .../eligibility/eligible-for-prep-base.json | 2 +- .../prep-event-driven-aggregate.json | 186 + .../event-driven/prep-event-driven-base.json | 295 ++ .../new/new-for-prep-aggregate.json | 5 + .../new/new-for-prep-base.json | 34 +- .../reasons_for_initiation/gbv-aggregate.json | 5 + .../reasons_for_initiation/gbv-base.json | 34 +- ...consistent-or-no-condom-use-aggregate.json | 5 + .../inconsistent-or-no-condom-use-base.json | 34 +- .../other-reasons-aggregate.json | 5 + .../other-reasons-base.json | 34 +- ...prep-reasons-for-initiation-aggregate.json | 15 + .../prep-reasons-for-initiation-base.json | 76 +- .../recent-sti-aggregate.json | 5 + .../recent-sti-base.json | 34 +- .../recurrent-use-of-pep-aggregate.json | 5 + .../recurrent-use-of-pep-base.json | 34 +- .../shared-needles-base.json | 2 +- .../transactional-sex-aggregate.json | 5 + .../transactional-sex-base.json | 10 +- .../restarting/restarting-prep-aggregate.json | 5 + .../restarting/restarting-prep-base.json | 10 +- .../disaggregations/template-base.json | 2 +- .../while-on-prep-aggregate.json | 10 + .../while-on-prep/while-on-prep-base.json | 20 +- .../prep-monthly-sections-indicators.json | 3579 ++++++++++++++--- .../prep-monthly/prep-report.json | 1 + build-json-schema.js | 6 +- service/prep/prep-monthly-report.service.js | 2 +- 55 files changed, 3996 insertions(+), 657 deletions(-) create mode 100644 app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-aggregate.json create mode 100644 app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-base.json diff --git a/app/reporting-framework/base-mysql.report.js b/app/reporting-framework/base-mysql.report.js index 5e6afd8c2..d79e5670e 100755 --- 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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-aggregate.json index 5a279a0cb..28c2a5b17 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-base.json index 9288ca2d5..bfda8eeb3 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/any-other-reason-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-aggregate.json index 97339c37d..1f34e14b7 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-aggregate.json +++ b/app/reporting-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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-base.json index dac0ea93f..6da2f4f82 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/died-base.json +++ b/app/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-aggregate.json index 702c23a9c..4718608ec 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-base.json index d888c25bc..9dd067733 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/discontinued-prep-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-aggregate.json index a7921d671..a021b9300 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-base.json index 89ada27f8..f6e2e2b9a 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/low-risk-for-hiv-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-aggregate.json index 394c8988a..4db1b83bc 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-base.json index 8b055d2ea..32cacbb5f 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/missed-drug-pickups-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-aggregate.json index f4d3902ab..e462df112 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-base.json index c8e332435..70bf31a54 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/non-adherence-base.json +++ b/app/reporting-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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-aggregate.json index 56e36ba22..092a0782e 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-base.json index 2b00fb343..dbe6ffed2 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-refusal-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-aggregate.json index 42ab49e11..6a1b7199e 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-base.json index 09c01da8b..8fb10bea4 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/partner-violence-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-aggregate.json index 915489217..961449a92 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-base.json index ebaafeb38..8fa1aa19c 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/prep-side-effects-base.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-aggregate.json index 371576564..304cedcd3 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-aggregate.json +++ b/app/reporting-framework/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/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-base.json index d369f2c84..c569511d3 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/tested-positive-base.json +++ b/app/reporting-framework/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": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-aggregate.json index 0530fcd95..d64936eb5 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_rr_pbfw", "column": "sum(b.total_rr_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_discontinuation_many_tests", + "column": "sum(b.total_reason_for_discontinuation_many_tests)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-base.json index 7648a5711..6bab9f185 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/too-many-hiv-tests-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 = '9781') AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_discontinuation_many_tests", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '9781'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-aggregate.json index 04e4b739c..3a183ae07 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_ww_pbfw", "column": "sum(b.total_ww_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_discontinuation_transfer_outs", + "column": "sum(b.total_reason_for_discontinuation_transfer_outs)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-base.json index 2479ef367..ce347683d 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/transfer-outs-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 = '10119') AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_discontinuation_transfer_outs", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.discontinued_from_prep_this_month = 1 AND pd.reason_for_discontinuation = '10119'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/viral-suppression-of-hiv-positive-partner-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/viral-suppression-of-hiv-positive-partner-base.json index d558ac335..0f48c18c1 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/viral-suppression-of-hiv-positive-partner-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/discontinued/viral-suppression-of-hiv-positive-partner-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/eligibility/eligible-for-prep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/eligibility/eligible-for-prep-base.json index 6e766e4ac..5d7a5fd0f 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/eligibility/eligible-for-prep-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/eligibility/eligible-for-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" }, { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-aggregate.json new file mode 100644 index 000000000..9574aba42 --- /dev/null +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-aggregate.json @@ -0,0 +1,186 @@ +{ + "name": "eventDrivenPrepAggregate", + "version": "1.0", + "tag": "", + "description": "", + "uses": [ + { + "name": "eventDrivenPrepBase", + "version": "1.0", + "type": "dataset_def" + } + ], + "sources": [ + { + "dataSet": "eventDrivenPrepBase", + "alias": "b" + } + ], + "columns": [ + { + "type": "simple_column", + "alias": "person_id", + "column": "b.person_id" + }, + { + "type": "simple_column", + "alias": "month", + "column": "b.month" + }, + { + "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": "edp_mhr_15_19_male", + "column": "sum(b.edp_mhr_15_19_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_15_19_female", + "column": "sum(b.edp_mhr_15_19_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_20_24_male", + "column": "sum(b.edp_mhr_20_24_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_20_24_female", + "column": "sum(b.edp_mhr_20_24_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_25_29_male", + "column": "sum(b.edp_mhr_25_29_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_25_29_female", + "column": "sum(b.edp_mhr_25_29_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_30_34_male", + "column": "sum(b.edp_mhr_30_34_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_30_34_female", + "column": "sum(b.edp_mhr_30_34_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_35_39_male", + "column": "sum(b.edp_mhr_35_39_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_35_39_female", + "column": "sum(b.edp_mhr_35_39_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_40_44_male", + "column": "sum(b.edp_mhr_40_44_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_40_44_female", + "column": "sum(b.edp_mhr_40_44_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_45_49_male", + "column": "sum(b.edp_mhr_45_49_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_45_49_female", + "column": "sum(b.edp_mhr_45_49_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_50_54_male", + "column": "sum(b.edp_mhr_50_54_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_50_54_female", + "column": "sum(b.edp_mhr_50_54_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_55_59_male", + "column": "sum(b.edp_mhr_55_59_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_55_59_female", + "column": "sum(b.edp_mhr_55_59_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_60_64_male", + "column": "sum(b.edp_mhr_60_64_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_60_64_female", + "column": "sum(b.edp_mhr_60_64_female)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_above_65_male", + "column": "sum(b.edp_mhr_above_65_male)" + }, + { + "type": "simple_column", + "alias": "edp_mhr_above_65_female", + "column": "sum(b.edp_mhr_above_65_female)" + }, + { + "type": "simple_column", + "alias": "total_edp_mhr", + "column": "sum(b.total_edp_mhr)" + } + ], + "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": "<> = <>", + "baseColumn": "person_id", + "templateColumn": "person_id" + } + } + } + } +} diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-base.json new file mode 100644 index 000000000..83d3dbd99 --- /dev/null +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/event-driven/prep-event-driven-base.json @@ -0,0 +1,295 @@ +{ + "name": "eventDrivenPrepBase", + "version": "1.0", + "tag": "", + "description": "", + "uses": [], + "sources": [ + { + "table": "etl.prep_monthly_report_dataset_v5", + "alias": "pd" + }, + { + "table": "etl.flat_patient_identifiers_v1", + "alias": "fi", + "join": { + "type": "LEFT", + "joinCondition": "pd.person_id = fi.patient_id" + } + }, + { + "table": "amrs.location", + "alias": "l", + "join": { + "type": "INNER", + "joinCondition": "pd.location_id = l.location_id" + } + }, + { + "table": "amrs.person", + "alias": "per", + "join": { + "type": "INNER", + "joinCondition": "pd.person_id = per.person_id" + } + } + ], + "columns": [ + { + "type": "simple_column", + "alias": "person_id", + "column": "pd.person_id" + }, + { + "type": "simple_column", + "alias": "ccc_number", + "column": "fi.ccc" + }, + { + "type": "simple_column", + "alias": "ovcid_id", + "column": "fi.ovcid" + }, + { + "type": "simple_column", + "alias": "upi_number", + "column": "fi.nupi" + }, + { + "type": "simple_column", + "alias": "age", + "column": "pd.age" + }, + { + "type": "simple_column", + "alias": "location_id", + "column": "pd.location_id" + }, + { + "type": "simple_column", + "alias": "location", + "column": "l.name" + }, + { + "type": "simple_column", + "alias": "location_uuid", + "column": "l.uuid" + }, + { + "type": "simple_column", + "alias": "population_type", + "column": "pd.population_type" + }, + { + "type": "derived_column", + "alias": "month", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "DATE_FORMAT(pd.endDate,'%Y-%m')" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_15_19_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_15_19_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_20_24_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_20_24_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_25_29_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_25_29_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_30_34_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_30_34_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_35_39_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_35_39_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_40_44_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_40_44_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_45_49_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_45_49_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_50_54_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_50_54_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_55_59_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_55_59_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_60_64_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_60_64_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_above_65_male", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 AND pd.gender = 'M' AND (pd.age >= 65)), 1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "edp_mhr_above_65_female", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.person_id is not null), -1, NULL)" + } + }, + { + "type": "derived_column", + "alias": "total_edp_mhr", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.is_event_driven_prep = 1 ), 1, NULL)" + } + } + ], + "filters": { + "conditionJoinOperator": "and", + "conditions": [ + { + "filterType": "tableColumns", + "conditionExpression": "pd.location_id in (?)", + "parameterName": "locations" + }, + { + "filterType": "tableColumns", + "conditionExpression": "pd.endDate = ?", + "parameterName": "endDate" + } + ] + }, + "groupBy": { + "groupParam": "groupByParam", + "columns": ["person_id"] + } +} diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-aggregate.json index 4e8307f5e..36f386b4b 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-aggregate.json @@ -1081,6 +1081,11 @@ "type": "simple_column", "alias": "total_i_pbfw", "column": "sum(b.total_i_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_initiated_on_prep_this_month", + "column": "sum(b.total_initiated_on_prep_this_month)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-base.json index bd83d97e7..b0880c767 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-prep-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/new/new-for-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" }, { @@ -642,7 +642,7 @@ "alias": "i_mahr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -658,7 +658,7 @@ "alias": "i_mahr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -674,7 +674,7 @@ "alias": "i_mahr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -690,7 +690,7 @@ "alias": "i_mahr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -706,7 +706,7 @@ "alias": "i_mahr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -722,7 +722,7 @@ "alias": "i_mahr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -738,7 +738,7 @@ "alias": "i_mahr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -754,7 +754,7 @@ "alias": "i_mahr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -770,7 +770,7 @@ "alias": "i_mahr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -786,7 +786,7 @@ "alias": "i_mahr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -802,7 +802,7 @@ "alias": "i_mahr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age >= 65)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age >= 65)), 1, NULL)" } }, { @@ -818,7 +818,7 @@ "alias": "total_i_mahr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4)), 1, NULL)" + "expression": "if((pd.enrolled_in_prep_this_month = 1 AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1741,6 +1741,14 @@ "expression": "if((pd.enrolled_in_prep_this_month = 1 AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_initiated_on_prep_this_month", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.enrolled_in_prep_this_month = 1), 1, NULL)" + } + }, { "type": "derived_column", "alias": "month", diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-aggregate.json index 53fd65dbe..c8ea35160 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_dd_pbfw", "column": "sum(b.total_dd_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_gbv", + "column": "sum(b.total_reason_for_initiation_gbv)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-base.json index 22923f267..b13b7a369 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/gbv-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -645,7 +645,7 @@ "alias": "dd_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -661,7 +661,7 @@ "alias": "dd_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -677,7 +677,7 @@ "alias": "dd_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -693,7 +693,7 @@ "alias": "dd_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -709,7 +709,7 @@ "alias": "dd_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -725,7 +725,7 @@ "alias": "dd_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -741,7 +741,7 @@ "alias": "dd_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -757,7 +757,7 @@ "alias": "dd_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -773,7 +773,7 @@ "alias": "dd_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -789,7 +789,7 @@ "alias": "dd_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -805,7 +805,7 @@ "alias": "dd_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -821,7 +821,7 @@ "alias": "total_dd_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type=4 OR pd.old_population_type=300)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9761' AND (pd.population_type=4 OR pd.old_population_type=300 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1743,6 +1743,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '9761' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_gbv", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '9761'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-aggregate.json index 2bed2344f..787310a6d 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_hh_pbfw", "column": "sum(b.total_hh_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_inconsistent_condom_use", + "column": "sum(b.total_reason_for_initiation_inconsistent_condom_use)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-base.json index feeb8e98d..a699b9875 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/inconsistent-or-no-condom-use-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -645,7 +645,7 @@ "alias": "hh_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -661,7 +661,7 @@ "alias": "hh_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -677,7 +677,7 @@ "alias": "hh_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -693,7 +693,7 @@ "alias": "hh_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -709,7 +709,7 @@ "alias": "hh_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -725,7 +725,7 @@ "alias": "hh_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -741,7 +741,7 @@ "alias": "hh_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -757,7 +757,7 @@ "alias": "hh_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -773,7 +773,7 @@ "alias": "hh_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -789,7 +789,7 @@ "alias": "hh_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -805,7 +805,7 @@ "alias": "hh_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -821,7 +821,7 @@ "alias": "total_hh_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type=4 OR pd.old_population_type=300)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7104' AND (pd.population_type=4 OR pd.old_population_type=300 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1743,6 +1743,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '7104' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_inconsistent_condom_use", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '9761'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-aggregate.json index e9acbf6c9..3101704f3 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_jj_pbfw", "column": "sum(b.total_jj_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_other_reasons", + "column": "sum(b.total_reason_for_initiation_other_reasons)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-base.json index 9ce4faf5e..b7016c5af 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/other-reasons-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -645,7 +645,7 @@ "alias": "jj_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -661,7 +661,7 @@ "alias": "jj_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -677,7 +677,7 @@ "alias": "jj_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -693,7 +693,7 @@ "alias": "jj_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -709,7 +709,7 @@ "alias": "jj_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -725,7 +725,7 @@ "alias": "jj_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -741,7 +741,7 @@ "alias": "jj_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -757,7 +757,7 @@ "alias": "jj_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -773,7 +773,7 @@ "alias": "jj_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -789,7 +789,7 @@ "alias": "jj_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -805,7 +805,7 @@ "alias": "jj_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -821,7 +821,7 @@ "alias": "total_jj_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type=4 OR pd.old_population_type=300)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '5622' AND (pd.population_type=4 OR pd.old_population_type=300 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1743,6 +1743,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '5622' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_other_reasons", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '5622'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-aggregate.json index d1d7933c1..067a17880 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-aggregate.json @@ -382,6 +382,11 @@ "alias": "aa_pbfw_above_65_female", "column": "sum(b.aa_pbfw_above_65_female)" }, + { + "type": "simple_column", + "alias": "total_initiated_prep_partner_positive", + "column": "sum(b.total_initiated_prep_partner_positive)" + }, { "type": "simple_column", "alias": "total_aa_pbfw", @@ -1422,6 +1427,11 @@ "alias": "total_bb_pbfw", "column": "sum(b.total_bb_pbfw)" }, + { + "type": "simple_column", + "alias": "total_initiated_prep_partner_high_risk", + "column": "sum(b.total_initiated_prep_partner_high_risk)" + }, { "type": "simple_column", "alias": "cc_tg_15_19_male", @@ -2456,6 +2466,11 @@ "type": "simple_column", "alias": "total_cc_pbfw", "column": "sum(b.total_cc_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_initiated_prep_multiple_sex_partners", + "column": "sum(b.total_initiated_prep_multiple_sex_partners)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-base.json index f5f66a2c1..b40301dfe 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/prep-reasons-for-initiation-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -640,6 +640,14 @@ "expression": "if((pd.reason_for_initiation = '5566' AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_initiated_prep_partner_positive", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '5566' AND (pd.population_type = 9 OR pd.old_population_type = 100 OR pd.population_type = 8) ), 1, NULL)" + } + }, { "type": "derived_column", "alias": "bb_tg_15_19_male", @@ -1197,7 +1205,7 @@ "alias": "bb_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -1213,7 +1221,7 @@ "alias": "bb_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -1229,7 +1237,7 @@ "alias": "bb_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -1245,7 +1253,7 @@ "alias": "bb_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -1261,7 +1269,7 @@ "alias": "bb_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -1277,7 +1285,7 @@ "alias": "bb_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -1293,7 +1301,7 @@ "alias": "bb_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -1309,7 +1317,7 @@ "alias": "bb_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -1325,7 +1333,7 @@ "alias": "bb_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -1341,7 +1349,7 @@ "alias": "bb_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -1357,7 +1365,7 @@ "alias": "bb_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -1373,7 +1381,7 @@ "alias": "total_bb_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M'), 1, NULL)" } }, { @@ -1925,7 +1933,7 @@ "alias": "total_bb_ow", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 7)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9762' AND (pd.old_population_type = 300 OR pd.population_type = 7) AND pd.gender = 'F'), 1, NULL)" } }, { @@ -2296,6 +2304,14 @@ "expression": "if((pd.reason_for_initiation = '9762' AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_initiated_prep_partner_high_risk", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '9762'), 1, NULL)" + } + }, { "type": "derived_column", "alias": "cc_tg_15_19_male", @@ -2853,7 +2869,7 @@ "alias": "cc_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -2869,7 +2885,7 @@ "alias": "cc_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -2885,7 +2901,7 @@ "alias": "cc_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -2901,7 +2917,7 @@ "alias": "cc_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -2917,7 +2933,7 @@ "alias": "cc_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -2933,7 +2949,7 @@ "alias": "cc_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -2949,7 +2965,7 @@ "alias": "cc_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -2965,7 +2981,7 @@ "alias": "cc_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -2981,7 +2997,7 @@ "alias": "cc_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -2997,7 +3013,7 @@ "alias": "cc_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -3013,7 +3029,7 @@ "alias": "cc_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -3029,7 +3045,7 @@ "alias": "total_cc_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '7903' AND (pd.old_population_type = 300 OR pd.population_type = 4 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -3951,6 +3967,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '7903' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_initiated_prep_multiple_sex_partners", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '7903'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-aggregate.json index 6a8626852..754cefb0d 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_ff_pbfw", "column": "sum(b.total_ff_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_recent_sti", + "column": "sum(b.total_reason_for_initiation_recent_sti)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-base.json index ef539e605..49fe3ed3a 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recent-sti-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -645,7 +645,7 @@ "alias": "ff_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -661,7 +661,7 @@ "alias": "ff_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -677,7 +677,7 @@ "alias": "ff_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -693,7 +693,7 @@ "alias": "ff_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -709,7 +709,7 @@ "alias": "ff_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -725,7 +725,7 @@ "alias": "ff_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -741,7 +741,7 @@ "alias": "ff_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -757,7 +757,7 @@ "alias": "ff_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -773,7 +773,7 @@ "alias": "ff_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -789,7 +789,7 @@ "alias": "ff_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -805,7 +805,7 @@ "alias": "ff_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -821,7 +821,7 @@ "alias": "total_ff_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type=4 OR pd.old_population_type=300)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '174' AND (pd.population_type=4 OR pd.old_population_type=300 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1743,6 +1743,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '174' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_recent_sti", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '174'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-aggregate.json index ee59e2d23..57e131cdc 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_gg_pbfw", "column": "sum(b.total_gg_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_recurrent_pep", + "column": "sum(b.total_reason_for_initiation_recurrent_pep)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-base.json index 41ec7fec2..562e3303e 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/recurrent-use-of-pep-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { @@ -645,7 +645,7 @@ "alias": "gg_mhr_15_19_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 15 AND 19)), 1, NULL)" } }, { @@ -661,7 +661,7 @@ "alias": "gg_mhr_20_24_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 20 AND 24)), 1, NULL)" } }, { @@ -677,7 +677,7 @@ "alias": "gg_mhr_25_29_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 25 AND 29)), 1, NULL)" } }, { @@ -693,7 +693,7 @@ "alias": "gg_mhr_30_34_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 30 AND 34)), 1, NULL)" } }, { @@ -709,7 +709,7 @@ "alias": "gg_mhr_35_39_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 35 AND 39)), 1, NULL)" } }, { @@ -725,7 +725,7 @@ "alias": "gg_mhr_40_44_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 40 AND 44)), 1, NULL)" } }, { @@ -741,7 +741,7 @@ "alias": "gg_mhr_45_49_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 45 AND 49)), 1, NULL)" } }, { @@ -757,7 +757,7 @@ "alias": "gg_mhr_50_54_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 50 AND 54)), 1, NULL)" } }, { @@ -773,7 +773,7 @@ "alias": "gg_mhr_55_59_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 55 AND 59)), 1, NULL)" } }, { @@ -789,7 +789,7 @@ "alias": "gg_mhr_60_64_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age between 60 AND 64)), 1, NULL)" } }, { @@ -805,7 +805,7 @@ "alias": "gg_mhr_above_65_male", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 ) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type = 4 OR pd.old_population_type = 300 OR pd.is_event_driven_prep = 1) AND pd.gender = 'M' AND (pd.age > 65)), 1, NULL)" } }, { @@ -821,7 +821,7 @@ "alias": "total_gg_mhr", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type=4 OR pd.old_population_type=300)), 1, NULL)" + "expression": "if((pd.reason_for_initiation = '9764' AND (pd.population_type=4 OR pd.old_population_type=300 OR pd.is_event_driven_prep = 1)), 1, NULL)" } }, { @@ -1743,6 +1743,14 @@ "expressionOptions": { "expression": "if((pd.reason_for_initiation = '9764' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_recurrent_pep", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '9764'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/shared-needles-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/shared-needles-base.json index 09d65b5bc..d7268a4bd 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/shared-needles-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/shared-needles-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-aggregate.json index 2abd90e5a..c53e87670 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-aggregate.json @@ -1076,6 +1076,11 @@ "type": "simple_column", "alias": "total_ee_pbfw", "column": "sum(b.total_ee_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_reason_for_initiation_transactional_sex", + "column": "sum(b.total_reason_for_initiation_transactional_sex)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-base.json index dbb1318e2..0d1273f24 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/reasons_for_initiation/transactional-sex-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.reason_for_initiation = '9763' AND pd.population_type = 9), 1, NULL)" } + }, + { + "type": "derived_column", + "alias": "total_reason_for_initiation_transactional_sex", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.reason_for_initiation = '9763'), 1, NULL)" + } } ], "filters": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-aggregate.json index 3465d8ffc..e8c7187ca 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-aggregate.json @@ -1081,6 +1081,11 @@ "type": "simple_column", "alias": "total_re_pbfw", "column": "sum(b.total_re_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_restarting_prep_this_month", + "column": "sum(b.total_restarting_prep_this_month)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-base.json index 016a3e70a..5175f50cb 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-prep-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/restarting/restarting-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" }, { @@ -1741,6 +1741,14 @@ "expression": "if((pd.restarting_prep_this_month = 1 AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_restarting_prep_this_month", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.restarting_prep_this_month = 1), 1, NULL)" + } + }, { "type": "derived_column", "alias": "month", diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/template-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/template-base.json index 2bd456529..919e63283 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/template-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/template-base.json @@ -6,7 +6,7 @@ "uses": [], "sources": [ { - "table": "etl.prep_monthly_report_dataset_v3", + "table": "etl.prep_monthly_report_dataset_v5", "alias": "pd" }, { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-aggregate.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-aggregate.json index b6733980d..f19a18f7b 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-aggregate.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-aggregate.json @@ -1087,6 +1087,11 @@ "alias": "total_tp_pbfw", "column": "sum(b.total_tp_pbfw)" }, + { + "type": "simple_column", + "alias": "total_tested_positive_on_prep", + "column": "sum(b.total_tested_positive_on_prep)" + }, { "type": "simple_column", "alias": "d_tg_15_19_female", @@ -2121,6 +2126,11 @@ "type": "simple_column", "alias": "total_d_pbfw", "column": "sum(b.total_d_pbfw)" + }, + { + "type": "simple_column", + "alias": "total_diagnosed_with_sti_on_prep", + "column": "sum(b.total_diagnosed_with_sti_on_prep)" } ], "groupBy": { diff --git a/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-base.json b/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-base.json index f4d6657b0..24d28aae3 100644 --- a/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-prep-base.json +++ b/app/reporting-framework/json-reports/prep-monthly/disaggregations/while-on-prep/while-on-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" }, { @@ -1746,6 +1746,14 @@ "expression": "if((pd.turned_positive_this_month = 1 AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_tested_positive_on_prep", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.turned_positive_this_month = 1), 1, NULL)" + } + }, { "type": "derived_column", "alias": "d_tg_15_19_male", @@ -2663,7 +2671,7 @@ "alias": "total_d_fsw", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((pd.is_eligible_for_prep = 1 AND (pd.population_type = 5 OR pd.sub_population_type = 30)), 1, NULL)" + "expression": "if((pd.diagnosed_with_sti = 1 AND (pd.population_type = 5 OR pd.sub_population_type = 30)), 1, NULL)" } }, { @@ -3402,6 +3410,14 @@ "expression": "if((pd.diagnosed_with_sti = 1 AND pd.population_type = 9), 1, NULL)" } }, + { + "type": "derived_column", + "alias": "total_diagnosed_with_sti_on_prep", + "expressionType": "simple_expression", + "expressionOptions": { + "expression": "if((pd.diagnosed_with_sti = 1), 1, NULL)" + } + }, { "type": "derived_column", "alias": "month", diff --git a/app/reporting-framework/json-reports/prep-monthly/prep-monthly-sections-indicators.json b/app/reporting-framework/json-reports/prep-monthly/prep-monthly-sections-indicators.json index 8627e52ab..048fcff74 100644 --- a/app/reporting-framework/json-reports/prep-monthly/prep-monthly-sections-indicators.json +++ b/app/reporting-framework/json-reports/prep-monthly/prep-monthly-sections-indicators.json @@ -936,6 +936,103 @@ "indicator": "total_i_pbfw" } ] + }, + { + "label": "Total Number clients initiated on PrEP", + "indicators": [ + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "Total Number of clients initiated on PrEP", + "indicator": "total_initiated_on_prep_this_month" + } + ] } ] }, @@ -1814,6 +1911,205 @@ "indicator": "total_re_pbfw" } ] + }, + { + "label": "Total Number clients restarting on PrEP", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number of clients restarting PrEP", + "indicator": "total_restarting_prep_this_month" + } + ] + } + ] + }, + { + "sectionTitle": "No. of clients initiated on event driven prep", + "indicators": [ + { + "label": "Men at high risk", + "indicators": [ + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 15 and 19 Male", + "indicator": "edp_mhr_15_19_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 15 and 19 Female", + "indicator": "edp_mhr_15_19_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 20 and 24 Male", + "indicator": "edp_mhr_20_24_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 20 and 24 Female", + "indicator": "edp_mhr_20_24_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 25 and 29 Male", + "indicator": "edp_mhr_25_29_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 25 and 29 Female", + "indicator": "edp_mhr_25_29_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 30 and 34 Male", + "indicator": "edp_mhr_30_34_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 30 and 34 Female", + "indicator": "edp_mhr_30_34_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 35 and 39 Male", + "indicator": "edp_mhr_35_39_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 35 and 39 Female", + "indicator": "edp_mhr_35_39_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 40 and 44 Male", + "indicator": "edp_mhr_40_44_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 40 and 44 Female", + "indicator": "edp_mhr_40_44_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 45 and 49 Male", + "indicator": "edp_mhr_45_49_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 45 and 49 Female", + "indicator": "edp_mhr_45_49_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 50 and 54 Male", + "indicator": "edp_mhr_50_54_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 50 and 54 Female", + "indicator": "edp_mhr_50_54_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 55 and 59 Male", + "indicator": "edp_mhr_55_59_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 55 and 59 Female", + "indicator": "edp_mhr_55_59_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 60 and 64 Male", + "indicator": "edp_mhr_60_64_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged between 60 and 64 Female", + "indicator": "edp_mhr_60_64_female" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged above 65 Male", + "indicator": "edp_mhr_above_65_male" + }, + { + "label": "Apply to those clients who have been initiated on event driven prep aged above 65 Female", + "indicator": "edp_mhr_above_65_female" + }, + { + "label": "Total Number clients who have been initiated on event driven prep ", + "indicator": "total_edp_mhr" + } + ] } ] }, @@ -2692,21 +2988,118 @@ "indicator": "total_tp_pbfw" } ] - } - ] - }, - { - "sectionTitle": "No. clients diagnosed with STIs while on PrEP", - "indicators": [ + }, { - "label": "Trans Gender (TG)", + "label": "Total Number clients tested HIV positive while on PrEP", "indicators": [ { - "label": "Male Trans Gender diagnosed with STIs while on PrEP aged between 15 and 19", - "indicator": "d_tg_15_19_male" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Female Trans Gender diagnosed with STIs while on PrEP aged between 15 and 19", + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "Total Number of clients tested HIV positive while on PrEP", + "indicator": "total_tested_positive_on_prep" + } + ] + } + ] + }, + { + "sectionTitle": "No. clients diagnosed with STIs while on PrEP", + "indicators": [ + { + "label": "Trans Gender (TG)", + "indicators": [ + { + "label": "Male Trans Gender diagnosed with STIs while on PrEP aged between 15 and 19", + "indicator": "d_tg_15_19_male" + }, + { + "label": "Female Trans Gender diagnosed with STIs while on PrEP aged between 15 and 19", "indicator": "d_tg_15_19_female" }, { @@ -3570,6 +3963,103 @@ "indicator": "total_d_pbfw" } ] + }, + { + "label": "Total Number clients diagnosed with STIs while on PrEP", + "indicators": [ + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "Total Number of clients diagnosed with STIs while on PrEP", + "indicator": "total_diagnosed_with_sti_on_prep" + } + ] } ] }, @@ -4448,69 +4938,166 @@ "indicator": "total_st_pbfw" } ] - } - ] - }, - { - "sectionTitle": "Sero- Serodiscordant Couples trying to conceive", - "indicators": [ + }, { - "label": "Serodiscordant Couple", + "label": "Total Number clients stopped/discontinued PrEP this month", "indicators": [ { - "label": "Serodiscordant Couples trying to conceive aged between 15 and 19 Male", - "indicator": "cvp_sc_15_19_male" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 15 and 19 Female", - "indicator": "cvp_sc_15_19_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 20 and 24 Male", - "indicator": "cvp_sc_20_24_male" + "label": "", + "indicator": "i_pbfw_20_24_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 20 and 24 Female", - "indicator": "cvp_sc_20_24_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 25 and 29 Male", - "indicator": "cvp_sc_25_29_male" + "label": "", + "indicator": "i_pbfw_25_29_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 25 and 29 Female", - "indicator": "cvp_sc_25_29_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 30 and 34 Male", - "indicator": "cvp_sc_30_34_male" + "label": "", + "indicator": "i_pbfw_30_34_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 30 and 34 Female", - "indicator": "cvp_sc_30_34_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 35 and 39 Male", - "indicator": "cvp_sc_35_39_male" + "label": "", + "indicator": "i_pbfw_35_39_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 35 and 39 Female", - "indicator": "cvp_sc_35_39_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 40 and 44 Male", - "indicator": "cvp_sc_40_44_male" + "label": "", + "indicator": "i_pbfw_40_44_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 40 and 44 Female", - "indicator": "cvp_sc_40_44_female" + "label": "", + "indicator": "i_pbfw_15_19_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 45 and 49 Male", - "indicator": "cvp_sc_45_49_male" + "label": "", + "indicator": "i_pbfw_45_49_male" }, { - "label": "Serodiscordant Couples trying to conceive aged between 45 and 49 Female", + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "i_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "i_pbfw_15_19_male" + }, + { + "label": "Total Number of clients stopped/discontinued PrEP this month", + "indicator": "total_discontinued_prep_this_month" + } + ] + } + ] + }, + { + "sectionTitle": "Sero- Serodiscordant Couples trying to conceive", + "indicators": [ + { + "label": "Serodiscordant Couple", + "indicators": [ + { + "label": "Serodiscordant Couples trying to conceive aged between 15 and 19 Male", + "indicator": "cvp_sc_15_19_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 15 and 19 Female", + "indicator": "cvp_sc_15_19_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 20 and 24 Male", + "indicator": "cvp_sc_20_24_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 20 and 24 Female", + "indicator": "cvp_sc_20_24_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 25 and 29 Male", + "indicator": "cvp_sc_25_29_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 25 and 29 Female", + "indicator": "cvp_sc_25_29_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 30 and 34 Male", + "indicator": "cvp_sc_30_34_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 30 and 34 Female", + "indicator": "cvp_sc_30_34_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 35 and 39 Male", + "indicator": "cvp_sc_35_39_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 35 and 39 Female", + "indicator": "cvp_sc_35_39_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 40 and 44 Male", + "indicator": "cvp_sc_40_44_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 40 and 44 Female", + "indicator": "cvp_sc_40_44_female" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 45 and 49 Male", + "indicator": "cvp_sc_45_49_male" + }, + { + "label": "Serodiscordant Couples trying to conceive aged between 45 and 49 Female", "indicator": "cvp_sc_45_49_female" }, { @@ -4749,6 +5336,103 @@ "indicator": "total_aa_pbfw" } ] + }, + { + "label": "Total Number clients Partner+ve", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Partner+ve (not on art, art_last 6mnt, Poor Viral suppression)", + "indicator": "total_initiated_prep_partner_positive" + } + ] } ] }, @@ -4759,95 +5443,95 @@ "label": "Trans Gender (TG)", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 male", "indicator": "bb_tg_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_tg_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_tg_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_tg_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_tg_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_tg_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_tg_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_tg_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_tg_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_tg_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_tg_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_tg_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_tg_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_tg_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_tg_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_tg_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_tg_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_tg_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_tg_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_tg_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_tg_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_tg_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_tg" } ] @@ -4856,95 +5540,95 @@ "label": "AGYW", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_agyw_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_agyw_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_agyw_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_agyw_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_agyw_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_agyw_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_agyw_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_agyw_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_agyw_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_agyw_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_agyw_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_agyw_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_agyw_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_agyw_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_agyw_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_agyw_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_agyw_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_agyw_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_agyw_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_agyw_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_agyw_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_agyw_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_agyw" } ] @@ -4953,95 +5637,95 @@ "label": "MSM", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_msm_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_msm_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_msm_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_msm_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_msm_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_msm_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_msm_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_msm_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_msm_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_msm_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_msm_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_msm_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_msm_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_msm_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_msm_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_msm_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_msm_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_msm_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_msm_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_msm_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_msm_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_msm_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_msm" } ] @@ -5050,95 +5734,95 @@ "label": "Men at high risk", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_mhr_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_mhr_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_mhr_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_mhr_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_mhr_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_mhr_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_mhr_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_mhr_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_mhr_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_mhr_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_mhr_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_mhr_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_mhr_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_mhr_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_mhr_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_mhr_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_mhr_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_mhr_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_mhr_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_mhr_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_mhr_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_mhr_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_mhr" } ] @@ -5147,95 +5831,95 @@ "label": "FSW", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_fsw_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_fsw_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_fsw_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_fsw_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_fsw_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_fsw_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_fsw_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_fsw_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_fsw_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_fsw_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_fsw_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_fsw_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_fsw_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_fsw_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_fsw_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_fsw_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_fsw_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_fsw_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_fsw_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_fsw_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_fsw_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_fsw_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_fsw" } ] @@ -5244,95 +5928,95 @@ "label": "PWID", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_pwid_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_pwid_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_pwid_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_pwid_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_pwid_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_pwid_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_pwid_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_pwid_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_pwid_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_pwid_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_pwid_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_pwid_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_pwid_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_pwid_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_pwid_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_pwid_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_pwid_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_pwid_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_pwid_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_pwid_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_pwid_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_pwid_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_pwid" } ] @@ -5341,95 +6025,95 @@ "label": "Other Women", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_ow_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_ow_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_ow_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_ow_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_ow_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_ow_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_ow_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_ow_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_ow_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_ow_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_ow_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_ow_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_ow_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_ow_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_ow_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_ow_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_ow_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_ow_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_ow_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_ow_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_ow_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_ow_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_ow" } ] @@ -5438,95 +6122,95 @@ "label": "Serodiscordant Couple", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_sc_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_sc_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_sc_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_sc_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_sc_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_sc_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_sc_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_sc_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_sc_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_sc_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_sc_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_sc_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_sc_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_sc_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_sc_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_sc_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_sc_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_sc_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_sc_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_sc_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_sc_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_sc_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_sc" } ] @@ -5535,98 +6219,195 @@ "label": "PBFW", "indicators": [ { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Male", "indicator": "bb_pbfw_15_19_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 15 and 19 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 15 and 19 Female", "indicator": "bb_pbfw_15_19_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Male", "indicator": "bb_pbfw_20_24_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 20 and 24 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 20 and 24 Female", "indicator": "bb_pbfw_20_24_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Male", "indicator": "bb_pbfw_25_29_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 25 and 29 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 25 and 29 Female", "indicator": "bb_pbfw_25_29_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Male", "indicator": "bb_pbfw_30_34_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 30 and 34 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 30 and 34 Female", "indicator": "bb_pbfw_30_34_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Male", "indicator": "bb_pbfw_35_39_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 35 and 39 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 35 and 39 Female", "indicator": "bb_pbfw_35_39_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Male", "indicator": "bb_pbfw_40_44_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 40 and 44 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 40 and 44 Female", "indicator": "bb_pbfw_40_44_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Male", "indicator": "bb_pbfw_45_49_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 45 and 49 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 45 and 49 Female", "indicator": "bb_pbfw_45_49_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Male", "indicator": "bb_pbfw_50_54_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 50 and 54 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 50 and 54 Female", "indicator": "bb_pbfw_50_54_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Male", "indicator": "bb_pbfw_55_59_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 55 and 59 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 55 and 59 Female", "indicator": "bb_pbfw_55_59_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Male", "indicator": "bb_pbfw_60_64_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged between 60 and 64 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged between 60 and 64 Female", "indicator": "bb_pbfw_60_64_female" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Male", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Male", "indicator": "bb_pbfw_above_65_male" }, { - "label": "Apply to those started due to their sexual partners HIV discordance status aged above 65 Female", + "label": "Apply to those started due to their suspicion of their sexual partner's HIV status aged above 65 Female", "indicator": "bb_pbfw_above_65_female" }, { - "label": "Total Number of those started due to their sexual partners HIV discordance status ", + "label": "Total Number of those started due to their suspicion of their sexual partner's HIV status ", "indicator": "total_bb_pbfw" } ] + }, + { + "label": "Total Number clients Sex partner(s) high risk", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients partner(s) high risk", + "indicator": "total_initiated_prep_partner_high_risk" + } + ] } ] }, @@ -6505,6 +7286,103 @@ "indicator": "total_cc_pbfw" } ] + }, + { + "label": "Total Number clients with more than one partner", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients with more than one partner", + "indicator": "total_initiated_prep_multiple_sex_partners" + } + ] } ] }, @@ -7315,72 +8193,169 @@ "indicator": "dd_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 30 and 34 Male", - "indicator": "dd_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 30 and 34 Male", + "indicator": "dd_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 30 and 34 Female", + "indicator": "dd_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 35 and 39 Male", + "indicator": "dd_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 35 and 39 Female", + "indicator": "dd_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 40 and 44 Male", + "indicator": "dd_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 40 and 44 Female", + "indicator": "dd_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 45 and 49 Male", + "indicator": "dd_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 45 and 49 Female", + "indicator": "dd_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 50 and 54 Male", + "indicator": "dd_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 50 and 54 Female", + "indicator": "dd_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 55 and 59 Male", + "indicator": "dd_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 55 and 59 Female", + "indicator": "dd_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 60 and 64 Male", + "indicator": "dd_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 60 and 64 Female", + "indicator": "dd_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged above 65 Male", + "indicator": "dd_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged above 65 Female", + "indicator": "dd_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for starting PrEP is on going IPV/GBV ", + "indicator": "total_dd_pbfw" + } + ] + }, + { + "label": "Total Number clients ongoing IPV/GBV", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 30 and 34 Female", - "indicator": "dd_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 35 and 39 Male", - "indicator": "dd_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 35 and 39 Female", - "indicator": "dd_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 40 and 44 Male", - "indicator": "dd_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 40 and 44 Female", - "indicator": "dd_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 45 and 49 Male", - "indicator": "dd_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 45 and 49 Female", - "indicator": "dd_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 50 and 54 Male", - "indicator": "dd_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 50 and 54 Female", - "indicator": "dd_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 55 and 59 Male", - "indicator": "dd_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 55 and 59 Female", - "indicator": "dd_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 60 and 64 Male", - "indicator": "dd_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged between 60 and 64 Female", - "indicator": "dd_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged above 65 Male", - "indicator": "dd_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is on going IPV/GBV aged above 65 Female", - "indicator": "dd_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for starting PrEP is on going IPV/GBV ", - "indicator": "total_dd_pbfw" + "label": "Total Number clients ongoing IPV/GBV", + "indicator": "total_reason_for_initiation_gbv" } ] } @@ -8261,6 +9236,103 @@ "indicator": "total_ee_pbfw" } ] + }, + { + "label": "Total Number clients engaging in transactional sex", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total number clients engaging in transactional sex", + "indicator": "total_reason_for_initiation_transactional_sex" + } + ] } ] }, @@ -9071,79 +10143,176 @@ "indicator": "ff_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 30 and 34 Male", - "indicator": "ff_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 30 and 34 Male", + "indicator": "ff_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 30 and 34 Female", + "indicator": "ff_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 35 and 39 Male", + "indicator": "ff_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 35 and 39 Female", + "indicator": "ff_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 40 and 44 Male", + "indicator": "ff_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 40 and 44 Female", + "indicator": "ff_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 45 and 49 Male", + "indicator": "ff_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 45 and 49 Female", + "indicator": "ff_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 50 and 54 Male", + "indicator": "ff_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 50 and 54 Female", + "indicator": "ff_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 55 and 59 Male", + "indicator": "ff_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 55 and 59 Female", + "indicator": "ff_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 60 and 64 Male", + "indicator": "ff_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 60 and 64 Female", + "indicator": "ff_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged above 65 Male", + "indicator": "ff_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged above 65 Female", + "indicator": "ff_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for starting PrEP is recent STI in the last six months ", + "indicator": "total_ff_pbfw" + } + ] + }, + { + "label": "Total Number clients Recent STI", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 30 and 34 Female", - "indicator": "ff_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 35 and 39 Male", - "indicator": "ff_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 35 and 39 Female", - "indicator": "ff_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 40 and 44 Male", - "indicator": "ff_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 40 and 44 Female", - "indicator": "ff_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 45 and 49 Male", - "indicator": "ff_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 45 and 49 Female", - "indicator": "ff_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 50 and 54 Male", - "indicator": "ff_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 50 and 54 Female", - "indicator": "ff_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 55 and 59 Male", - "indicator": "ff_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 55 and 59 Female", - "indicator": "ff_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 60 and 64 Male", - "indicator": "ff_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged between 60 and 64 Female", - "indicator": "ff_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged above 65 Male", - "indicator": "ff_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is recent STI in the last six months aged above 65 Female", - "indicator": "ff_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for starting PrEP is recent STI in the last six months ", - "indicator": "total_ff_pbfw" + "label": "Total number clients Recent STI", + "indicator": "total_reason_for_initiation_recent_sti" } ] } ] }, { - "sectionTitle": "Recussent use of PEP", + "sectionTitle": "Recurrent use of PEP", "indicators": [ { "label": "TG", @@ -10017,6 +11186,103 @@ "indicator": "total_gg_pbfw" } ] + }, + { + "label": "Total Number clients Recurrent use of PEP", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total number clients Recurrent use of PEP", + "indicator": "total_reason_for_initiation_recurrent_pep" + } + ] } ] }, @@ -10827,79 +12093,176 @@ "indicator": "hh_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 30 and 34 Male", - "indicator": "hh_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 30 and 34 Male", + "indicator": "hh_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 30 and 34 Female", + "indicator": "hh_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 35 and 39 Male", + "indicator": "hh_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 35 and 39 Female", + "indicator": "hh_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 40 and 44 Male", + "indicator": "hh_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 40 and 44 Female", + "indicator": "hh_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 45 and 49 Male", + "indicator": "hh_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 45 and 49 Female", + "indicator": "hh_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 50 and 54 Male", + "indicator": "hh_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 50 and 54 Female", + "indicator": "hh_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 55 and 59 Male", + "indicator": "hh_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 55 and 59 Female", + "indicator": "hh_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 60 and 64 Male", + "indicator": "hh_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 60 and 64 Female", + "indicator": "hh_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged above 65 Male", + "indicator": "hh_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged above 65 Female", + "indicator": "hh_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse ", + "indicator": "total_hh_pbfw" + } + ] + }, + { + "label": "Total Number clients inconsistent condom use", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 30 and 34 Female", - "indicator": "hh_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 35 and 39 Male", - "indicator": "hh_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 35 and 39 Female", - "indicator": "hh_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 40 and 44 Male", - "indicator": "hh_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 40 and 44 Female", - "indicator": "hh_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 45 and 49 Male", - "indicator": "hh_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 45 and 49 Female", - "indicator": "hh_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 50 and 54 Male", - "indicator": "hh_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 50 and 54 Female", - "indicator": "hh_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 55 and 59 Male", - "indicator": "hh_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 55 and 59 Female", - "indicator": "hh_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 60 and 64 Male", - "indicator": "hh_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged between 60 and 64 Female", - "indicator": "hh_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged above 65 Male", - "indicator": "hh_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse aged above 65 Female", - "indicator": "hh_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for starting PrEP is inconsistent or no condom use during intercourse ", - "indicator": "total_hh_pbfw" + "label": "Total Number clients inconsistent condom use", + "indicator": "total_reason_for_initiation_inconsistent_condom_use" } ] } ] }, { - "sectionTitle": "Other Reasons", + "sectionTitle": "Starting PrEP for Other Reasons", "indicators": [ { "label": "TG", @@ -11773,6 +13136,103 @@ "indicator": "total_jj_pbfw" } ] + }, + { + "label": "Total Number clients Starting PrEP for Other Reasons", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Starting PrEP for Other Reasons", + "indicator": "total_reason_for_initiation_other_reasons" + } + ] } ] }, @@ -12685,72 +14145,169 @@ "indicator": "ll_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 30 and 34 Male", - "indicator": "ll_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 30 and 34 Male", + "indicator": "ll_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 30 and 34 Female", + "indicator": "ll_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 35 and 39 Male", + "indicator": "ll_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 35 and 39 Female", + "indicator": "ll_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 40 and 44 Male", + "indicator": "ll_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 40 and 44 Female", + "indicator": "ll_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 45 and 49 Male", + "indicator": "ll_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 45 and 49 Female", + "indicator": "ll_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 50 and 54 Male", + "indicator": "ll_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 50 and 54 Female", + "indicator": "ll_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 55 and 59 Male", + "indicator": "ll_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 55 and 59 Female", + "indicator": "ll_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 60 and 64 Male", + "indicator": "ll_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 60 and 64 Female", + "indicator": "ll_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged above 65 Male", + "indicator": "ll_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged above 65 Female", + "indicator": "ll_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for discontinuing PrEP is testing HIV positive while on prep ", + "indicator": "total_ll_pbfw" + } + ] + }, + { + "label": "Total Number clients HIV test is positive", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 30 and 34 Female", - "indicator": "ll_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 35 and 39 Male", - "indicator": "ll_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 35 and 39 Female", - "indicator": "ll_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 40 and 44 Male", - "indicator": "ll_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 40 and 44 Female", - "indicator": "ll_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 45 and 49 Male", - "indicator": "ll_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 45 and 49 Female", - "indicator": "ll_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 50 and 54 Male", - "indicator": "ll_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 50 and 54 Female", - "indicator": "ll_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 55 and 59 Male", - "indicator": "ll_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 55 and 59 Female", - "indicator": "ll_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 60 and 64 Male", - "indicator": "ll_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged between 60 and 64 Female", - "indicator": "ll_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged above 65 Male", - "indicator": "ll_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is testing HIV positive while on prep aged above 65 Female", - "indicator": "ll_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for discontinuing PrEP is testing HIV positive while on prep ", - "indicator": "total_ll_pbfw" + "label": "Total Number clients HIV test is positive", + "indicator": "total_reason_for_discontinuation_tested_positive" } ] } @@ -13631,6 +15188,103 @@ "indicator": "total_mm_pbfw" } ] + }, + { + "label": "Total Number clients Low risk of HIV", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Low risk of HIV", + "indicator": "total_reason_for_discontinuation_low_risk" + } + ] } ] }, @@ -14441,72 +16095,169 @@ "indicator": "nn_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 30 and 34 Male", - "indicator": "nn_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 30 and 34 Male", + "indicator": "nn_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 30 and 34 Female", + "indicator": "nn_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 35 and 39 Male", + "indicator": "nn_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 35 and 39 Female", + "indicator": "nn_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 40 and 44 Male", + "indicator": "nn_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 40 and 44 Female", + "indicator": "nn_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 45 and 49 Male", + "indicator": "nn_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 45 and 49 Female", + "indicator": "nn_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 50 and 54 Male", + "indicator": "nn_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 50 and 54 Female", + "indicator": "nn_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 55 and 59 Male", + "indicator": "nn_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 55 and 59 Female", + "indicator": "nn_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 60 and 64 Male", + "indicator": "nn_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 60 and 64 Female", + "indicator": "nn_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged above 65 Male", + "indicator": "nn_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged above 65 Female", + "indicator": "nn_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP ", + "indicator": "total_nn_pbfw" + } + ] + }, + { + "label": "Total Number clients PrEP drugs side effects", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 30 and 34 Female", - "indicator": "nn_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 35 and 39 Male", - "indicator": "nn_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 35 and 39 Female", - "indicator": "nn_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 40 and 44 Male", - "indicator": "nn_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 40 and 44 Female", - "indicator": "nn_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 45 and 49 Male", - "indicator": "nn_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 45 and 49 Female", - "indicator": "nn_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 50 and 54 Male", - "indicator": "nn_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 50 and 54 Female", - "indicator": "nn_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 55 and 59 Male", - "indicator": "nn_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 55 and 59 Female", - "indicator": "nn_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 60 and 64 Male", - "indicator": "nn_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged between 60 and 64 Female", - "indicator": "nn_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged above 65 Male", - "indicator": "nn_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP aged above 65 Female", - "indicator": "nn_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for discontinuing PrEP is side effects as a result of using PrEP ", - "indicator": "total_nn_pbfw" + "label": "Total Number clients PrEP drugs side effects", + "indicator": "total_reason_for_discontinuation_side_effects" } ] } @@ -15387,6 +17138,103 @@ "indicator": "total_pp_pbfw" } ] + }, + { + "label": "Total Number clients Non-Adherence", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Non-Adherence", + "indicator": "total_reason_for_discontinuation_non_adherence" + } + ] } ] }, @@ -16299,72 +18147,169 @@ "indicator": "rr_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 30 and 34 Male", - "indicator": "rr_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 30 and 34 Male", + "indicator": "rr_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 30 and 34 Female", + "indicator": "rr_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 35 and 39 Male", + "indicator": "rr_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 35 and 39 Female", + "indicator": "rr_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 40 and 44 Male", + "indicator": "rr_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 40 and 44 Female", + "indicator": "rr_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 45 and 49 Male", + "indicator": "rr_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 45 and 49 Female", + "indicator": "rr_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 50 and 54 Male", + "indicator": "rr_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 50 and 54 Female", + "indicator": "rr_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 55 and 59 Male", + "indicator": "rr_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 55 and 59 Female", + "indicator": "rr_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 60 and 64 Male", + "indicator": "rr_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 60 and 64 Female", + "indicator": "rr_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged above 65 Male", + "indicator": "rr_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged above 65 Female", + "indicator": "rr_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for discontinuing PrEP is too many HIV tests ", + "indicator": "total_rr_pbfw" + } + ] + }, + { + "label": "Total Number of clients Too many HIV test", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 30 and 34 Female", - "indicator": "rr_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 35 and 39 Male", - "indicator": "rr_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 35 and 39 Female", - "indicator": "rr_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 40 and 44 Male", - "indicator": "rr_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 40 and 44 Female", - "indicator": "rr_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 45 and 49 Male", - "indicator": "rr_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 45 and 49 Female", - "indicator": "rr_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 50 and 54 Male", - "indicator": "rr_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 50 and 54 Female", - "indicator": "rr_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 55 and 59 Male", - "indicator": "rr_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 55 and 59 Female", - "indicator": "rr_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 60 and 64 Male", - "indicator": "rr_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged between 60 and 64 Female", - "indicator": "rr_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged above 65 Male", - "indicator": "rr_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is too many HIV tests aged above 65 Female", - "indicator": "rr_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for discontinuing PrEP is too many HIV tests ", - "indicator": "total_rr_pbfw" + "label": "Total Number clients Too many HIV test", + "indicator": "total_reason_for_discontinuation_many_tests" } ] } @@ -17245,6 +19190,103 @@ "indicator": "total_ss_pbfw" } ] + }, + { + "label": "Total Number of clients Partner refusal", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Partner refusal", + "indicator": "total_reason_for_discontinuation_partner_refusal" + } + ] } ] }, @@ -18055,72 +20097,169 @@ "indicator": "tt_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 30 and 34 Male", - "indicator": "tt_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 30 and 34 Male", + "indicator": "tt_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 30 and 34 Female", + "indicator": "tt_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 35 and 39 Male", + "indicator": "tt_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 35 and 39 Female", + "indicator": "tt_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 40 and 44 Male", + "indicator": "tt_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 40 and 44 Female", + "indicator": "tt_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 45 and 49 Male", + "indicator": "tt_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 45 and 49 Female", + "indicator": "tt_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 50 and 54 Male", + "indicator": "tt_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 50 and 54 Female", + "indicator": "tt_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 55 and 59 Male", + "indicator": "tt_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 55 and 59 Female", + "indicator": "tt_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 60 and 64 Male", + "indicator": "tt_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 60 and 64 Female", + "indicator": "tt_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged above 65 Male", + "indicator": "tt_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged above 65 Female", + "indicator": "tt_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for discontinuing PrEP is partner violence ", + "indicator": "total_tt_pbfw" + } + ] + }, + { + "label": "Total Number of clients Partner violence", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 30 and 34 Female", - "indicator": "tt_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 35 and 39 Male", - "indicator": "tt_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 35 and 39 Female", - "indicator": "tt_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 40 and 44 Male", - "indicator": "tt_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 40 and 44 Female", - "indicator": "tt_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 45 and 49 Male", - "indicator": "tt_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 45 and 49 Female", - "indicator": "tt_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 50 and 54 Male", - "indicator": "tt_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 50 and 54 Female", - "indicator": "tt_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 55 and 59 Male", - "indicator": "tt_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 55 and 59 Female", - "indicator": "tt_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 60 and 64 Male", - "indicator": "tt_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged between 60 and 64 Female", - "indicator": "tt_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged above 65 Male", - "indicator": "tt_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is partner violence aged above 65 Female", - "indicator": "tt_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for discontinuing PrEP is partner violence ", - "indicator": "total_tt_pbfw" + "label": "Total Number clients Partner violence", + "indicator": "total_reason_for_discontinuation_partner_violence" } ] } @@ -19001,6 +21140,103 @@ "indicator": "total_vv_pbfw" } ] + }, + { + "label": "Total Number of clients Died", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Died", + "indicator": "total_reason_for_discontinuation_died" + } + ] } ] }, @@ -19811,72 +22047,169 @@ "indicator": "ww_pbfw_25_29_female" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 30 and 34 Male", - "indicator": "ww_pbfw_30_34_male" + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 30 and 34 Male", + "indicator": "ww_pbfw_30_34_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 30 and 34 Female", + "indicator": "ww_pbfw_30_34_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 35 and 39 Male", + "indicator": "ww_pbfw_35_39_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 35 and 39 Female", + "indicator": "ww_pbfw_35_39_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 40 and 44 Male", + "indicator": "ww_pbfw_40_44_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 40 and 44 Female", + "indicator": "ww_pbfw_40_44_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 45 and 49 Male", + "indicator": "ww_pbfw_45_49_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 45 and 49 Female", + "indicator": "ww_pbfw_45_49_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 50 and 54 Male", + "indicator": "ww_pbfw_50_54_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 50 and 54 Female", + "indicator": "ww_pbfw_50_54_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 55 and 59 Male", + "indicator": "ww_pbfw_55_59_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 55 and 59 Female", + "indicator": "ww_pbfw_55_59_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 60 and 64 Male", + "indicator": "ww_pbfw_60_64_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 60 and 64 Female", + "indicator": "ww_pbfw_60_64_female" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged above 65 Male", + "indicator": "ww_pbfw_above_65_male" + }, + { + "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged above 65 Female", + "indicator": "ww_pbfw_above_65_female" + }, + { + "label": "Total Number clients whose main reason for discontinuing PrEP is transfer to other facilities ", + "indicator": "total_ww_pbfw" + } + ] + }, + { + "label": "Total Number of clients Transfer outs", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 30 and 34 Female", - "indicator": "ww_pbfw_30_34_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 35 and 39 Male", - "indicator": "ww_pbfw_35_39_male" + "label": "", + "indicator": "re_pbfw_35_39_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 35 and 39 Female", - "indicator": "ww_pbfw_35_39_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 40 and 44 Male", - "indicator": "ww_pbfw_40_44_male" + "label": "", + "indicator": "re_pbfw_40_44_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 40 and 44 Female", - "indicator": "ww_pbfw_40_44_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 45 and 49 Male", - "indicator": "ww_pbfw_45_49_male" + "label": "", + "indicator": "re_pbfw_45_49_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 45 and 49 Female", - "indicator": "ww_pbfw_45_49_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 50 and 54 Male", - "indicator": "ww_pbfw_50_54_male" + "label": "", + "indicator": "re_pbfw_50_54_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 50 and 54 Female", - "indicator": "ww_pbfw_50_54_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 55 and 59 Male", - "indicator": "ww_pbfw_55_59_male" + "label": "", + "indicator": "re_pbfw_55_59_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 55 and 59 Female", - "indicator": "ww_pbfw_55_59_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 60 and 64 Male", - "indicator": "ww_pbfw_60_64_male" + "label": "", + "indicator": "re_pbfw_60_64_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged between 60 and 64 Female", - "indicator": "ww_pbfw_60_64_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged above 65 Male", - "indicator": "ww_pbfw_above_65_male" + "label": "", + "indicator": "re_pbfw_above_65_male" }, { - "label": "Apply to those clients whose main reason for discontinuing PrEP is transfer to other facilities aged above 65 Female", - "indicator": "ww_pbfw_above_65_female" + "label": "", + "indicator": "re_pbfw_15_19_male" }, { - "label": "Total Number clients whose main reason for discontinuing PrEP is transfer to other facilities ", - "indicator": "total_ww_pbfw" + "label": "Total Number clients Transfer outs", + "indicator": "total_reason_for_discontinuation_transfer_outs" } ] } @@ -20757,11 +23090,108 @@ "indicator": "total_xx_pbfw" } ] + }, + { + "label": "Total Number of clients Missed drug pick ups", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Missed drug pick ups", + "indicator": "total_reason_for_discontinuation_missed_drug_pickup" + } + ] } ] }, { - "sectionTitle": "Any other reason", + "sectionTitle": "Any other reason for discontinuing PrEP", "indicators": [ { "label": "TG", @@ -21635,6 +24065,103 @@ "indicator": "total_yy_pbfw" } ] + }, + { + "label": "Total Number of clients Any other reason", + "indicators": [ + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_20_24_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_25_29_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_30_34_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_35_39_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_40_44_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_45_49_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_50_54_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_55_59_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_60_64_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "", + "indicator": "re_pbfw_above_65_male" + }, + { + "label": "", + "indicator": "re_pbfw_15_19_male" + }, + { + "label": "Total Number clients Any other reason", + "indicator": "total_reason_for_discontinuation_other_reasons" + } + ] } ] } diff --git a/app/reporting-framework/json-reports/prep-monthly/prep-report.json b/app/reporting-framework/json-reports/prep-monthly/prep-report.json index 84be5f981..630ff97fd 100644 --- a/app/reporting-framework/json-reports/prep-monthly/prep-report.json +++ b/app/reporting-framework/json-reports/prep-monthly/prep-report.json @@ -3,6 +3,7 @@ "eligibleForPrepAggregate", "reasonForInitiationPrepAggregate", "newForPrepAggregate", + "eventDrivenPrepAggregate", "restartingPrepAggregate", "whileOnPrepAggregate", "discontinuedPrepAggregate", diff --git a/build-json-schema.js b/build-json-schema.js index deea03766..b01e1865f 100644 --- a/build-json-schema.js +++ b/build-json-schema.js @@ -251,10 +251,6 @@ const generateAggregate = (alias) => { return aggregates; }; -// const colsSchema = generateColumns('reason_for_discontinuation', 5622, 'yy'); -// const cols = JSON.stringify(colsSchema, null, 2); -// console.log(cols); -const aggsSchema = generateAggregate('yy'); +const aggsSchema = generateAggregate('edp'); const aggs = JSON.stringify(aggsSchema, null, 2); -console.log(aggs); diff --git a/service/prep/prep-monthly-report.service.js b/service/prep/prep-monthly-report.service.js index 5cca23145..585333473 100644 --- a/service/prep/prep-monthly-report.service.js +++ b/service/prep/prep-monthly-report.service.js @@ -41,7 +41,7 @@ export class PrepMonthlyReportService extends MultiDatasetPatientlistReport { result.report.reportSchemas.main.transFormDirectives .joinColumn, finalResult, - result.results.results.results + result?.results?.results?.results ); } }