diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 6886019..67715da 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -170,6 +170,12 @@ p.version > a { } /* Dash Table Overrides */ +table.cell-table, +table.cell-table tr { + border-color: #fff; + padding: 0; +} + .dash-table-container p { margin-bottom: 0; } @@ -178,11 +184,24 @@ p.version > a { .dash-spreadsheet-container .dash-spreadsheet-inner th.dash-header { - background-color: #b33821; + margin: 0; color: white; font-family: "Inter", sans-serif; text-align: left; font-weight: 500; + padding-right: 12px; + border-color: rgb(179, 56, 33) !important; + background-color: rgb(179, 56, 33); + border-style: solid; + border-width: 1px; +} + +table.cell-table tr:first-of-type th:first-of-type { + border-top-left-radius: 3px; +} + +table.cell-table tr:first-of-type th:last-of-type { + border-top-right-radius: 3px; } .dash-table-container .dash-spreadsheet-container .dash-spreadsheet-inner td { diff --git a/src/figures.py b/src/figures.py index 1781df7..8a586cd 100644 --- a/src/figures.py +++ b/src/figures.py @@ -91,13 +91,21 @@ def get_yearly_statistics(statistics, today_str) -> html.Div: page_size=10, sort_action="none", filter_action="none", + style_cell={ + "border": "solid 1px rgb(179, 56, 33)", + }, + style_header={ + "border": "solid 1px rgb(179, 56, 33)", + "backgroundColor": "rgb(179, 56, 33)", + "color": "white", + }, ) return html.Div(children=table, className="marches_table") -def get_barchart_sources(df: pl.DataFrame, type_date: str): - lf = df.lazy() +def get_barchart_sources(df_source: pl.DataFrame, type_date: str): + lf = df_source.lazy() labels = { "dateNotification": "notification", "datePublicationDonnees": "publication des données", @@ -182,6 +190,7 @@ def get_sources_tables(source_path) -> html.Div: datatable = dash_table.DataTable( id="source_table", + data=df.to_dicts(), columns=[ { "name": columns[i], @@ -204,8 +213,15 @@ def get_sources_tables(source_path) -> html.Div: ], sort_action="native", markdown_options={"html": True}, + style_cell={ + "border": "solid 1px rgb(179, 56, 33)", + }, + style_header={ + "border": "solid 1px rgb(179, 56, 33)", + "backgroundColor": "rgb(179, 56, 33)", + "color": "white", + }, ) - datatable.data = df.to_dicts() return html.Div(children=datatable) @@ -247,9 +263,9 @@ class DataTable(dash_table.DataTable): def __init__( self, dtid: str, - hidden_columns: list = None, - data=None, - columns: list = None, + hidden_columns: list[str] | None = None, + data: list[dict[str, str | int | float | bool]] | None = None, + columns: list[dict[str, str]] | None = None, page_size: int = 20, page_action: Literal["native", "custom", "none"] = "native", sort_action: Literal["native", "custom", "none"] = "native", @@ -306,6 +322,14 @@ class DataTable(dash_table.DataTable): row_deletable=False, page_current=0, style_cell_conditional=style_cell_conditional, + style_header={ + "border": "solid 1px rgb(179, 56, 33)", + "backgroundColor": "rgb(179, 56, 33)", + "color": "white", + }, + style_table={ + "border": "solid 0 white", + }, data_timestamp=0, markdown_options={"html": True}, tooltip_duration=8000, diff --git a/src/pages/statistiques.py b/src/pages/statistiques.py index dd6c502..36d4d1d 100644 --- a/src/pages/statistiques.py +++ b/src/pages/statistiques.py @@ -48,7 +48,6 @@ layout = [ Les statistiques publiées sur cette page ont été produites automatiquement à partir des données les plus récentes ({today_str}). """), - dcc.Graph(figure=get_map_count_marches(df)), html.H3( "Statistiques générales sur les marchés", id="marches", @@ -66,6 +65,7 @@ layout = [ """), html.H4("Statistiques par année"), get_yearly_statistics(statistics, today_str), + dcc.Graph(figure=get_map_count_marches(df)), get_duplicate_matrix(), html.H3("Nombre de marchés par source dans le temps"), dcc.Graph(