X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fdash%2Fapp%2Fpal%2Fstats%2Fgraphs.py;h=c1f58f24056c805e82e7ed99f5550287935c6f2b;hb=aa9f6d2b4d417b439e2953a9c82c31b0d561f632;hp=2fabf8e6aef40722040d1a9fa79b795c68c9962a;hpb=c01befc28450d5c2003d25876dda0201eb827735;p=csit.git

diff --git a/resources/tools/dash/app/pal/stats/graphs.py b/resources/tools/dash/app/pal/stats/graphs.py
index 2fabf8e6ae..c1f58f2405 100644
--- a/resources/tools/dash/app/pal/stats/graphs.py
+++ b/resources/tools/dash/app/pal/stats/graphs.py
@@ -19,12 +19,16 @@ import pandas as pd
 
 from datetime import datetime, timedelta
 
-def select_data(data: pd.DataFrame, itm:str) -> pd.DataFrame:
+def select_data(data: pd.DataFrame, itm:str, start: datetime,
+        end: datetime) -> pd.DataFrame:
     """
     """
 
-    df = data.loc[(data["job"] == itm)].sort_values(
-        by="start_time", ignore_index=True)
+    df = data.loc[
+        (data["job"] == itm) &
+        (data["start_time"] >= start) & (data["start_time"] <= end)
+    ].sort_values(by="start_time", ignore_index=True)
+    df = df.dropna(subset=["duration", ])
 
     return df
 
@@ -35,25 +39,21 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict,
     """
     """
 
-    data = select_data(df, job)
-    data = data.dropna(subset=["duration", ])
+    data = select_data(df, job, start, end)
     if data.empty:
         return None, None
 
-    x_axis = [d for d in data["start_time"] if d >= start and d <= end]
-    if not x_axis:
-        return None, None
-
     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('%d-%m-%Y %H:%M:%S')}<br>"
+            f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>"
             f"duration: "
             f"{(int(row['duration']) // 3600):02d}:"
             f"{((int(row['duration']) % 3600) // 60):02d}<br>"
             f"passed: {row['passed']}<br>"
             f"failed: {row['failed']}<br>"
-            f"{row['dut_type']}-ref: {row['dut_version']}<br>"
+            f"{d_type}-ref: {row['dut_version']}<br>"
             f"csit-ref: {row['job']}/{row['build']}<br>"
             f"hosts: {', '.join(row['hosts'])}"
         )
@@ -62,7 +62,7 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict,
     # Job durations:
     fig_duration = go.Figure(
         data=go.Scatter(
-            x=x_axis,
+            x=data["start_time"],
             y=data["duration"],
             name=u"Duration",
             text=hover,
@@ -87,14 +87,14 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict,
     fig_passed = go.Figure(
         data=[
             go.Bar(
-                x=x_axis,
+                x=data["start_time"],
                 y=data["passed"],
                 name=u"Passed",
                 hovertext=hover,
                 hoverinfo=u"text"
             ),
             go.Bar(
-                x=x_axis,
+                x=data["start_time"],
                 y=data["failed"],
                 name=u"Failed",
                 hovertext=hover,