feat(cdash): Deduplicate units in comparison table

Not everybody uses wide enough display to avoid horizontal scrolling.

Change-Id: I85f77a02395419f692b20c0f1437fe5138abb39c
Signed-off-by: Vratko Polak <[email protected]>

diff --git a/csit.infra.dash/app/cdash/comparisons/layout.py b/csit.infra.dash/app/cdash/comparisons/layout.py
index 735f199..4342d4e 100644 (file)
--- a/csit.infra.dash/app/cdash/comparisons/layout.py
+++ b/csit.infra.dash/app/cdash/comparisons/layout.py
@@ -651,9 +651,9 @@ class Layout:
                     "type": "text"
                 })
             else:
-                l_col = col.rsplit(" ", 2)
+                l_col = col.rsplit(" ", 1)
                 cols.append({
-                    "name": [l_col[0], " ".join(l_col[-2:])],
+                    "name": [l_col[0], l_col[-1]],
                     "id": col,
                     "deletable": False,
                     "selectable": False,

diff --git a/csit.infra.dash/app/cdash/comparisons/tables.py b/csit.infra.dash/app/cdash/comparisons/tables.py
index 208dea3..bd9968a 100644 (file)
--- a/csit.infra.dash/app/cdash/comparisons/tables.py
+++ b/csit.infra.dash/app/cdash/comparisons/tables.py
@@ -336,15 +336,15 @@ def comparison_table(
     s_unit = "|".join(unit)
     df_cmp = pd.DataFrame.from_dict({
         "Test Name": l_name,
-        f"{r_name} Mean [{s_unit}]": l_r_mean,
-        f"{r_name} Stdev [{s_unit}]": l_r_std,
-        f"{c_name} Mean [{s_unit}]": l_c_mean,
-        f"{c_name} Stdev [{s_unit}]": l_c_std,
-        "Relative Change Mean [%]": l_rc_mean,
-        "Relative Change Stdev [%]": l_rc_std
+        f"{r_name} [{s_unit}] Mean": l_r_mean,
+        f"{r_name} [{s_unit}] Stdev": l_r_std,
+        f"{c_name} [{s_unit}] Mean": l_c_mean,
+        f"{c_name} [{s_unit}] Stdev": l_c_std,
+        "Relative Change [%] Mean": l_rc_mean,
+        "Relative Change [%] Stdev": l_rc_std
     })
     df_cmp.sort_values(
-        by="Relative Change Mean [%]",
+        by="Relative Change [%] Mean",
         ascending=False,
         inplace=True
     )