colin/colibre
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases 33 Activity

Suivi des filtres comme des recherches, avec page source

Browse Source
This commit is contained in:
Colin Maudry
2026-01-28 22:18:39 +01:00
parent e4c6659205
commit 06f658ccf1
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/acheteur.py
+2 -2
View File
@@ -260,7 +260,7 @@ def get_last_marches_data(
data, page_current, page_size, filter_query, sort_by, data_timestamp data, page_current, page_size, filter_query, sort_by, data_timestamp
) -> tuple: ) -> tuple:
return prepare_table_data( return prepare_table_data(
data, data_timestamp, filter_query, page_current, page_size, sort_by data, data_timestamp, filter_query, page_current, page_size, sort_by, "acheteur"
) )
@@ -319,7 +319,7 @@ def download_filtered_acheteur_data(
lff = lff.drop(hidden_columns) lff = lff.drop(hidden_columns)
if filter_query: if filter_query:
lff = filter_table_data(lff, filter_query) lff = filter_table_data(lff, filter_query, "ach download")
if len(sort_by) > 0: if len(sort_by) > 0:
lff = sort_table_data(lff, sort_by) lff = sort_table_data(lff, sort_by)
src/pages/tableau.py
+2 -2
View File
@@ -233,7 +233,7 @@ def update_table(page_current, page_size, filter_query, sort_by, data_timestamp)
# else: # else:
# search_params = urllib.parse.parse_qs(search_params.lstrip("?")) # search_params = urllib.parse.parse_qs(search_params.lstrip("?"))
return prepare_table_data( return prepare_table_data(
None, data_timestamp, filter_query, page_current, page_size, sort_by None, data_timestamp, filter_query, page_current, page_size, sort_by, "tableau"
) )
@@ -253,7 +253,7 @@ def download_data(n_clicks, filter_query, sort_by, hidden_columns: list = None):
lff = lff.drop(hidden_columns) lff = lff.drop(hidden_columns)
if filter_query: if filter_query:
lff = filter_table_data(lff, filter_query) lff = filter_table_data(lff, filter_query, "tab download")
if len(sort_by) > 0: if len(sort_by) > 0:
lff = sort_table_data(lff, sort_by) lff = sort_table_data(lff, sort_by)
src/pages/titulaire.py
+8 -2
View File
@@ -269,7 +269,13 @@ def get_last_marches_data(
data, page_current, page_size, filter_query, sort_by, data_timestamp data, page_current, page_size, filter_query, sort_by, data_timestamp
) -> list[dict]: ) -> list[dict]:
return prepare_table_data( return prepare_table_data(
data, data_timestamp, filter_query, page_current, page_size, sort_by data,
data_timestamp,
filter_query,
page_current,
page_size,
sort_by,
"titulaire",
) )
@@ -328,7 +334,7 @@ def download_filtered_titulaire_data(
lff = lff.drop(hidden_columns) lff = lff.drop(hidden_columns)
if filter_query: if filter_query:
lff = filter_table_data(lff, filter_query) lff = filter_table_data(lff, filter_query, "titu download")
if len(sort_by) > 0: if len(sort_by) > 0:
lff = sort_table_data(lff, sort_by) lff = sort_table_data(lff, sort_by)
src/utils.py
+3 -2
View File
@@ -569,7 +569,7 @@ def search_org(dff: pl.DataFrame, query: str, org_type: str) -> pl.DataFrame:
def prepare_table_data( def prepare_table_data(
data, data_timestamp, filter_query, page_current, page_size, sort_by data, data_timestamp, filter_query, page_current, page_size, sort_by, source_table
): ):
""" """
Fonction de préparation des données pour les datatables, afin de permettre une gestion fine des logiques, Fonction de préparation des données pour les datatables, afin de permettre une gestion fine des logiques,
@@ -580,6 +580,7 @@ def prepare_table_data(
:param page_current: :param page_current:
:param page_size: :param page_size:
:param sort_by: :param sort_by:
:param source_table:
:return: :return:
""" """
@@ -594,7 +595,7 @@ def prepare_table_data(
# Application des filtres # Application des filtres
if filter_query: if filter_query:
lff = filter_table_data(lff, filter_query) lff = filter_table_data(lff, filter_query, source_table)
# Application des tris # Application des tris
if len(sort_by) > 0: if len(sort_by) > 0: