Merge pull request #62 from unicef-drp/indicator_additions

Indicator edits

dash_service/pages/transmonee.py

@@ -1057,6 +1057,18 @@ def create_labels(row):
 
     data = data.apply(create_labels, axis="columns")
 
+    if indicators[0] == 'IM_MCV2':
+        data['OBS_FOOTNOTE'] = data['Age_name']
+        data['Age_name'] = 'Total'
+        data['AGE'] = '_T'
+
+        if latest_data:
+            # Group by 'REF_AREA', find the max 'TIME_PERIOD' for each group
+            recent_obs = data.groupby('REF_AREA')['TIME_PERIOD'].max().reset_index()
+
+            # Merge the recent observations with the original DataFrame to filter the most recent for each 'REF_AREA'
+            data = pd.merge(data, recent_obs, on=['REF_AREA', 'TIME_PERIOD'])
+
     return data
 
 # path to excel data dictionary
@@ -2339,7 +2351,7 @@ def download_data(n_clicks, data):
             mapbox_style="carto-positron",
             geojson=geo_json_countries,
             zoom=2.2,
-            center={"lat": 51.5194, "lon": 14.0},
+            center={"lat": 51.5194, "lon": 35.0},
             opacity=0.6,
             custom_data=[
                 "OBS_VALUE",
@@ -2903,6 +2915,9 @@ def aio_area_figure(
     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']:
         graph_info = "Note: the definition of disability may differ across countries and indicators."
+
+    if base_indicator == 'IM_MCV2':
+        graph_info = "Note: the reporting age for this indicator differs by country; see footnote in tooltip for reporting age."
 
     if base_indicator in ['HT_SH_STA_ANEM', 'HT_ANEM_U5']:
         indicator_link =  html.A(

dash_service/static/crm_framework_indicators.json

@@ -64,7 +64,7 @@
                     "Code": "MT_SDG_SUICIDE"
                 },
                 {
-                    "Indicator Name": "Percentage of 15-year-old students who report doing the WHO-recommended duration of daily exercise",
+                    "Indicator Name": "Percentage of 11-, 13- and 15-year-old school children who report doing the WHO-recommended duration of daily exercise",
                     "Code": "HT_CHLD_DAILY_EXER"
                 }
             ]
@@ -326,15 +326,15 @@
             "code": "ECD",
             "indicators": [
                 {
-                    "Indicator Name": "Percentage of children (36-59 months) with whom any adult household member has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
+                    "Indicator Name": "Percentage of children (24-59 months) with whom any adult household member has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
                     "Code": "ECD_CHLD_24-59M_ADLT_SRC"
                 },
                 {
-                    "Indicator Name": "Percentage of children (36-59 months) whose father has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
+                    "Indicator Name": "Percentage of children (24-59 months) whose father has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
                     "Code": "ECD_CHLD_24-59M_FHR-SPT-LNG"
                 },
                 {
-                    "Indicator Name": "4.2.1. Percentage of children (36-59 months) developmentally on track in at least 3 of the 4 following domains: literacy-numeracy, physical, social-emotional and learning",
+                    "Indicator Name": "Percentage of children (36-59 months) developmentally on track in at least 3 of the 4 following domains: literacy-numeracy, physical, social-emotional and learning - SDG 4.2.1",
                     "Code": "ECD_CHLD_36-59M_LMPSL"
                 },
                 {

dash_service/static/indicator_config.json

@@ -4842,16 +4842,21 @@
         }
     },
     "IM_MCV2": {
-        "AGE": {
+        "TOTAL": {
             "AGE": [
+                "M12T23",
+                "Y02",
+                "Y03",
                 "Y04",
+                "Y05",
+                "Y06",
+                "Y07",
                 "Y08",
+                "Y09",
+                "Y10",
+                "Y11",
                 "Y12",
-                "Y14"
-            ]
-        },
-        "TOTAL": {
-            "AGE": [
+                "Y13",
                 "Y14"
             ]
         }

dash_service/static/indicator_definitions.json

@@ -145,7 +145,7 @@
     "HT_SH_XPD_GHED_PC_CD": "Public expenditure on health from domestic sources per capita expressed in current US dollars.",
     "HT_WHO_GGHED_US": "Public expenditure on health from domestic sources per capita expressed in current US dollars.",
     "HT_WHO_GGHED_GDP": "Public expenditure on health from domestic sources as a share of the economy as measured by GDP.",
-    "HT_INS_COV": "Total population covered by public and primary private health insurance (%)",
+    "HT_INS_COV": "Percentage of population covered by public and primary voluntary health insurance. ",
     "HT_ADOL_UNMETMED_NOUNMET": "Percentage of self-reported unmet needs for medical examination and main reason declared: No unmet needs to declare",
     "HT_ADOL_UNMETMED_TOOEXP": "Percentage of self-reported unmet needs for medical examination and main reason declared: Too expensive",
     "HT_ADOL_UNMETMED_TOOFAR": "Percentage of self-reported unmet needs for medical examination and main reason declared: Too far to travel",
@@ -194,14 +194,14 @@
     "MNCH_SH_MMR_RISK_ZS": "Life time risk of maternal death is the probability that a 15-year-old female will die eventually from a maternal cause assuming that current levels of fertility and mortality (including maternal mortality) do not change in the future, taking into account competing causes of death.",
     "IM_MCV1": "Percentage of surviving infants who received the first dose of measles-containing vaccine (MCV1)",
     "IM_MCV2": "Percentage of children who received the 2nd dose of measles-containing vaccine, as per administered in the national schedule",
-    "HT_DIST80DTP3_P": "Percentage of districts with at least 80% DTP3 coverage",
+    "HT_DIST80DTP3_P": "Percentage of reporting districts with at least 80% DTP3 coverage",
     "IM_DTP1": "Percentage of surviving infants who received the first dose of DTP-containing vaccine",
     "IM_DTP3": "Percentage of surviving infants who received the third dose of DTP-containing vaccine",
     "IM_PCV3": "Percentage of surviving infants who received the third dose of pneumococcal conjugate-containing vaccine (PCV3)",
     "IM_HPV": "Percentage of females who received the last dose of human papillomavirus (HPV) vaccine per national schedule",
     "HT_SH_ACS_PCV3": "Percentage of the target population with access to pneumococcal conjugate 3rd dose (PCV3) - SDG 3.b.1",
-    "HT_DIST79DTP3_P": "Percentage of districts with DTP3 coverage 50-79%",
-    "HT_DIST79MCV2_P": "Percentage of districts with MCV2 coverage 50-79%",
+    "HT_DIST79DTP3_P": "Percentage of reporting districts with DTP3 coverage 50-79%",
+    "HT_DIST79MCV2_P": "Percentage of reporting districts with MCV2 coverage 50-79%",
     "HT_SH_ACS_DTP3": NaN,
     "HT_SH_ACS_HPV": NaN,
     "HT_SH_ACS_MCV2": NaN,
@@ -234,15 +234,15 @@
     "HT_ADOL_LOW_SATS": "Percentage of 15-year-old students reporting low life satisfaction",
     "HT_SH_PRV_SMOK": "Percentage of the population aged 15 years and over who currently\nuse any tobacco product (smoked and/or smokeless tobacco) on a daily or non-daily basis.",
     "HT_SH_SUD_ALCOL": "Adults (15+ years) who suffer from disorders attributable to the consumption of alcohol (according to ICD-10: F10.1 Harmful use of alcohol; F10.2 Alcohol dependence) during a given calendar year. ",
-    "HT_CHLD_DAILY_EXER": "Percentage of 15-year-old students who report engaging in at least 60 minutes of moderate-to-vigorous physical activity every day over the past seven days",
+    "HT_CHLD_DAILY_EXER": "11-, 13- and 15-year-old school children who report engaging in at least 60 minutes of moderate-to-vigorous physical activity every day over the past seven days",
     "HT_SH_FPL_MTMM": "Percentage of women of reproductive age (15-49 years) who have their need for family planning satisfied with modern methods - SDG 3.7.1.",
     "HT_CDRT_SELF_HARM": "Crude death rate caused by intentional self-harm",
     "HT_ADOL_MEAL": "Percentage of 15-year-old students skipping either breakfast or dinner (%)",
     "HT_CHLD_BODY_RGHT": "Percentage of 15-year-old students who report thinking their body is \"about right\" (%)",
     "HT_CHLD_BODY_NO_RGHT": "Percentage of 15-year-old students who report thinking their body is \"much too thin\" or \"much too fat\" (%)",
     "HT_CHLD_REG_SMOK": "Percentage of 15-year-old students who are regular smokers (%)",
     "HT_CHLD_DRNK": "Percentage of 15-year-old students who have been drunk at least twice (%)",
-    "HT_CHLD_HEALTH_POOR": "Percentage of 11-, 13- and 15-year-olds who rate their own health as 'fair' or 'poor'",
+    "HT_CHLD_HEALTH_POOR": "Percentage of 11-, 13- and 15-year-old school children who rate their own health as 'fair' or 'poor'",
     "HT_CHLD_HEALTH_PROB": "Percentage of 0- to 15-year-olds who live with limitations in their activities because of health problems\n",
     "HT_CHLD_SUP_FAM": "Percentage of 11-, 13- and 15-year-old school children who report feeling high overall support from their family\n",
     "HT_CHLD_SELF_EFFICACY": "Percentage of 15-year-old students who agree (or strongly agree) with the statement 'When I'm in a difficult situation, I can usually find my way out of it'",
@@ -374,7 +374,7 @@
     "EDAT_LFSE_14": "Early leaver from education and training, previously named early school leaver, refers to a person aged 18 to 24 years who has completed at most lower secondary education and is not involved in further education or training; the indicator 'early leavers from education and training' is expressed as a percentage of the people aged 18 to 24 with such criteria out of the total population aged 18 to 24.",
     "EDUNF_SR_L1": "Survival rate to the last grade of primary education (%)",
     "EDUNF_SR_L2": "Survival rate to the last grade of lower secondary general education (%)",
-    "EDU_SDG_PRYA": "Participation rate of youth and adults (15-64 years) in formal and non-formal education and training for the previous 12 months (%)",
+    "EDU_SDG_PRYA": "Participation rate of youth and adults (15-64 years) in formal and non-formal education and training for the previous 12 months. Formal education and training is defined as education provided by the system of schools, colleges, universities and other formal educational institutions that normally constitutes a continuous ‘ladder’ of full-time education for children and young people, generally beginning at the age of 5 to 7 and continuing to up to 20 or 25 years old. Non-formal education and training is defined as any organized and sustained learning activities that do not correspond exactly to the above definition of formal education.",
     "EDUNF_ESL_L1": "Number of early school leavers from primary education",
     "EDU_SDG_SCH_L1": "Number of schools with access to adapted infrastructure and materials for students with disabilities, expressed as a percentage of the total number of schools at a given level of education.",
     "EDU_SDG_SCH_L2": "Number of schools with access to adapted infrastructure and materials for students with disabilities, expressed as a percentage of the total number of schools at a given level of education.",
@@ -492,7 +492,7 @@
     "EDU_SDG_STU_L1_G2OR3_MAT": NaN,
     "EDU_SDG_STU_L2_GLAST_REA": "4.1.1. Percentage of children at the end of lower secondary education reaching minimum proficiency in reading",
     "EDU_SDG_STU_L2_GLAST_MAT": "4.1.1. Percentage of children at the end of lower secondary education reaching minimum proficiency in math",
-    "EDU_SDG_YOUTH_NEET": "Percentage of youth (aged 15-24 years) not in education, employment or training (%)",
+    "EDU_SDG_YOUTH_NEET": "The share of youth (aged 15-24 years) not in education, employment or training (also known as “the NEET rate”) conveys the number of young persons not in education, employment or training as a percentage of the total youth population. It provides a measure of youth who are outside the educational system, not in training and not in employment, and thus serves as a broader measure of potential youth labour market entrants than youth unemployment, since it also includes young persons outside the labour force not in education or training.",
     "EDU_PISA_MAT2": "Percentage of 15-year-olds achieving proficiency level 2 in mathematics",
     "EDU_PISA_MAT3": "Percentage of 15-year-olds achieving proficiency level 3 in mathematics",
     "EDU_PISA_MAT4": "Percentage of 15-year-olds achieving proficiency level 4 in mathematics",
@@ -789,8 +789,8 @@
     "SP_CHLD_DISAB_CASH": "Number of children (0-17 years) receiving disability cash benefits (at the end of the year). ",
     "SP_PS_DISAB_CASH": "Number of persons with disabilities receiving disability cash benefits (at the end of the year)",
     "CR_VC_VOV_GDSD_PD": "Percentage of persons with disability  reporting having personally felt discriminated against or harassed in the previous 12 months on the basis of a ground of discrimination prohibited under international human rights law",
-    "ECD_CHLD_24-59M_ADLT_SRC": "Percentage of children (36-59 months) with whom any adult household member has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
-    "ECD_CHLD_24-59M_FHR-SPT-LNG": "Percentage of children (36-59 months) whose father has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
+    "ECD_CHLD_24-59M_ADLT_SRC": "Percentage of children (24-59 months) with whom any adult household member has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
+    "ECD_CHLD_24-59M_FHR-SPT-LNG": "Percentage of children (24-59 months) whose father has engaged in 4 or more activities to provide early stimulation and responsive care in the last 3 days",
     "ECD_CHLD_36-59M_LMPSL": "The recommended measure for SDG 4.2.1 is the Early Childhood Development Index 2030 (ECDI2030) which is a 20-item instrument to measure developmental outcomes among children aged 24 to 59 months in population-based surveys. The indicator derived from the ECDI2030 is the proportion of children aged 24 to 59 months who have achieved the minimum number of milestones expected for their age group, defined as follows: - Children age 24 to 29 months are classified as developmentally on-track if they have achieved at least 7 milestones - Children age 30 to 35 months are classified as developmentally on-track if they have achieved at least 9 milestones - Children age 36 to 41 months are classified as developmentally on-track if they have achieved at least 11 milestones - Children age 42 to 47 months are classified as developmentally on-track if they have achieved at least 13 milestones - Children age 48 to 59 months are classified as developmentally on-track if they have achieved at least 15 milestones",
     "ECD_EARLY_EDU": "Pupils from age 3 to the starting age of compulsory education at primary level - % of the population of the corresponding age",
     "ECD_IN_CHILDCARE": "The percentage of children (under 3 years old) cared for by formal arrangements other than by the family. ",