diff --git a/a5/.gitignore b/a5/.gitignore new file mode 100644 index 0000000..bee8a64 --- /dev/null +++ b/a5/.gitignore @@ -0,0 +1 @@ +__pycache__ diff --git a/a5/db.py b/a5/db.py index e73dc2e..fe40095 100644 --- a/a5/db.py +++ b/a5/db.py @@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS measurements cursor.execute( # sql "SELECT timestamp, tvoc, co2 FROM measurements ORDER BY timestamp DESC LIMIT ?, ?", - (page_size, page * page_size), + (page_size, (page - 1) * page_size), ) return cursor.fetchall() diff --git a/a5/greetings.db b/a5/greetings.db new file mode 100644 index 0000000..79e5337 Binary files /dev/null and b/a5/greetings.db differ diff --git a/a5/main.py b/a5/main.py index bd44aa7..e6a2c0c 100644 --- a/a5/main.py +++ b/a5/main.py @@ -28,7 +28,7 @@ def report() -> ResponseReturnValue: return "ok", 200 -@app.route("/stats", methods=["GET"]) +@app.route("/", methods=["GET"]) def stats() -> ResponseReturnValue: """Gets overall statistics as well as few recent measurements""" db = get_db() @@ -45,7 +45,7 @@ def measurements() -> ResponseReturnValue: """Lists measurements""" db = get_db() page_size = 20 - page = request.args["page"] + page = request.args["page"] if "page" in request.args else 1 try: page = int(page) if page < 0: diff --git a/a5/templates/block/measurements.html.j2 b/a5/templates/block/measurements.html.j2 index 280a500..8fce3f7 100644 --- a/a5/templates/block/measurements.html.j2 +++ b/a5/templates/block/measurements.html.j2 @@ -20,10 +20,10 @@ {% endfor %}
- {% if has_next_page %} + {% if page > 1 %} Previous page {% endif %} - {% if page > 0 %} + {% if has_next_page %} Next page {% endif %} diff --git a/a5/templates/page/index.html.j2 b/a5/templates/page/index.html.j2 index cdb6a8d..03becb9 100644 --- a/a5/templates/page/index.html.j2 +++ b/a5/templates/page/index.html.j2 @@ -1,6 +1,6 @@ -{% extends "../base.html.j2" %} +{% extends "base.html.j2" %} {% block title %}Overview{% endblock %} {% block description %}Overview of a CO2 and TVOC sensor data.{% endblock %} {% block content %} - {% include "../block/index.html.j2" %} + {% include "block/index.html.j2" %} {% endblock %} diff --git a/a5/templates/page/measurements.html.j2 b/a5/templates/page/measurements.html.j2 index e7bf6e5..746e9ad 100644 --- a/a5/templates/page/measurements.html.j2 +++ b/a5/templates/page/measurements.html.j2 @@ -1,6 +1,6 @@ -{% extends "../base.html.j2" %} +{% extends "base.html.j2" %} {% block title %}Measurements{% endblock %} {% block description %}List of measurements{% endblock %} {% block content %} - {% include "../block/measurements.html.j2" %} + {% include "block/measurements.html.j2" %} {% endblock %} diff --git a/a5/uv.lock b/a5/uv.lock new file mode 100644 index 0000000..cf845d2 --- /dev/null +++ b/a5/uv.lock @@ -0,0 +1,8 @@ +version = 1 +revision = 3 +requires-python = ">=3.13" + +[[package]] +name = "a5" +version = "0.1.0" +source = { virtual = "." }