From 937e8be356a1b9618b7d0e04a74c25e8424928b0 Mon Sep 17 00:00:00 2001
From: Colin Maudry <colin@maudry.com>
Date: Sat, 24 Jan 2026 14:19:02 +0100
Subject: [PATCH] =?UTF-8?q?distance=20=3D>=20titulaire=5Fdistance=20(+=20a?=
 =?UTF-8?q?ffichage=20dans=20vue=20march=C3=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/callbacks.py    |  8 ++++----
 src/pages/marche.py | 11 +++++++----
 src/utils.py        | 10 ++++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 62df9ed..0ca434e 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -11,11 +11,11 @@ def get_top_org_table(data, org_type: str):
         return html.Div()
 
     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")
+        ["uid", f"{org_type}_id", f"{org_type}_nom", "titulaire_distance", "montant"]
     )
+    dff_nb = dff.group_by(
+        f"{org_type}_id", f"{org_type}_nom", "titulaire_distance"
+    ).agg(pl.len().alias("Attributions"), pl.sum("montant").alias("montant"))
     dff_nb = dff_nb.sort(by="montant", descending=True, nulls_last=True)
     dff_nb = dff_nb.cast(pl.String)
     dff_nb = dff_nb.fill_null("")
diff --git a/src/pages/marche.py b/src/pages/marche.py
index 4fbb8d4..0e17c15 100644
--- a/src/pages/marche.py
+++ b/src/pages/marche.py
@@ -185,10 +185,13 @@ def update_marche_info(marche, titulaires):
     for titulaire in titulaires:
         if titulaire["titulaire_typeIdentifiant"] == "SIRET":
             content = html.Li(
-                html.A(
-                    href=f"/titulaires/{titulaire['titulaire_id']}",
-                    children=titulaire["titulaire_nom"],
-                )
+                [
+                    html.A(
+                        href=f"/titulaires/{titulaire['titulaire_id']}",
+                        children=titulaire["titulaire_nom"],
+                    ),
+                    f" ({titulaire['titulaire_categorie']}, {titulaire['titulaire_distance']} km)",
+                ]
             )
         else:
             content = html.Li(titulaire["titulaire_nom"])
diff --git a/src/utils.py b/src/utils.py
index 43e7fa8..9286c3c 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -182,9 +182,11 @@ def format_values(dff: pl.DataFrame) -> pl.DataFrame:
 
     if "montant" in dff.columns:
         dff = dff.with_columns(pl.col("montant").pipe(format_montant).alias("montant"))
-    if "distance" in dff.columns:
+    if "titulaire_distance" in dff.columns:
         dff = dff.with_columns(
-            pl.col("distance").pipe(format_distance).alias("distance")
+            pl.col("titulaire_distance")
+            .pipe(format_distance)
+            .alias("titulaire_distance")
         )
 
     return dff
@@ -396,7 +398,7 @@ def get_default_hidden_columns(page):
             "titulaire_id",
             "titulaire_typeIdentifiant",
             "titulaire_nom",
-            "distance",
+            "titulaire_distance",
             "montant",
             "codeCPV",
             "dureeRestanteMois",
@@ -408,7 +410,7 @@ def get_default_hidden_columns(page):
             "dateNotification",
             "acheteur_id",
             "acheteur_nom",
-            "distance",
+            "titulaire_distance",
             "montant",
             "codeCPV",
             "dureeRestanteMois",