KH-538: Improve Disbursement Dashboard

base/configs/superset/assets/charts/Registered_patients_aged_40_and_above_that_have_had_their_NCD_screening_for_the_first_time_14.yaml

@@ -74,29 +74,29 @@ params:
   - Drug Names
   percent_metrics: []
   adhoc_filters:
-  - expressionType: SIMPLE
-    subject: Visit Start date
-    operator: TEMPORAL_RANGE
+  - clause: WHERE
     comparator: No filter
-    clause: WHERE
-    sqlExpression: null
-    isExtra: false
-    isNew: false
     datasourceWarning: false
+    expressionType: SIMPLE
     filterOptionName: filter_n5dad56ctk_yji7xby1r0a
-  - expressionType: SIMPLE
-    subject: indicator
-    operator: IN
-    operatorId: IN
+    isExtra: false
+    isNew: false
+    operator: TEMPORAL_RANGE
+    sqlExpression: null
+    subject: Visit Start date
+  - clause: WHERE
     comparator:
     - 80-pecent-followup-with-hypertension-iabetes-and-medication
     - patients-aged-40-above-with-first-time ncd-screening
-    clause: WHERE
-    sqlExpression: null
-    isExtra: false
-    isNew: false
     datasourceWarning: false
+    expressionType: SIMPLE
     filterOptionName: filter_skfq75qb4zi_azi1ldrrjvj
+    isExtra: false
+    isNew: false
+    operator: IN
+    operatorId: IN
+    sqlExpression: null
+    subject: indicator
   order_by_cols: []
   row_limit: 1000
   server_page_length: 10
@@ -126,9 +126,10 @@ query_context: '{"datasource":{"id":9,"type":"table"},"force":false,"queries":[{
   Pressure","Diastolic Pressure","Pulse","Temperature","Random Blood Sugar","Fasting
   Blood Sugar","HbA1c","OGTT","Albumin","Ketones","Diagnosis 1","Diagnosis 2","Referral
   Facility","Has a Referral Letter","CVD Risk Score","Follow-Up For","Follow-Up Date","Started
-  on Medication","Drug Names"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"Visit
-  Start date","operator":"TEMPORAL_RANGE","comparator":"No filter","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_n5dad56ctk_yji7xby1r0a"},{"expressionType":"SIMPLE","subject":"indicator","operator":"IN","operatorId":"IN","comparator":["80-pecent-followup-with-hypertension-iabetes-and-medication","patients-aged-40-above-with-first-time
-  ncd-screening"],"clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_skfq75qb4zi_azi1ldrrjvj"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+  on Medication","Drug Names"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
+  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_n5dad56ctk_yji7xby1r0a","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"Visit
+  Start date"},{"clause":"WHERE","comparator":["80-pecent-followup-with-hypertension-iabetes-and-medication","patients-aged-40-above-with-first-time
+  ncd-screening"],"datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_skfq75qb4zi_azi1ldrrjvj","isExtra":false,"isNew":false,"operator":"IN","operatorId":"IN","sqlExpression":null,"subject":"indicator"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
 cache_timeout: null
 uuid: c7bd827c-daa4-48ab-986d-0cd07a139b9a
 version: 1.0.0

base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_6.yaml

@@ -62,32 +62,31 @@ params:
   - Colposcopy
   - CC Treatment
   - CC Follow-up date
-  - Encounter date and time
   percent_metrics: []
   adhoc_filters:
-  - expressionType: SIMPLE
-    subject: Visit Start date
-    operator: TEMPORAL_RANGE
+  - clause: WHERE
     comparator: No filter
-    clause: WHERE
-    sqlExpression: null
-    isExtra: false
-    isNew: false
     datasourceWarning: false
+    expressionType: SIMPLE
     filterOptionName: filter_7cvigde0ca_cgiov8yrc4w
-  - expressionType: SIMPLE
-    subject: indicator
-    operator: IN
-    operatorId: IN
+    isExtra: false
+    isNew: false
+    operator: TEMPORAL_RANGE
+    sqlExpression: null
+    subject: Visit Start date
+  - clause: WHERE
     comparator:
     - 80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred
     - women-aged-30-49-years-with-ccs-screening-first-time
-    clause: WHERE
-    sqlExpression: null
-    isExtra: false
-    isNew: false
     datasourceWarning: false
