adds hourly, daily, monthly aggregations

kondinskis · kondinskis · commit cc6a68a77c2a · 2021-10-04T18:31:55.000+02:00
diff --git a/apc/templates/index.html b/apc/templates/index.html
@@ -14,10 +14,27 @@
       margin: 0;
       overflow: hidden;
     }
+
+    ul {
+      line-height: 28px;
+      font-size: 16px;
+      margin: 0;
+      position: absolute;
+      z-index: 10;
+    }
+
+    ul>li {
+      display: inline-block;
+    }
   </style>
 </head>
 
 <body>
+  <ul>
+    <li><a href="?freq=hourly">Hourly</a></li>
+    <li><a href="?freq=daily">Daily</a></li>
+    <li><a href="?freq=monthly">Monthly</a></li>
+  </ul>
   <div id="div_g" style="width: 100%; height: 99%;"></div>
   <script type="text/javascript" src="{{ url_for('static', filename='dygraph/dygraph.min.js') }}"></script>
   <script type="text/javascript">
diff --git a/apc/web.py b/apc/web.py
@@ -1,8 +1,16 @@
 from flask import Flask, jsonify, render_template, g, request
 
+from sqlalchemy import func, text
+
 from .db import Session, APCReading
 from .config import Config
 
+freq_opts = {
+    "hourly": "%Y-%m-%d %H:00:00.000000",
+    "daily": "%Y-%m-%d 00:00:00.000000",
+    "monthly": "%Y-%m-01 00:00:00.000000",
+}
+
 
 def create_app(config=Config):
     app = Flask(__name__)
@@ -20,11 +28,18 @@ def teardown_request(exception):
 
     @app.get("/")
     def index():
-        readings = g.session.query(APCReading).all()
+        freq = request.args.get("freq", "hourly")
+
+        statement = text(
+            "SELECT id, STRFTIME('{0}', date) as date, AVG(load / no_logs) as load FROM apc_reading GROUP BY STRFTIME('{0}', date)".format(
+                freq_opts.get(freq) or freq_opts["hourly"]
+            )
+        )
+        readings = g.session.query(APCReading).from_statement(statement).all()
         readings_combined = "Date,Load\\n"
         for reading in readings:
             readings_combined = readings_combined + "{},{}\\n".format(
-                reading.date, round(reading.load / reading.no_logs)
+                reading.date, round(reading.load),
             )
         return render_template("index.html", readings=readings_combined)
 
