Skip to content

Main area button group #180

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

Open
jamescw wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Main area button group #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b495b39
update dev branch to latest config
beto-Sibileau Sep 5, 2022
4c3c95f
updated pages
beto-Sibileau Sep 5, 2022
3e0ae84
design of buttons as radio items - missing vertical alignment
beto-Sibileau Sep 5, 2022
514980a
first change incompleted
beto-Sibileau Sep 5, 2022
5df3df2
first callback working - requires n_clicks update
beto-Sibileau Sep 5, 2022
b2b145e
addition of card inside area - first iteration - callback function to…
beto-Sibileau Sep 6, 2022
059c4da
added map as area type options
beto-Sibileau Sep 7, 2022
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
383 changes: 168 additions & 215 deletions transmonee_dashboard/src/transmonee_dashboard/assets/indicator_config.json
View file
Open in desktop

Large diffs are not rendered by default.

13,106 changes: 13,104 additions & 2 deletions transmonee_dashboard/src/transmonee_dashboard/assets/main.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions transmonee_dashboard/src/transmonee_dashboard/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
child_poverty,
child_rights,
child_participation,
home,
overview,
resources,
country_profiles,
Expand All @@ -28,7 +27,7 @@
# string corresponding to path of the route (will be prefixed with Dash's
# 'routes_pathname_prefix' and 'layout' is a Dash Component.
urls = (
("data-explorer-test-page", child_education.get_layout),
("", child_health.get_layout),
("overview", overview.get_layout),
("child-education", child_education.get_layout),
("child-protection", child_protection.get_layout),
Expand Down
13 changes: 10 additions & 3 deletions transmonee_dashboard/src/transmonee_dashboard/pages/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@
"Participation and Civil Rights": [
"Birth registration and identity",
"Information, Internet and Protection of privacy",
"Education, Leisure, and Culture",
"Leisure and Culture",
],
}

Expand Down Expand Up @@ -798,7 +798,7 @@ def get_filtered_dataset(
# check if the indicator has special config, update the keys from the config
if indicator_config and not only_dtype(indicator_config):
# TODO: need to confirm that a TOTAL is always available when a config is available for the indicator
card_keys = indicator_config[breakdown]
card_keys = indicator_config[breakdown].copy()
if (
dimensions
): # if we are sending cards related filters, update the keys with the set values
Expand Down Expand Up @@ -839,7 +839,14 @@ def get_filtered_dataset(
# convert to numeric and round
data["OBS_VALUE"] = pd.to_numeric(data.OBS_VALUE, errors="coerce")
data.dropna(subset=["OBS_VALUE"], inplace=True)
data = data.round({"OBS_VALUE": 2})
# round based on indicator unit: index takes 3 decimals
ind_unit = data.UNIT_MEASURE.iloc[0].value
data = data.round({"OBS_VALUE": 3 if ind_unit == "IDX" else 1})
# round to whole number if values greater than one (and not index)
if ind_unit != "IDX":
data.loc[data.OBS_VALUE > 1, "OBS_VALUE"] = data[
data.OBS_VALUE > 1
].OBS_VALUE.round()
# converting TIME_PERIOD to numeric: we should get integers by default
data["TIME_PERIOD"] = pd.to_numeric(data.TIME_PERIOD)

Expand Down
Loading