+    expressionType: SIMPLE
     filterOptionName: filter_p2xjxqmjbl_ztolrl0r7ek
+    isExtra: false
+    isNew: false
+    operator: IN
+    operatorId: IN
+    sqlExpression: null
+    subject: indicator
   order_by_cols: []
   row_limit: 1000
   server_page_length: 10
@@ -106,16 +105,17 @@ query_context: '{"datasource":{"id":4,"type":"table"},"force":false,"queries":[{
   type","First Screening?","HPV Test","OpenMRS ID","Visit Type","Visibility of SCJ","VIA
   Test Result","Area of ectocervix","Cervical Biopsy","Pap Smear","Referral Facility","Number
   of Quadrants","CC Reason for Referral","Colposcopy","CC Treatment","CC Follow-up
-  date","Encounter date and time"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"4__table","viz_type":"table","slice_id":6,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Encounter
+  date"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"4__table","viz_type":"table","slice_id":6,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Encounter
   date and time":true,"Visit End date":true,"Visit Start date":true,"Patient''s Birthdate":true},"all_columns":["Facility
   Name","Facility District","Facility Province","Patient''s Last name","Patient''s
   First name","Patient''s Gender","Patient''s Birthdate","Patient Address","Phone
   number","Other Identifiers","Visit End date","Visit Start date","Referral source","Insurance
   type","First Screening?","HPV Test","OpenMRS ID","Visit Type","Visibility of SCJ","VIA
   Test Result","Area of ectocervix","Cervical Biopsy","Pap Smear","Referral Facility","Number
   of Quadrants","CC Reason for Referral","Colposcopy","CC Treatment","CC Follow-up
-  date","Encounter date and time"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"Visit
-  Start date","operator":"TEMPORAL_RANGE","comparator":"No filter","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_7cvigde0ca_cgiov8yrc4w"},{"expressionType":"SIMPLE","subject":"indicator","operator":"IN","operatorId":"IN","comparator":["80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","women-aged-30-49-years-with-ccs-screening-first-time"],"clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_p2xjxqmjbl_ztolrl0r7ek"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
+  date"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
+  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_7cvigde0ca_cgiov8yrc4w","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"Visit
+  Start date"},{"clause":"WHERE","comparator":["80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","women-aged-30-49-years-with-ccs-screening-first-time"],"datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_p2xjxqmjbl_ztolrl0r7ek","isExtra":false,"isNew":false,"operator":"IN","operatorId":"IN","sqlExpression":null,"subject":"indicator"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
 cache_timeout: null
 uuid: 37c2b93f-2cdf-4bf7-9195-076c83eda4b4
 version: 1.0.0

base/configs/superset/assets/charts/Registered_women_aged_30_to_49_years_that_have_had_their_CCS_screening_for_the_first_time_and_were_VIA_positive_and_referred_5.yaml

@@ -5,14 +5,17 @@ certified_by: null
 certification_details: null
 viz_type: table
 params:
-  datasource: 35__table
+  datasource: 4__table
   viz_type: table
-  slice_id: 155
-  granularity_sqla: Visit Start date
-  time_grain_sqla: P1D
-  time_range: No filter
+  slice_id: 5
   query_mode: raw
   groupby: []
+  time_grain_sqla: P1D
+  temporal_columns_lookup:
+    Encounter date and time: true
+    Visit End date: true
+    Visit Start date: true
+    Patient's Birthdate: true
   metrics: []
   all_columns:
   - Facility Name
@@ -42,20 +45,24 @@ params:
   - CC Reason for Referral
   - CC Treatment
   - CC Follow-up date
-  - Encounter date and time
   percent_metrics: []
   adhoc_filters:
-  - expressionType: SIMPLE
-    subject: indicator
-    operator: ==
-    operatorId: EQUALS
+  - clause: WHERE
     comparator: 80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred
-    clause: WHERE
-    sqlExpression: null
-    isExtra: false
-    isNew: false
     datasourceWarning: false
+    expressionType: SIMPLE
     filterOptionName: filter_5stpm8h7cda_f2e3lyfu96d
+    isExtra: false
+    isNew: false
+    operator: ==
+    operatorId: EQUALS
+    sqlExpression: null
+    subject: indicator
+  - clause: WHERE
+    subject: Visit Start date
+    operator: TEMPORAL_RANGE
+    comparator: No filter
+    expressionType: SIMPLE
   order_by_cols: []
   row_limit: 1000
   server_page_length: 10
