Skip to content

Commit

Permalink
Merge pull request #84 from unicef-drp/new-indicators
Browse files Browse the repository at this point in the history 
Adjusted exp indicators
  • Loading branch information
@Amy-Reidy
Amy-Reidy authored Sep 16, 2024
2 parents d772a78 + d629f4f commit 60ddb13
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 1,710 deletions.
34 changes: 32 additions & 2 deletions dash_service/pages/transmonee.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
}
}

average_text = "This option displays the simple (arithmetic) average, dynamically calculated based on the filtered data. As such, it is not always representative of the entire region, as it reflects only the available data. Furthermore, for indicators referring to populations, population-weighted averages are recommended for a more accurate regional overview."

help_text = html.Div([
html.Strong("HOW TO USE DASHBOARD"),
Expand Down Expand Up @@ -157,7 +158,6 @@
"ICT_SECURITY_CONCERN": "Percentage of 16-24 year olds who limited their personal internet activities in the last 12 months due to security concerns",
"ICT_PERSONAL_DATA": "Percentage of 16-24 year olds who used the internet in the last 3 months and managed access to their personal data",
"MT_SDG_SUICIDE": "Suicide mortality rate for 15-19 year olds (deaths per 100,000 population) - SDG 3.4.2",
"EC_SP_GOV_EXP_GDP": "General government expenditure on social protection (% of GDP)",
# custom plots
"packed_CRG": "National Human Rights Institutions in compliance with the Paris Principles",
"packed_EXP": "Expenditure on education levels as a percentage of government expenditure on education",
Expand Down Expand Up @@ -1589,6 +1589,36 @@ def get_base_layout(**kwargs):
htmlFor='show-average-checkbox',
style={'margin-top':'3px', 'margin-left': '5px'}
),
html.I(
id="average-icon",
className="fas fa-info-circle",
style={
"display": "flex",
"alignContent": "center",
"flexWrap": "wrap",
"paddingLeft": "5px",
},
),
dbc.Popover(
[
dbc.PopoverBody(
average_text,
id="average-popover",
)
],
target="average-icon",
trigger="hover",
className="custom-popover",
style={
"overflowY": "auto",
"whiteSpace": "pre-wrap",
"opacity": 1,
},
delay={
"hide": 0,
"show": 0,
},
),
],
id='average_option',
style={'display':'none'},
Expand Down Expand Up @@ -3118,7 +3148,7 @@ def aio_area_figure(
indicator_link = []

if base_indicator in ['JJ_CHLD_DISAB_COMPLAINT_HHRR', 'PV_SI_COV_DISAB', 'HT_REG_CHLD_DISAB_PROP', 'HT_NEW_REG_CHLD_DISAB_PROP',
'PT_CHLD_DISAB_INRESIDENTIAL_PROP', 'PT_CHLD_DISAB_INFAMILY_PROP', 'PT_CHLD_DISAB_INFOSTER_PROP', 'PV_SI_COV_DISAB']:
'PT_CHLD_DISAB_INRESIDENTIAL_PROP', 'PT_CHLD_DISAB_INFAMILY_PROP', 'PV_SI_COV_DISAB']:
graph_info = "Note: the definition of disability may differ across countries and indicators."

if base_indicator == 'IM_MCV2':
Expand Down
28 changes: 12 additions & 16 deletions dash_service/static/crm_framework_indicators.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,6 @@
"Indicator Name": "Percentage of children with disabilities (0-17 years) in formal residential care at the end of the year",
"Code": "PT_CHLD_DISAB_INRESIDENTIAL_PROP"
},
{
"Indicator Name": "Percentage of children with disabilities (0-17 years) in formal foster care of the total number of children in formal family-based care at the end of the year",
"Code": "PT_CHLD_DISAB_INFOSTER_PROP"
},
{
"Indicator Name": "Percentage of children with disabilities (0-17 years) in formal family-based care at the end of the year",
"Code": "PT_CHLD_DISAB_INFAMILY_PROP"
Expand Down Expand Up @@ -422,12 +418,12 @@
"code": "ESY",
"indicators": [
{
"Indicator Name": "Expenditure on pre-primary (% of government expenditure on education)",
"Code": "EDU_FIN_EXP_L02"
"Indicator Name": "Government expenditure on pre-primary education as a percentage of GDP (%)",
"Code": "EDU_EXP_GDP_L02"
},
{
"Indicator Name": "Expenditure on primary (% of government expenditure on education)",
"Code": "EDU_FIN_EXP_L1"
"Indicator Name": "Government expenditure on primary education as a percentage of GDP (%)",
"Code": "EDU_EXP_GDP_L1"
},
{
"Indicator Name": "Number of years of compulsory pre-primary education guaranteed in legal framework",
Expand Down Expand Up @@ -550,12 +546,12 @@
"Code": "HT_SH_XPD_OOPC_CH_ZS"
},
{
"Indicator Name": "Domestic general government health expenditure (% of current health expenditure)",
"Code": "HT_SH_XPD_GHED_CH_ZS"
"Indicator Name": "Percentage of total government spending on health - SDG 1.a.2",
"Code": "EC_EXP_HLTH"
},
{
"Indicator Name": "Domestic general government health expenditure (% of general government expenditure)",
"Code": "HT_SH_XPD_GHED_GE_ZS"
"Indicator Name": "Domestic general government health expenditure (% of current health expenditure)",
"Code": "HT_SH_XPD_GHED_CH_ZS"
},
{
"Indicator Name": "Domestic general government health expenditure per capita, PPP (current international $)",
Expand Down Expand Up @@ -832,8 +828,8 @@
"Code": "EDU_FIN_EXP_PT_GDP"
},
{
"Indicator Name": "General government expenditure by function: Social protection (% of GDP)",
"Code": "EC_SP_GOV_EXP_GDP"
"Indicator Name": "Percentage of total government spending on social protection - SDG 1.a.2",
"Code": "EC_EXP_PROT"
},
{
"Indicator Name": "Expenditure on family-children benefits (% of expenditure on social benefits)",
Expand All @@ -844,8 +840,8 @@
"Code": "HT_SH_XPD_CHEX_GD_ZS"
},
{
"Indicator Name": "Domestic general government health expenditure (% of GDP)",
"Code": "HT_SH_XPD_GHED_GD_ZS"
"Indicator Name": "Domestic general government health expenditure as % of GDP",
"Code": "HT_WHO_GGHED_GDP"
}
]
},
Expand Down
Loading

0 comments on commit 60ddb13

Please sign in to comment.