second graph
This commit is contained in:
parent
aaa23a9839
commit
6ba9352edc
17
src/run.py
17
src/run.py
@ -40,9 +40,10 @@ def index():
|
||||
try:
|
||||
dbh = psycopg.connect()
|
||||
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
|
||||
|
||||
df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month", con=engine)
|
||||
fig = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||
fig.update_layout(
|
||||
fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||
fig_1.update_layout(
|
||||
title="Jahreswerte Exportierte Energie",
|
||||
xaxis_title="Monat",
|
||||
yaxis_title="",
|
||||
@ -54,7 +55,14 @@ def index():
|
||||
),
|
||||
yaxis=dict(ticksuffix=" kWh")
|
||||
)
|
||||
graph_html = fig.to_html(full_html=False)
|
||||
graph_html_1 = fig_1.to_html(full_html=False)
|
||||
|
||||
df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time time >= date_trunc('day', now()) - '1 day'::interval AND time < date_trunc('day', now()) GROUP BY bucket ORDER BY bucket", con=engine)
|
||||
fig_2 = px.line(df, x='bucket', y='avg_power')
|
||||
fig_2.update_layout(
|
||||
title="Export gestern"
|
||||
)
|
||||
graph_html_2 = fig_2.to_html(full_html=False)
|
||||
|
||||
return render_template_string(f"""
|
||||
<html>
|
||||
@ -62,7 +70,8 @@ def index():
|
||||
<title>Jahreswerte PV-Energie</title>
|
||||
</head>
|
||||
<body>
|
||||
{graph_html}
|
||||
{graph_html_1}
|
||||
{graph_html_2}
|
||||
</body>
|
||||
</html>
|
||||
""")
|
||||
|
Loading…
x
Reference in New Issue
Block a user