fix

second graph
only one graph
2025-01-28 14:20:09 +01:00 · 2025-01-28 14:13:30 +01:00 · 2025-01-28 13:54:11 +01:00 · 2025-01-28 13:49:26 +01:00 · 2025-01-28 13:47:24 +01:00 · 2025-01-28 13:44:03 +01:00
3 changed files with 26 additions and 25 deletions
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -16,7 +16,7 @@ steps:
  scan_image:
    image: aquasec/trivy
    commands:
-      - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
+      - TRIVY_DISABLE_VEX_NOTICE=1 trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
    when:
      - event: [push, tag]
  deploy:
--- a/deployment/secrets.asc
+++ b/deployment/secrets.asc
@ -1,15 +1,15 @@
 -----BEGIN PGP MESSAGE-----
-jA0ECQMCGiCDDKK8KgP/0sExAeQ99bvndkYa/C1rLsDj14oKDgqea1ylRMTSm3if
+jA0ECQMCjSYtdE7M+rT/0sEmAbK6tjOB7cduweJyS3sULIl017BrOM1HGV1v4QkN
-jUdbOyaNR0p0R32AS1wVlR9qxE1g/e/dCNmGjYQ0lqpyRwX6uqJFZ8KubZp0rRCV
+NWtceKHpJEFmk1ZFh1EmyS724bDxtVLm8qJN4VzV+cLPa8/IiTzOHJEg4PDRcc0U
-40VpAfuu4eKE6NsxW8U4wlY5aDR21YUndoaHCwNQDgFV2exCDVeOsF1hyGgurWBG
+LRCZOb5PtfKWBcQdRshT3JhIxxOKG53ZKOHJ2VodZ/iqmpSbjZ39GtzLJoXlXwCJ
-QeAtlCN+HV6t9Gg6KUXRlr89C/wdZkkYScVGXxqemqetGntGhS96u37EFzyjnDaD
+jHAHgADdvq5J7joSaozjxVCXQI2nOmlEcZosZVd6LZDvemWtmci4ARJtOEqad4Wi
-P09d6LKOIuHnKHZgBcKUZSqkYYwlNk05Wum9FqoWQc8KgCMvMv0WQNaaQxkrRah5
+mbleupBF18pA7b63hfmHocO89b9pTpUZWw10b0SHrUiKZG6kHeQXE8GGu+4HiRcG
-DRgyXkNYrDg3WGt7357H3LO+IP1gTVAyjEsZl0OpazXLKGfrsWis+191t9omXk+x
+xJN/yYe2Ly4tHwT54gQ7ytLrxOnJUQKelSpq370t/lrGTf8L4b2eq+tED8/7z5Ho
-Y9g/dx1aSqgeIQ3SiTpjdHHItSYcJ+ZYvJy+4u6FeKFrk/5Z9nBA0LxEmo5ObGmg
+E12VDreYLFaS2IeJCFBefiGGbKgttPcHZvDCPCUpCpfSShlqtTaidwsTq2lPFGyo
-SrMCnzU1/JDCsAEp8mvAMQWFjJUrgUMUHM00uFm32Nq6SOAT50rW4/XIxak2w6/x
+0Lz9NHsqp4/U+4nabCWNVWhnZhwqIPYOt/kKsYvjq40U29q7RORnxz8l/Ym4vB1P
-Zi7j3kxD6dfEXAeGRqCbDeTPQHNWPlvq0Rez2uaYA8w8S1hNoS8iSOSUbBoMCdFK
+kLeouElJvAz6vt/1+nFQJb65YykTqKQpbKgbziFiUFwb37QzBqRO7tuv3/MUzJ1Q
-k61VApVRty0g35IsemcEuocIBw3YLWLLngHk7/xpKKWjbFO9H5AmxZT6FKcq7BwK
+KB7+IOQ43vFbAK6DZAhJZtAspVYiZ95niVxepaghzf33/FquhtZ+XpFEBDv525z7
-Q4DPHAmHDSCniiMzdcbcH7Y8GvO8q9jFPfQWE5MDETVlQ7Q=
+pML7BxFxuwF5q7HBTPtc4IeJBgGi16wm
-=gOlN
+=K6Qq
 -----END PGP MESSAGE-----
--- a/src/run.py
+++ b/src/run.py
@ -37,20 +37,13 @@ oidc = OpenIDConnect(app)
@app.route('/')
@oidc.require_login
 def index():
    counter = int(session.get('counter', '0'))
    counter += 1
    session['counter'] = f"{counter}"
    return f"Hello, Flask! Called for the {counter}. time."
@app.route('/plot')
@oidc.require_login
 def plot():
    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_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
-        fig.update_layout(
+        fig_1.update_layout(
            title="Jahreswerte Exportierte Energie",
            xaxis_title="Monat",
            yaxis_title="",
@ -62,7 +55,14 @@ def plot():
            ),
            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 >= 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>
@ -70,7 +70,8 @@ def plot():
                    <title>Jahreswerte PV-Energie</title>
                </head>
                <body>
-                    {graph_html}
+                    {graph_html_1}
                    {graph_html_2}
                </body>
            </html>
        """)
Author	SHA1	Message	Date
Wolfgang Hottgenroth	b8dd70e5ae	fix All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-28 14:20:09 +01:00
Wolfgang Hottgenroth	6ba9352edc	second graph All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-28 14:13:30 +01:00
Wolfgang Hottgenroth	aaa23a9839	only one graph All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-28 13:54:11 +01:00
Wolfgang Hottgenroth	812989df47	two graphs All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-28 13:49:26 +01:00
Wolfgang Hottgenroth	452161ff03	disable trivy warning All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2025-01-28 13:47:24 +01:00
Wolfgang Hottgenroth	cd3bf25fa1	two graphs All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-28 13:44:03 +01:00
Wolfgang Hottgenroth	9baa648382	secrets fixed All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2025-01-27 19:15:37 +01:00