Améliorations styles tableaux, headers
This commit is contained in:
@@ -238,11 +238,11 @@ table.cell-table th {
|
|||||||
font-family: "Inter", sans-serif;
|
font-family: "Inter", sans-serif;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
padding-right: 12px;
|
padding: 2px 12px 4px 2px;
|
||||||
border: 1px solid rgb(179, 56, 33) !important;
|
border: 1px solid rgb(179, 56, 33) !important;
|
||||||
background-color: rgb(179, 56, 33);
|
background-color: rgb(179, 56, 33);
|
||||||
border-bottom: none !important;
|
border-bottom: none !important;
|
||||||
height: 34px;
|
height: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dash-table-container
|
.dash-table-container
|
||||||
|
|||||||
+4
-10
@@ -91,11 +91,8 @@ def get_yearly_statistics(statistics, today_str) -> html.Div:
|
|||||||
page_size=10,
|
page_size=10,
|
||||||
sort_action="none",
|
sort_action="none",
|
||||||
filter_action="none",
|
filter_action="none",
|
||||||
style_header={
|
style_header={"fontFamily": "Inter", "fontSize": "16px"},
|
||||||
"border": "solid 1px rgb(179, 56, 33)",
|
style_cell={"fontFamily": "Inter", "fontSize": "16px"},
|
||||||
"backgroundColor": "rgb(179, 56, 33)",
|
|
||||||
"color": "white",
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return html.Div(children=table, className="marches_table")
|
return html.Div(children=table, className="marches_table")
|
||||||
@@ -210,11 +207,8 @@ def get_sources_tables(source_path) -> html.Div:
|
|||||||
],
|
],
|
||||||
sort_action="native",
|
sort_action="native",
|
||||||
markdown_options={"html": True},
|
markdown_options={"html": True},
|
||||||
style_header={
|
style_header={"fontFamily": "Inter", "fontSize": "16px"},
|
||||||
"border": "solid 1px rgb(179, 56, 33)",
|
style_cell={"fontFamily": "Inter", "fontSize": "16px"},
|
||||||
"backgroundColor": "rgb(179, 56, 33)",
|
|
||||||
"color": "white",
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return html.Div(children=datatable)
|
return html.Div(children=datatable)
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ layout = [
|
|||||||
className="org_year",
|
className="org_year",
|
||||||
children=dcc.Dropdown(
|
children=dcc.Dropdown(
|
||||||
id="acheteur_year",
|
id="acheteur_year",
|
||||||
options=["Toutes"]
|
options=["Toutes les années"]
|
||||||
+ [
|
+ [
|
||||||
str(year)
|
str(year)
|
||||||
for year in range(
|
for year in range(
|
||||||
@@ -231,7 +231,7 @@ def get_acheteur_marches_data(url, acheteur_year: str) -> tuple:
|
|||||||
acheteur_siret = url.split("/")[-1]
|
acheteur_siret = url.split("/")[-1]
|
||||||
lff = df.lazy()
|
lff = df.lazy()
|
||||||
lff = lff.filter(pl.col("acheteur_id") == acheteur_siret)
|
lff = lff.filter(pl.col("acheteur_id") == acheteur_siret)
|
||||||
if acheteur_year and acheteur_year != "Toutes":
|
if acheteur_year and acheteur_year != "Toutes les années":
|
||||||
acheteur_year = int(acheteur_year)
|
acheteur_year = int(acheteur_year)
|
||||||
lff = lff.filter(pl.col("dateNotification").dt.year() == acheteur_year)
|
lff = lff.filter(pl.col("dateNotification").dt.year() == acheteur_year)
|
||||||
lff = lff.sort(["dateNotification", "uid"], descending=True, nulls_last=True)
|
lff = lff.sort(["dateNotification", "uid"], descending=True, nulls_last=True)
|
||||||
@@ -292,7 +292,7 @@ def download_acheteur_data(
|
|||||||
|
|
||||||
def to_bytes(buffer):
|
def to_bytes(buffer):
|
||||||
df_to_download.write_excel(
|
df_to_download.write_excel(
|
||||||
buffer, worksheet="DECP" if annee in ["Toutes", None] else annee
|
buffer, worksheet="DECP" if annee in ["Toutes les années", None] else annee
|
||||||
)
|
)
|
||||||
|
|
||||||
date = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
|
date = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ layout = [
|
|||||||
className="org_year",
|
className="org_year",
|
||||||
children=dcc.Dropdown(
|
children=dcc.Dropdown(
|
||||||
id="titulaire_year",
|
id="titulaire_year",
|
||||||
options=["Toutes"]
|
options=["Toutes les années"]
|
||||||
+ [
|
+ [
|
||||||
str(year)
|
str(year)
|
||||||
for year in range(
|
for year in range(
|
||||||
@@ -235,7 +235,7 @@ def get_titulaire_marches_data(url, titulaire_year: str) -> tuple:
|
|||||||
(pl.col("titulaire_id") == titulaire_siret)
|
(pl.col("titulaire_id") == titulaire_siret)
|
||||||
& (pl.col("titulaire_typeIdentifiant") == "SIRET")
|
& (pl.col("titulaire_typeIdentifiant") == "SIRET")
|
||||||
)
|
)
|
||||||
if titulaire_year and titulaire_year != "Toutes":
|
if titulaire_year and titulaire_year != "Toutes les années":
|
||||||
lff = lff.filter(
|
lff = lff.filter(
|
||||||
pl.col("dateNotification").cast(pl.String).str.starts_with(titulaire_year)
|
pl.col("dateNotification").cast(pl.String).str.starts_with(titulaire_year)
|
||||||
)
|
)
|
||||||
@@ -305,7 +305,7 @@ def download_titulaire_data(
|
|||||||
|
|
||||||
def to_bytes(buffer):
|
def to_bytes(buffer):
|
||||||
df_to_download.write_excel(
|
df_to_download.write_excel(
|
||||||
buffer, worksheet="DECP" if annee in ["Toutes", None] else annee
|
buffer, worksheet="DECP" if annee in ["Toutes les années", None] else annee
|
||||||
)
|
)
|
||||||
|
|
||||||
date = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
|
date = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
|
||||||
|
|||||||
Reference in New Issue
Block a user