From 36850dfb1d3ff689cbaf683669e2e55c6db84596 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 9 May 2022 15:57:01 +0200 Subject: feat(uti): data to csv Change-Id: Iebc24dae2b76408f07c145b2638c346193cf8e1e Signed-off-by: Tibor Frank --- resources/tools/dash/app/pal/stats/graphs.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'resources/tools/dash/app/pal/stats/graphs.py') diff --git a/resources/tools/dash/app/pal/stats/graphs.py b/resources/tools/dash/app/pal/stats/graphs.py index 37fc1b2e73..d9f49407d9 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,14 +39,7 @@ def graph_statistics(df: pd.DataFrame, job:str, layout: dict, """ """ - data = select_data(df, job) - data = data.dropna(subset=["duration", ]) - if data.empty: - return None, None - - data = data.loc[( - (data["start_time"] >= start) & (data["start_time"] <= end) - )] + data = select_data(df, job, start, end) if data.empty: return None, None -- cgit 1.2.3-korg