From f226df6bcb9af9b40a39ba8d03762ef4dffcc47a Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Fri, 10 Mar 2023 14:09:57 +0100 Subject: C-Dash: Add indexes to the list of tests Signed-off-by: Tibor Frank Change-Id: Ic7a207e6ac1b26c23b04ecb41fa045b7fa21dae5 --- csit.infra.dash/app/cdash/report/layout.py | 6 ++-- csit.infra.dash/app/cdash/trending/layout.py | 2 +- csit.infra.dash/app/cdash/utils/utils.py | 52 ++++++++++++++++++---------- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/csit.infra.dash/app/cdash/report/layout.py b/csit.infra.dash/app/cdash/report/layout.py index cae6993ec2..2f954b611b 100644 --- a/csit.infra.dash/app/cdash/report/layout.py +++ b/csit.infra.dash/app/cdash/report/layout.py @@ -682,7 +682,7 @@ class Layout: class_name="overflow-auto p-0", id="lg-selected", children=[], - style={"max-height": "14em"}, + style={"max-height": "20em"}, flush=True ) ] @@ -1250,7 +1250,9 @@ class Layout: if on_draw: if store_sel: - lg_selected = get_list_group_items(store_sel, "sel-cl") + lg_selected = get_list_group_items( + store_sel, "sel-cl", add_index=True + ) plotting_area = self._get_plotting_area( store_sel, bool(normalize), diff --git a/csit.infra.dash/app/cdash/trending/layout.py b/csit.infra.dash/app/cdash/trending/layout.py index 2a91bf4755..e4b7094de3 100644 --- a/csit.infra.dash/app/cdash/trending/layout.py +++ b/csit.infra.dash/app/cdash/trending/layout.py @@ -614,7 +614,7 @@ class Layout: class_name="overflow-auto p-0", id="lg-selected", children=[], - style={"max-height": "14em"}, + style={"max-height": "20em"}, flush=True ) ] diff --git a/csit.infra.dash/app/cdash/utils/utils.py b/csit.infra.dash/app/cdash/utils/utils.py index 63e13ce141..424456088d 100644 --- a/csit.infra.dash/app/cdash/utils/utils.py +++ b/csit.infra.dash/app/cdash/utils/utils.py @@ -346,34 +346,48 @@ def set_job_params(df: pd.DataFrame, job: str) -> dict: } -def get_list_group_items(items: list, type: str, colorize: bool=True) -> list: +def get_list_group_items( + items: list, + type: str, + colorize: bool=True, + add_index: bool=False + ) -> list: """Generate list of ListGroupItems with checkboxes with selected items. :param items: List of items to be displayed in the ListGroup. :param type: The type part of an element ID. :param colorize: If True, the color of labels is set, otherwise the default color is used. + :param add_index: Add index to the list items. :type items: list :type type: str :type colorize: bool + :type add_index: bool :returns: List of ListGroupItems with checkboxes with selected items. :rtype: list """ - return [ - dbc.ListGroupItem( - children=[ - dbc.Checkbox( - id={"type": type, "index": i}, - label=l["id"] if isinstance(l, dict) else l, - value=False, - label_class_name="m-0 p-0", - label_style={ - "font-size": ".875em", - "color": get_color(i) if colorize else "#55595c" - }, - class_name="info" - ) - ], - class_name="p-0" - ) for i, l in enumerate(items) - ] + + children = list() + for i, l in enumerate(items): + idx = f"{i + 1}. " if add_index else str() + label = f"{idx}{l['id']}" if isinstance(l, dict) else f"{idx}{l}" + children.append( + dbc.ListGroupItem( + children=[ + dbc.Checkbox( + id={"type": type, "index": i}, + label=label, + value=False, + label_class_name="m-0 p-0", + label_style={ + "font-size": ".875em", + "color": get_color(i) if colorize else "#55595c" + }, + class_name="info" + ) + ], + class_name="p-0" + ) + ) + + return children -- cgit 1.2.3-korg