@@ -65,23 +72,23 @@ params:
   color_pn: true
   extra_form_data: {}
   dashboards:
-  - 20
-  annotation_layers: []
-query_context: '{"datasource":{"id":35,"type":"table"},"force":false,"queries":[{"time_range":"No
-  filter","granularity":"Visit Start date","filters":[{"col":"indicator","op":"==","val":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
+  - 1
+query_context: '{"datasource":{"id":4,"type":"table"},"force":false,"queries":[{"filters":[{"col":"indicator","op":"==","val":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred"},{"col":"Visit
+  Start date","op":"TEMPORAL_RANGE","val":"No filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["Facility
   Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
   Last name","Patient Address","Phone number","Other Identifiers","Visit Start date","Visit
   End date","Visit Type","Referral source","Insurance type","First Screening?","HPV
   Test","Visibility of SCJ","VIA Test Result","Number of Quadrants","Area of ectocervix","Colposcopy","Cervical
   Biopsy","Pap Smear","Referral Facility","CC Reason for Referral","CC Treatment","CC
-  Follow-up date","Encounter date and time"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"35__table","viz_type":"table","slice_id":155,"granularity_sqla":"Visit
-  Start date","time_grain_sqla":"P1D","time_range":"No filter","query_mode":"raw","groupby":[],"metrics":[],"all_columns":["Facility
+  Follow-up date"],"orderby":[],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"4__table","viz_type":"table","slice_id":5,"query_mode":"raw","groupby":[],"time_grain_sqla":"P1D","temporal_columns_lookup":{"Encounter
+  date and time":true,"Visit End date":true,"Visit Start date":true,"Patient''s Birthdate":true},"metrics":[],"all_columns":["Facility
   Name","Facility District","Facility Province","OpenMRS ID","Patient''s First name","Patient''s
   Last name","Patient Address","Phone number","Other Identifiers","Visit Start date","Visit
   End date","Visit Type","Referral source","Insurance type","First Screening?","HPV
   Test","Visibility of SCJ","VIA Test Result","Number of Quadrants","Area of ectocervix","Colposcopy","Cervical
   Biopsy","Pap Smear","Referral Facility","CC Reason for Referral","CC Treatment","CC
-  Follow-up date","Encounter date and time"],"percent_metrics":[],"adhoc_filters":[{"expressionType":"SIMPLE","subject":"indicator","operator":"==","operatorId":"EQUALS","comparator":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","clause":"WHERE","sqlExpression":null,"isExtra":false,"isNew":false,"datasourceWarning":false,"filterOptionName":"filter_5stpm8h7cda_f2e3lyfu96d"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"include_time":false,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[20],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+  Follow-up date"],"percent_metrics":[],"adhoc_filters":[{"clause":"WHERE","comparator":"80-percent-women-aged-30-49-years-with-ccs-screening-first-time-via-positive-referred","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_5stpm8h7cda_f2e3lyfu96d","isExtra":false,"isNew":false,"operator":"==","operatorId":"EQUALS","sqlExpression":null,"subject":"indicator"},{"clause":"WHERE","subject":"Visit
+  Start date","operator":"TEMPORAL_RANGE","comparator":"No filter","expressionType":"SIMPLE"}],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[1],"force":false,"result_format":"json","result_type":"full","include_time":false},"result_format":"json","result_type":"full"}'
 cache_timeout: null
 uuid: a770204a-9220-4c7e-8ea0-4773b2bf8a62
 version: 1.0.0

base/configs/superset/assets/dashboards/Disbursement_Report_Dashboard_1.yaml

@@ -12,7 +12,7 @@ position:
     id: CHART-9thSsJSkeY
     meta:
       chartId: 14
-      height: 50
+      height: 89
       sliceName: Registered patients aged 40 and above that have had their NCD screening
         for the first time
       uuid: c7bd827c-daa4-48ab-986d-0cd07a139b9a
@@ -45,7 +45,7 @@ position:
     id: CHART-gSiI5FA9Eh
     meta:
       chartId: 6
-      height: 50
+      height: 102
       sliceName: Registered women aged 30 to 49 years that have had their CCS screening
         for the first time
       uuid: 37c2b93f-2cdf-4bf7-9195-076c83eda4b4
@@ -62,10 +62,10 @@ position:
     id: CHART-l6yN9QRqOT
     meta:
       chartId: 13
-      height: 50
-      sliceName: Registered patients aged 40 and above and screened for the first
-        time with a follow-up date and diagnosed with Hypertension & Diabetes and
-        were given medication with at least a 4 weeks prescription
+      height: 89
+      sliceName: Registered patients aged 40 and above have had their NCD screening
+        for the first time with a follow-up date and diagnosed with Hypertension &
+        Diabetes and were given medication with at least a 4 weeks prescription
       uuid: 07b02091-ffa9-4d41-8c26-965416489fb3
       width: 6
     parents:
@@ -80,7 +80,7 @@ position:
     id: CHART-wE9z76bX9M
     meta:
       chartId: 5
-      height: 50
+      height: 102
       sliceName: Registered women aged 30 to 49 years that have had their CCS screening
         for the first time and were VIA positive and referred
       uuid: a770204a-9220-4c7e-8ea0-4773b2bf8a62

base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml

@@ -167,15 +167,10 @@ metrics:
   warning_text: null
 columns:
 - column_name: Other Identifiers
-  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u179B\u17C1\u1781\u179F\u1798\
-    \u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F\
-    \ (\u1788\u17D2\u1798\u17C4\u17C7\u178A\u17C4\u1799\u17A1\u17C2\u1780\u1796\u17B8\
-    \u1782\u17D2\u1793\u17B6\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\
-    \u17D2\u1794\u17C0\u179F) (Other ID types (comma separated names)) : \u179B\u17C1\
-    \u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\
-    \u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\u17C2\u1780\u178A\u17C4\
-    \u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\u17C0\u179F) (Other ID\
-    \ Values (comma separated values))"
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\
+    \u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\
+    \u17C2\u1780\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\
+    \u17C0\u179F) (Other ID Values (comma separated values))"
   is_dttm: false
   is_active: true
   type: STRING

base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml

@@ -123,16 +123,9 @@ metrics:
     warning_markdown: ''
   warning_text: null
 columns:
-- column_name: Other Identifiers
-  verbose_name: "\u1794\u17D2\u179A\u1797\u17C1\u1791\u179B\u17C1\u1781\u179F\u1798\
-    \u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F\
-    \ (\u1788\u17D2\u1798\u17C4\u17C7\u178A\u17C4\u1799\u17A1\u17C2\u1780\u1796\u17B8\
-    \u1782\u17D2\u1793\u17B6\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\
-    \u17D2\u1794\u17C0\u179F) (Other ID types (comma separated names)) : \u179B\u17C1\
-    \u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\u17D2\u179F\u17C1\u1784\
-    \u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\u17C2\u1780\u178A\u17C4\
-    \u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\u17C0\u179F) (Other ID\
-    \ Values (comma separated values))"
+- column_name: VIA Test Result
+  verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B \u178F\u17C1\u179F\u17D2\u178F\
+    \ \u179C\u17B8 \u17A2\u17B6\u1799 \u17A2\u17C1 (VIA Test Result)"
   is_dttm: false
   is_active: true
   type: STRING
@@ -144,9 +137,11 @@ columns:
   python_date_format: null
   extra:
     warning_markdown: null
-- column_name: VIA Test Result
-  verbose_name: "\u179B\u1791\u17D2\u1792\u1795\u179B \u178F\u17C1\u179F\u17D2\u178F\
-    \ \u179C\u17B8 \u17A2\u17B6\u1799 \u17A2\u17C1 (VIA Test Result)"
+- column_name: Other Identifiers
+  verbose_name: "\u179B\u17C1\u1781\u179F\u1798\u17D2\u1782\u17B6\u179B\u17CB\u1795\
+    \u17D2\u179F\u17C1\u1784\u1791\u17C0\u178F (\u179B\u17C1\u1781\u1794\u17C6\u1794\
+    \u17C2\u1780\u178A\u17C4\u1799\u179F\u1789\u17D2\u1789\u17B6\u1780\u17D2\u1794\
+    \u17C0\u179F) (Other ID Values (comma separated values))"
   is_dttm: false
   is_active: true
   type: STRING