Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
feat(uti): Add constant TIME_PERIOD
[csit.git]
/
resources
/
tools
/
dash
/
app
/
pal
/
stats
/
layout.py
diff --git
a/resources/tools/dash/app/pal/stats/layout.py
b/resources/tools/dash/app/pal/stats/layout.py
index
0ae83cf
..
0c5c22e
100644
(file)
--- a/
resources/tools/dash/app/pal/stats/layout.py
+++ b/
resources/tools/dash/app/pal/stats/layout.py
@@
-17,6
+17,7
@@
import pandas as pd
import dash_bootstrap_components as dbc
import pandas as pd
import dash_bootstrap_components as dbc
+from flask import Flask
from dash import dcc
from dash import html
from dash import callback_context, no_update
from dash import dcc
from dash import html
from dash import callback_context, no_update
@@
-33,8
+34,9
@@
class Layout:
"""
"""
"""
"""
- def __init__(self, app, html_layout_file, spec_file, graph_layout_file,
- data_spec_file):
+ def __init__(self, app: Flask, html_layout_file: str, spec_file: str,
+ graph_layout_file: str, data_spec_file: str,
+ time_period: int=None) -> None:
"""
"""
"""
"""
@@
-44,12
+46,13
@@
class Layout:
self._spec_file = spec_file
self._graph_layout_file = graph_layout_file
self._data_spec_file = data_spec_file
self._spec_file = spec_file
self._graph_layout_file = graph_layout_file
self._data_spec_file = data_spec_file
+ self._time_period = time_period
# Read the data:
data_stats, data_mrr, data_ndrpdr = Data(
data_spec_file=self._data_spec_file,
debug=True
# Read the data:
data_stats, data_mrr, data_ndrpdr = Data(
data_spec_file=self._data_spec_file,
debug=True
- ).read_stats()
+ ).read_stats(
days=self._time_period
)
df_tst_info = pd.concat([data_mrr, data_ndrpdr], ignore_index=True)
df_tst_info = pd.concat([data_mrr, data_ndrpdr], ignore_index=True)
@@
-59,6
+62,11
@@
class Layout:
data_stats = data_stats[~data_stats.job.str.contains("-iterative-")]
data_stats = data_stats[["job", "build", "start_time", "duration"]]
data_stats = data_stats[~data_stats.job.str.contains("-iterative-")]
data_stats = data_stats[["job", "build", "start_time", "duration"]]
+ data_time_period = \
+ (datetime.utcnow() - data_stats["start_time"].min()).days
+ if self._time_period > data_time_period:
+ self._time_period = data_time_period
+
self._jobs = sorted(list(data_stats["job"].unique()))
tst_info = {
self._jobs = sorted(list(data_stats["job"].unique()))
tst_info = {
@@
-144,6
+152,10
@@
class Layout:
def jobs(self) -> list:
return self._jobs
def jobs(self) -> list:
return self._jobs
+ @property
+ def time_period(self):
+ return self._time_period
+
def add_content(self):
"""
"""
def add_content(self):
"""
"""
@@
-160,7
+172,7
@@
class Layout:
),
dcc.Loading(
dbc.Offcanvas(
),
dcc.Loading(
dbc.Offcanvas(
- class_name="w-
50
",
+ class_name="w-
25
",
id="offcanvas-metadata",
title="Detailed Information",
placement="end",
id="offcanvas-metadata",
title="Detailed Information",
placement="end",
@@
-302,10
+314,13
@@
class Layout:
id="dpr-period",
className="d-flex justify-content-center",
min_date_allowed=\
id="dpr-period",
className="d-flex justify-content-center",
min_date_allowed=\
- datetime.utcnow()-timedelta(days=180),
+ datetime.utcnow() - timedelta(
+ days=self.time_period),
max_date_allowed=datetime.utcnow(),
initial_visible_month=datetime.utcnow(),
max_date_allowed=datetime.utcnow(),
initial_visible_month=datetime.utcnow(),
- start_date=datetime.utcnow() - timedelta(days=180),
+ start_date=\
+ datetime.utcnow() - timedelta(
+ days=self.time_period),
end_date=datetime.utcnow(),
display_format="D MMMM YY"
)
end_date=datetime.utcnow(),
display_format="D MMMM YY"
)