Petits ajustements
This commit is contained in:
+4
-3
@@ -114,7 +114,7 @@ def get_marche_data(url) -> tuple[dict, list]:
|
|||||||
Input("titulaires_data", "data"),
|
Input("titulaires_data", "data"),
|
||||||
)
|
)
|
||||||
def update_marche_info(marche, titulaires):
|
def update_marche_info(marche, titulaires):
|
||||||
def make_parameter(col):
|
def make_parameter(col, bold=True):
|
||||||
column_object = data_schema.get(col)
|
column_object = data_schema.get(col)
|
||||||
column_name = column_object.get("title") if column_object else col
|
column_name = column_object.get("title") if column_object else col
|
||||||
|
|
||||||
@@ -158,10 +158,11 @@ def update_marche_info(marche, titulaires):
|
|||||||
else:
|
else:
|
||||||
value = ""
|
value = ""
|
||||||
|
|
||||||
param_content = html.P([column_name, " : ", html.Strong(value)])
|
value = html.Strong(value) if bold else value
|
||||||
|
param_content = html.P([column_name, " : ", value])
|
||||||
return param_content
|
return param_content
|
||||||
|
|
||||||
marche_objet = make_parameter("objet")
|
marche_objet = make_parameter("objet", bold=False)
|
||||||
|
|
||||||
marche_infos = [
|
marche_infos = [
|
||||||
make_parameter("id"),
|
make_parameter("id"),
|
||||||
|
|||||||
+5
-4
@@ -145,11 +145,12 @@ def format_number(number) -> str:
|
|||||||
return number
|
return number
|
||||||
|
|
||||||
|
|
||||||
def unformat_montant(number: str) -> int:
|
def unformat_montant(number: str) -> float:
|
||||||
number = number.replace(" €", "")
|
number = number.replace(" €", "")
|
||||||
number = number.replace(" €", "").replace(" ", "")
|
number = number.replace(" €", "").replace(" ", "")
|
||||||
|
number = number.replace(",", ".")
|
||||||
number = number.strip()
|
number = number.strip()
|
||||||
return int(number)
|
return float(number)
|
||||||
|
|
||||||
|
|
||||||
def format_values(dff: pl.DataFrame) -> pl.DataFrame:
|
def format_values(dff: pl.DataFrame) -> pl.DataFrame:
|
||||||
@@ -758,10 +759,10 @@ df_titulaires_departement: pl.DataFrame = (
|
|||||||
.sort("titulaire_nom")
|
.sort("titulaire_nom")
|
||||||
)
|
)
|
||||||
df_acheteurs_marches: pl.DataFrame = (
|
df_acheteurs_marches: pl.DataFrame = (
|
||||||
df.select("uid", "acheteur_id").unique().sort("acheteur_id")
|
df.select("uid", "objet", "acheteur_id").unique().sort("acheteur_id")
|
||||||
)
|
)
|
||||||
df_titulaires_marches: pl.DataFrame = (
|
df_titulaires_marches: pl.DataFrame = (
|
||||||
df.select("uid", "titulaire_id").unique().sort("titulaire_id")
|
df.select("uid", "objet", "titulaire_id").unique().sort("titulaire_id")
|
||||||
)
|
)
|
||||||
|
|
||||||
departements = get_departements()
|
departements = get_departements()
|
||||||
|
|||||||
Reference in New Issue
Block a user