From 9e28d41817b4f1b3a77a4c65d76da9d292fd9d8a Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 6 Sep 2023 08:20:36 +0000
Subject: [PATCH] C-Dash: Define the width of bars in bar graphs

- Width set automaticaly by plotly does not work corectly in all
  situations.

Change-Id: Ib4a2475f6889e8858d3c3cd9c7886a9725df5d0e
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 csit.infra.dash/app/cdash/stats/graphs.py    | 25 +++++++++++++++----------
 csit.infra.dash/app/cdash/utils/constants.py |  4 ++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/csit.infra.dash/app/cdash/stats/graphs.py b/csit.infra.dash/app/cdash/stats/graphs.py
index 21b1243ee2..2223848166 100644
--- a/csit.infra.dash/app/cdash/stats/graphs.py
+++ b/csit.infra.dash/app/cdash/stats/graphs.py
@@ -17,8 +17,10 @@
 import plotly.graph_objects as go
 import pandas as pd
 
+from ..utils.constants import Constants as C
 
-def select_data(data: pd.DataFrame, itm:str) -> pd.DataFrame:
+
+def select_data(data: pd.DataFrame, itm: str) -> pd.DataFrame:
     """Select the data for graphs from the provided data frame.
 
     :param data: Data frame with data for graphs.
@@ -37,7 +39,7 @@ def select_data(data: pd.DataFrame, itm:str) -> pd.DataFrame:
     return df
 
 
-def graph_statistics(df: pd.DataFrame, job:str, layout: dict) -> tuple:
+def graph_statistics(df: pd.DataFrame, job: str, layout: dict) -> tuple:
     """Generate graphs:
     1. Passed / failed tests,
     2. Job durations
@@ -60,7 +62,6 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict) -> tuple:
 
     hover = list()
     for _, row in data.iterrows():
-        d_type = "trex" if row["dut_type"] == "none" else row["dut_type"]
         hover_itm = (
             f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>"
             f"duration: "
@@ -68,7 +69,7 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict) -> tuple:
             f"{((int(row['duration']) % 3600) // 60):02d}<br>"
             f"passed: {row['passed']}<br>"
             f"failed: {row['failed']}<br>"
-            f"{d_type}-ref: {row['dut_version']}<br>"
+            f"{row['dut_type']}-ref: {row['dut_version']}<br>"
             f"csit-ref: {row['job']}/{row['build']}<br>"
             f"hosts: {', '.join(row['hosts'])}"
         )
@@ -79,9 +80,9 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict) -> tuple:
         data=go.Scatter(
             x=data["start_time"],
             y=data["duration"],
-            name=u"Duration",
+            name="Duration",
             text=hover,
-            hoverinfo=u"text"
+            hoverinfo="text"
         )
     )
 
@@ -99,21 +100,25 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict) -> tuple:
         fig_duration.update_layout(layout_duration)
 
     # Passed / failed:
+    bar_width = C.STATS_BAR_WIDTH_WEEKLY \
+        if "weekly" in job else C.STATS_BAR_WIDTH_DAILY
     fig_passed = go.Figure(
         data=[
             go.Bar(
                 x=data["start_time"],
                 y=data["passed"],
-                name=u"Passed",
+                name="Passed",
                 hovertext=hover,
-                hoverinfo=u"text"
+                hoverinfo="text",
+                width=bar_width
             ),
             go.Bar(
                 x=data["start_time"],
                 y=data["failed"],
-                name=u"Failed",
+                name="Failed",
                 hovertext=hover,
-                hoverinfo=u"text"
+                hoverinfo="text",
+                width=bar_width
             )
         ]
     )
diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py
index 376fefaf3c..34892e79bc 100644
--- a/csit.infra.dash/app/cdash/utils/constants.py
+++ b/csit.infra.dash/app/cdash/utils/constants.py
@@ -359,6 +359,10 @@ class Constants:
     # Default name of downloaded file with selected data.
     STATS_DOWNLOAD_FILE_NAME = "stats.csv"
 
+    # The width of the bar in the graph in miliseconds.
+    STATS_BAR_WIDTH_DAILY = 1000 * 3600 * 15
+    STATS_BAR_WIDTH_WEEKLY = 1000 * 3600 * 24
+
     ############################################################################
     # Trending.
 
-- 
2.16.6