Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add defaults for all areas in Education and default chart selection for area 2 #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add defaults for all areas in Education and default chart selection for area 2 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 97 additions & 24 deletions transmonee_dashboard/src/transmonee_dashboard/pages/base_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,13 @@ def get_base_layout(**kwargs):
className="sticky-top bg-light",
),
dbc.Row(
[dbc.CardDeck(id="cards_row", className="mt-3",),], justify="center",
[
dbc.CardDeck(
id="cards_row",
className="mt-3",
),
],
justify="center",
),
html.Br(),
# start first row
Expand All @@ -207,7 +213,9 @@ def get_base_layout(**kwargs):
dcc.Dropdown(
id="main_options",
# className="dcc_control",
style={"z-index": "11",},
style={
"z-index": "11",
},
),
dcc.Graph(id="main_area"),
html.Div(
Expand Down Expand Up @@ -242,7 +250,10 @@ def get_base_layout(**kwargs):
# style={"z-index": "15"},
),
dcc.Graph(id="area_1"),
dbc.RadioItems(id="area_1_breakdowns", inline=True,),
dbc.RadioItems(
id="area_1_breakdowns",
inline=True,
),
html.Div(
fa("fas fa-info-circle"),
id="area_1_info",
Expand All @@ -265,7 +276,8 @@ def get_base_layout(**kwargs):
dbc.CardBody(
[
dcc.Dropdown(
id="area_2_options", className="dcc_control",
id="area_2_options",
className="dcc_control",
),
html.Div(
[dcc.Graph(id="area_2")],
Expand Down Expand Up @@ -306,7 +318,8 @@ def get_base_layout(**kwargs):
dbc.CardBody(
[
dcc.Dropdown(
id="area_3_options", className="dcc_control",
id="area_3_options",
className="dcc_control",
),
dcc.Graph(id="area_3"),
html.Div(
Expand All @@ -331,7 +344,8 @@ def get_base_layout(**kwargs):
dbc.CardBody(
[
dcc.Dropdown(
id="area_4_options", className="dcc_control",
id="area_4_options",
className="dcc_control",
),
dcc.Graph(id="area_4"),
html.Div(
Expand Down Expand Up @@ -427,7 +441,9 @@ def get_filtered_dataset(theme, years, countries):
Input("country_selector", "checked"),
Input("programme-toggle", "checked"),
],
[State("indicators", "data"),],
[
State("indicators", "data"),
],
)
def apply_filters(theme, years_slider, country_selector, programme_toggle, indicators):
ctx = dash.callback_context
Expand Down Expand Up @@ -501,7 +517,12 @@ def indicator_card(
# select last value for each country
indicator_values = (
filtered_data.query(query)
.groupby(["Geographic area", "TIME_PERIOD",])
.groupby(
[
"Geographic area",
"TIME_PERIOD",
]
)
.agg({"OBS_VALUE": "sum", "DATA_SOURCE": "count"})
).reset_index()
numerator_pairs = (
Expand Down Expand Up @@ -625,7 +646,9 @@ def indicator_card(

@app.callback(
Output("cards_row", "children"),
[Input("store", "data"),],
[
Input("store", "data"),
],
[State("cards_row", "children"), State("indicators", "data")],
)
def show_cards(selections, current_cards, indicators_dict):
Expand All @@ -651,14 +674,19 @@ def show_cards(selections, current_cards, indicators_dict):
Output("area_2_options", "options"),
Output("area_3_options", "options"),
Output("area_4_options", "options"),
[Input("store", "data"),],
[
Input("store", "data"),
],
[State("indicators", "data")],
)
def set_options(theme, indicators_dict):
# potentially only use cached version
return [
[
{"label": item["Indicator"], "value": item["CODE"],}
{
"label": item["Indicator"],
"value": item["CODE"],
}
for item in data[
data["CODE"].isin(indicators_dict[theme["theme"]][area]["indicators"])
][["CODE", "Indicator"]]
Expand All @@ -678,7 +706,9 @@ def set_options(theme, indicators_dict):
Output("area_2_options", "value"),
Output("area_3_options", "value"),
Output("area_4_options", "value"),
[Input("store", "data"),],
[
Input("store", "data"),
],
[State("indicators", "data")],
)
def set_default_values(theme, indicators_dict):
Expand All @@ -691,6 +721,19 @@ def set_default_values(theme, indicators_dict):
]


@app.callback(
Output("area_2_types", "value"),
[
Input("store", "data"),
],
[State("indicators", "data")],
)
def set_default_chart_types(theme, indicators_dict):
# set the default chart type value for area 2 as by default nothing is selected and it is line
area = AREA_KEYS[2]
return indicators_dict[theme["theme"]][area].get("default_graph")


# does this function assume dimension is a disaggregation?
# should we call it only if dimension is a disaggregation?
def get_disag_total(data, indicator, dimension, default_total="Total"):
Expand Down Expand Up @@ -789,7 +832,10 @@ def get_target_query(data, indicator, dimension="Sex", target_code="Total"):


@app.callback(
Output("area_1_breakdowns", "options"), [Input("area_1_options", "value"),],
Output("area_1_breakdowns", "options"),
[
Input("area_1_options", "value"),
],
)
def breakdown_options(indicator):

Expand All @@ -816,8 +862,12 @@ def breakdown_options(indicator):
# Output("area_2_options", "value"),
# Output("area_3_options", "value"),
# Output("area_4_options", "value"),
[Input("area_1_breakdowns", "options"),],
[State("indicators", "data"),],
[
Input("area_1_breakdowns", "options"),
],
[
State("indicators", "data"),
],
)
def set_default_compare(compare_options, indicators_dict):

Expand All @@ -831,8 +881,13 @@ def set_default_compare(compare_options, indicators_dict):
@app.callback(
Output("main_area", "figure"),
Output("main_area_sources", "children"),
[Input("main_options", "value"), Input("store", "data"),],
[State("indicators", "data"),],
[
Input("main_options", "value"),
Input("store", "data"),
],
[
State("indicators", "data"),
],
)
def main_figure(indicator, selections, indicators_dict):

Expand Down Expand Up @@ -872,7 +927,9 @@ def main_figure(indicator, selections, indicators_dict):
Input("area_1_options", "value"),
Input("area_1_breakdowns", "value"),
],
[State("indicators", "data"),],
[
State("indicators", "data"),
],
)
def area_1_figure(selections, indicator, compare, indicators_dict):

Expand Down Expand Up @@ -929,10 +986,16 @@ def area_1_figure(selections, indicator, compare, indicators_dict):
Input("area_2_options", "value"),
Input("area_2_types", "value"),
],
[State("indicators", "data"),],
[
State("indicators", "data"),
],
)
def area_2_figure(
selections, area_1_selected, area_2_selected, selected_type, indicators_dict,
selections,
area_1_selected,
area_2_selected,
selected_type,
indicators_dict,
):

# only run if both areas (1 and 2) not empty
Expand Down Expand Up @@ -996,8 +1059,13 @@ def area_2_figure(
@app.callback(
Output("area_3", "figure"),
Output("area_3_sources", "children"),
[Input("store", "data"), Input("area_3_options", "value"),],
[State("indicators", "data"),],
[
Input("store", "data"),
Input("area_3_options", "value"),
],
[
State("indicators", "data"),
],
)
def area_3_figure(selections, indicator, indicators_dict):

Expand Down Expand Up @@ -1038,8 +1106,13 @@ def area_3_figure(selections, indicator, indicators_dict):
@app.callback(
Output("area_4", "figure"),
Output("area_4_sources", "children"),
[Input("store", "data"), Input("area_4_options", "value"),],
[State("indicators", "data"),],
[
Input("store", "data"),
Input("area_4_options", "value"),
],
[
State("indicators", "data"),
],
)
def area_4_figure(selections, indicator, indicators_dict):

Expand Down
21 changes: 15 additions & 6 deletions transmonee_dashboard/src/transmonee_dashboard/pages/education.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@
"AREA_1": {
"type": "bar",
"options": dict(
x="Geographic area", y="OBS_VALUE", barmode="group", text="TIME_PERIOD",
x="Geographic area",
y="OBS_VALUE",
barmode="group",
text="TIME_PERIOD",
),
"compare": "Sex",
"indicators": [
Expand Down Expand Up @@ -102,7 +105,7 @@
"EDUNF_NIR_L1_ENTRYAGE",
"EDUNF_TRANRA_L2",
],
# "default": "EDUNF_ROFST_L3",
"default": "EDUNF_GER_L3",
},
"AREA_3": {
"type": "bar",
Expand Down Expand Up @@ -208,7 +211,10 @@
"AREA_1": {
"type": "bar",
"options": dict(
x="Geographic area", y="OBS_VALUE", barmode="group", text="TIME_PERIOD",
x="Geographic area",
y="OBS_VALUE",
barmode="group",
text="TIME_PERIOD",
),
"compare": "Sex",
"indicators": [
Expand Down Expand Up @@ -259,7 +265,7 @@
"EDUNF_LR_YOUTH",
"EDUNF_LR_ADULT",
],
# "default": "EDU_SDG_STU_L2_GLAST_MAT",
"default": "EDU_SDG_STU_L2_GLAST_MAT",
},
"AREA_3": {
"type": "bar",
Expand Down Expand Up @@ -353,7 +359,10 @@
"AREA_1": {
"type": "bar",
"options": dict(
x="Geographic area", y="OBS_VALUE", barmode="group", text="TIME_PERIOD",
x="Geographic area",
y="OBS_VALUE",
barmode="group",
text="TIME_PERIOD",
),
"compare": "Sex",
"indicators": [
Expand Down Expand Up @@ -414,7 +423,7 @@
"EDUNF_STU_L2_PRV",
"EDUNF_STU_L3_PRV",
],
# "default": "EDUNF_PRP_L2",
"default": "EDUNF_PRP_L2",
},
"AREA_3": {
"type": "bar",
Expand Down