From d7c00de8f15cce30a87df9965082256c600e6848 Mon Sep 17 00:00:00 2001
From: Saningo Lekalantula <nickmentor421@gmail.com>
Date: Mon, 3 Jul 2023 12:13:33 +0300
Subject: [PATCH] POC-315:Add-Hiv-Disclosure-Status (#1286)

---
 .../gains-and-losses-patient-list-cols.json   | 65 +++++++++++++++++++
 ...ains-and-losses-patient-list-template.json |  5 ++
 .../patient-list-frozen-template.json         |  5 ++
 3 files changed, 75 insertions(+)

diff --git a/app/reporting-framework/json-reports/gains-and-losses/gains-and-losses-patient-list-cols.json b/app/reporting-framework/json-reports/gains-and-losses/gains-and-losses-patient-list-cols.json
index 0bbf9b07d..29bd87431 100644
--- a/app/reporting-framework/json-reports/gains-and-losses/gains-and-losses-patient-list-cols.json
+++ b/app/reporting-framework/json-reports/gains-and-losses/gains-and-losses-patient-list-cols.json
@@ -66,6 +66,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -210,6 +215,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -360,6 +370,11 @@
         "width": 200,
         "field": "ovcid_id"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -1368,6 +1383,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -1502,6 +1522,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -1641,6 +1666,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -1780,6 +1810,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -1954,6 +1989,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -2297,6 +2337,11 @@
         "width": 200,
         "field": "ovcid_id"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -2426,6 +2471,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -2565,6 +2615,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -2704,6 +2759,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
@@ -2838,6 +2898,11 @@
         "width": 150,
         "field": "ipt_stop_date"
       },
+      {
+        "headerName": "Hiv Disclosure Status",
+        "width": 150,
+        "field": "hiv_diclosure_status"
+      },
       {
         "headerName": "Discordant Status",
         "width": 150,
diff --git a/app/reporting-framework/json-reports/patient-gains-and-losses-patient-list-template.json b/app/reporting-framework/json-reports/patient-gains-and-losses-patient-list-template.json
index a43d05d25..13f068c75 100644
--- a/app/reporting-framework/json-reports/patient-gains-and-losses-patient-list-template.json
+++ b/app/reporting-framework/json-reports/patient-gains-and-losses-patient-list-template.json
@@ -222,6 +222,11 @@
       "alias": "ipt_stop_date",
       "column": "date_format(fh.ipt_stop_date, '%Y-%m-%d')"
     },
+    {
+      "type": "simple_column",
+      "alias": "hiv_diclosure_status",
+      "column": "fh.hiv_disclosure_status_value"
+    },
     {
       "type": "derived_column",
       "alias": "discordant_status",
diff --git a/app/reporting-framework/json-reports/patient-list-frozen-template.json b/app/reporting-framework/json-reports/patient-list-frozen-template.json
index 49292e93e..06e339c1c 100644
--- a/app/reporting-framework/json-reports/patient-list-frozen-template.json
+++ b/app/reporting-framework/json-reports/patient-list-frozen-template.json
@@ -283,6 +283,11 @@
       "alias": "ipt_stop_date",
       "column": "date_format(fh.ipt_stop_date, '%Y-%m-%d')"
     },
+    {
+      "type": "simple_column",
+      "alias": "hiv_diclosure_status",
+      "column": "fh.hiv_disclosure_status_value"
+    },
     {
       "type": "derived_column",
       "alias": "discordant_status",