diff --git a/src/callbacks.py b/src/callbacks.py index 689a4a6..6bf197e 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -9,8 +9,10 @@ def get_top_org_table(data, org_type: str): if dff.height == 0: return html.Div() - dff = dff.select(["uid", f"{org_type}_id", f"{org_type}_nom", "montant"]) - dff_nb = dff.group_by(f"{org_type}_id", f"{org_type}_nom").agg( + dff = dff.select( + ["uid", f"{org_type}_id", f"{org_type}_nom", "distance", "montant"] + ) + dff_nb = dff.group_by(f"{org_type}_id", f"{org_type}_nom", "distance").agg( pl.len().alias("Attributions"), pl.sum("montant").alias("montant") ) dff_nb = dff_nb.sort(by="montant", descending=True) @@ -23,14 +25,13 @@ def get_top_org_table(data, org_type: str): data = dff_nb.to_dicts() data = add_links_in_dict(data, f"{org_type}") - print(dff_nb) - return dash_table.DataTable( data=data, markdown_options={"html": True}, page_action="native", page_size=10, columns=columns, + cell_selectable=False, tooltip_header=tooltip, style_cell_conditional=[ { diff --git a/src/pages/acheteur.py b/src/pages/acheteur.py index 2219d40..faaaacc 100644 --- a/src/pages/acheteur.py +++ b/src/pages/acheteur.py @@ -191,6 +191,7 @@ def get_acheteur_marches_data(url, acheteur_year: str) -> list[dict]: "titulaire_id", "titulaire_typeIdentifiant", "titulaire_nom", + "distance", "montant", "codeCPV", "dureeMois", diff --git a/src/pages/titulaire.py b/src/pages/titulaire.py index 90b2b75..e826562 100644 --- a/src/pages/titulaire.py +++ b/src/pages/titulaire.py @@ -195,6 +195,7 @@ def get_titulaire_marches_data(url, titulaire_year: str) -> list[dict]: "dateNotification", "acheteur_id", "acheteur_nom", + "distance", "montant", "codeCPV", "dureeMois",